summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-11 21:07:48 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-11 21:07:48 +0000
commit8b726a7719c6b70b6b51b3a9856422352b80a8b4 (patch)
treec249620e5965140c2e60034102dd7788a1e5b3a6 /chrome/app
parente9ce67a136015a9c0994876e1c18afb7ee610794 (diff)
downloadchromium_src-8b726a7719c6b70b6b51b3a9856422352b80a8b4.zip
chromium_src-8b726a7719c6b70b6b51b3a9856422352b80a8b4.tar.gz
chromium_src-8b726a7719c6b70b6b51b3a9856422352b80a8b4.tar.bz2
Use the hard-coded list of timezones obtained from the Android, which
is more comprehensive than the current list. Among the added zones are zones with non-integer hour offsets (like Indian, Nepali and some timezones in Austrailia). Change the display name generation as well to use "LONG" name followed with the exemplar city of a zone. This is necessary to distinguish between timezones like Mountain Time (Phoenix) from Mountain Time (Denver). BUG=chromiumos:2613 TEST=Go to the timezone setting UI and make sure that all the timezones (including those with non-integer hour offset) such as Indian and Nepali timezones are listed. Review URL: http://codereview.chromium.org/3432015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 06ca5af..768f951 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -9101,6 +9101,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION" desc="In the settings tab, the text next to the timezone combobox.">
Time zone:
</message>
+ <message name="IDS_OPTIONS_SETTINGS_TIMEZONE_DISPLAY_TEMPLATE" desc="In the settings tab, the display template of a timezone in the pull-down list of timezones">
+ (<ph name="UTCOffset">$1<ex>UTC-8:00</ex></ph>) <ph name="LongTZName">$2<ex>Pacific Standard Time</ex></ph> (<ph name="ExemplarCity">$3<ex>Los Angeles</ex></ph>)
+ </message>
<message name="IDS_OPTIONS_SETTINGS_TAP_TO_CLICK_ENABLED_DESCRIPTION" desc="In the settings tab, the text next to the checkbox that enables tap-to-click.">
Enable tap-to-click
</message>