Move Lisbon to group with London/Dublin and add a few more zones

Lisbon is in WET, but was misplaced along with other cities in CET.
Move it to WET next to London/Dublin. Also add a few European/Asian zones
I missed in the previous CL.

TBR=satorux@hromium.org,nkostylev@chromium.org
BUG=chrome-os-partner:23902
TEST=More zones show up and Lisbon is next to London/Dublin in the tz
selection UI.

Review URL: https://codereview.chromium.org/167263003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251568 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 11 deletions

diff --git a/chromeos/settings/timezone_settings.cc b/chromeos/settings/timezone_settings.cc
index 0f4d81d..ce4f93a 100644
--- a/chromeos/settings/timezone_settings.cc
+++ b/chromeos/settings/timezone_settings.cc
@@ -54,11 +54,11 @@ static const char* kTimeZones[] = {
     "America/Edmonton",
     "America/Mazatlan",
     "America/Regina",
-    "Pacific/Easter",
     "America/Costa_Rica",
     "America/Chicago",
     "America/Mexico_City",
     "America/Winnipeg",
+    "Pacific/Easter",
     "America/Bogota",
     "America/Lima",
     "America/New_York",
@@ -69,10 +69,10 @@ static const char* kTimeZones[] = {
     "America/Manaus",
     "America/Santiago",
     "America/St_Johns",
-    "America/Sao_Paulo",
     "America/Araguaina",
     "America/Argentina/Buenos_Aires",
     "America/Argentina/San_Luis",
+    "America/Sao_Paulo",
     "America/Montevideo",
     "America/Godthab",
     "Atlantic/South_Georgia",
@@ -82,21 +82,24 @@ static const char* kTimeZones[] = {
     "Atlantic/St_Helena",
     "Africa/Casablanca",
     "Atlantic/Faroe",
-    "Europe/London",
     "Europe/Dublin",
+    "Europe/Lisbon",
+    "Europe/London",
     "Europe/Amsterdam",
     "Europe/Belgrade",
     "Europe/Berlin",
     "Europe/Brussels",
     "Europe/Budapest",
     "Europe/Copenhagen",
-    "Europe/Lisbon",
+    "Europe/Ljubljana",
     "Europe/Madrid",
     "Europe/Oslo",
     "Europe/Paris",
+    "Europe/Prague",
     "Europe/Rome",
     "Europe/Stockholm",
     "Europe/Sarajevo",
+    "Europe/Tirane",
     "Europe/Vienna",
     "Europe/Warsaw",
     "Europe/Zurich",
@@ -109,20 +112,22 @@ static const char* kTimeZones[] = {
     "Africa/Johannesburg",
     "Europe/Athens",
     "Europe/Bucharest",
+    "Europe/Chisinau",
     "Europe/Helsinki",
     "Europe/Istanbul",
     "Europe/Kiev",
     "Europe/Riga",
+    "Europe/Sofia",
     "Europe/Tallinn",
     "Europe/Vilnius",
     "Asia/Amman",
     "Asia/Beirut",
     "Asia/Jerusalem",
-    "Europe/Minsk",
+    "Africa/Nairobi",
     "Asia/Baghdad",
     "Asia/Riyadh",
     "Asia/Kuwait",
-    "Africa/Nairobi",
+    "Europe/Minsk",
     "Asia/Tehran",
     "Europe/Moscow",
     "Asia/Dubai",
@@ -134,7 +139,7 @@ static const char* kTimeZones[] = {
     "Asia/Karachi",
     "Asia/Ashgabat",
     "Asia/Oral",
-    "Asia/Calcutta",
+    "Asia/Kolkata",
     "Asia/Colombo",
     "Asia/Katmandu",
     "Asia/Yekaterinburg",
@@ -146,6 +151,7 @@ static const char* kTimeZones[] = {
     "Asia/Omsk",
     "Asia/Novosibirsk",
     "Asia/Ho_Chi_Minh",
+    "Asia/Phnom_Penh",
     "Asia/Vientiane",
     "Asia/Shanghai",
     "Asia/Hong_Kong",
@@ -161,20 +167,20 @@ static const char* kTimeZones[] = {
     "Asia/Seoul",
     "Asia/Tokyo",
     "Asia/Jayapura",
-    "Australia/Adelaide",
     "Australia/Darwin",
+    "Australia/Adelaide",
+    "Asia/Yakutsk",
+    "Pacific/Guam",
     "Australia/Brisbane",
     "Australia/Hobart",
     "Australia/Sydney",
-    "Asia/Yakutsk",
-    "Pacific/Guam",
     "Pacific/Port_Moresby",
     "Asia/Vladivostok",
     "Asia/Sakhalin",
     "Asia/Magadan",
-    "Pacific/Auckland",
     "Pacific/Fiji",
     "Pacific/Majuro",
+    "Pacific/Auckland",
     "Pacific/Tongatapu",
     "Pacific/Apia",
     "Pacific/Kiritimati",