diff options
| author | Xianzhu Wang <wangxianzhu@google.com> | 2009-09-11 14:41:05 +0800 |
|---|---|---|
| committer | Xianzhu Wang <wangxianzhu@google.com> | 2009-09-11 14:41:05 +0800 |
| commit | 88651a0b2a7a7038c8befb321100a64aec9933b8 (patch) | |
| tree | bed616200209eaeff98b49f206d8c8865f04c1ec /res/xml-nb | |
| parent | 16cc86315d7a8e1f6a0f3083d0a810a7cb097832 (diff) | |
| download | packages_apps_settings-88651a0b2a7a7038c8befb321100a64aec9933b8.zip packages_apps_settings-88651a0b2a7a7038c8befb321100a64aec9933b8.tar.gz packages_apps_settings-88651a0b2a7a7038c8befb321100a64aec9933b8.tar.bz2 | |
Regenerate timezones.xml after adding Asia/Shanghai timezone for
mainland China, using cldr 1.7.1 and merging translations for "Beijing".
Remove unused localized timezone "xml-no/timezones.xml".
"nb" is now used instead of the deprecated "no".
Diffstat (limited to 'res/xml-nb')
| -rw-r--r-- | res/xml-nb/timezones.xml | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/res/xml-nb/timezones.xml b/res/xml-nb/timezones.xml index 4bf4145..f374a34 100644 --- a/res/xml-nb/timezones.xml +++ b/res/xml-nb/timezones.xml @@ -2,24 +2,24 @@ <timezone id="Pacific/Majuro">Majuro</timezone> <timezone id="Pacific/Midway">Midway</timezone> <timezone id="Pacific/Honolulu">Honolulu</timezone> - <timezone id="America/Anchorage">Anchorage</timezone> - <timezone id="America/Los_Angeles">Los Angeles</timezone> - <timezone id="America/Tijuana">Tijuana</timezone> - <timezone id="America/Phoenix">Phoenix</timezone> + <timezone id="America/Anchorage">Alaska</timezone> + <timezone id="America/Los_Angeles">PST (Los Angeles)</timezone> + <timezone id="America/Tijuana">PST (Tijuana)</timezone> + <timezone id="America/Phoenix">MST (Phoenix)</timezone> <timezone id="America/Chihuahua">Chihuahua</timezone> - <timezone id="America/Denver">Denver</timezone> - <timezone id="America/Costa_Rica">Costa Rica</timezone> - <timezone id="America/Chicago">Chicago</timezone> - <timezone id="America/Mexico_City">Mexico by</timezone> - <timezone id="America/Regina">Regina</timezone> + <timezone id="America/Denver">MST (Denver)</timezone> + <timezone id="America/Costa_Rica">Normaltid (Costa Rica)</timezone> + <timezone id="America/Chicago">Normaltid (Chicago)</timezone> + <timezone id="America/Mexico_City">Normaltid (Mexico by)</timezone> + <timezone id="America/Regina">Normaltid (Regina)</timezone> <timezone id="America/Bogota">Bogotá</timezone> <timezone id="America/New_York">New York</timezone> <timezone id="America/Caracas">Caracas</timezone> - <timezone id="America/Barbados">Barbados</timezone> - <timezone id="America/Manaus">Manaus</timezone> + <timezone id="America/Barbados">AT (Barbados)</timezone> + <timezone id="America/Manaus">Amazonas-tid (Manaus)</timezone> <timezone id="America/Santiago">Santiago</timezone> <timezone id="America/St_Johns">St. John's</timezone> - <timezone id="America/Araguaina">Araguaína</timezone> + <timezone id="America/Araguaina">Brasilia-tid (Araguaína)</timezone> <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone> <timezone id="America/Godthab">Godthåb</timezone> <timezone id="America/Montevideo">Montevideo</timezone> @@ -62,11 +62,12 @@ <timezone id="Asia/Rangoon">Rangoon</timezone> <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone> <timezone id="Asia/Bangkok">Indokinesisk tid (Bangkok)</timezone> + <timezone id="Asia/Shanghai">Kinesisk standardtid (Beijing)</timezone> <timezone id="Asia/Hong_Kong">Hong Kong-tid (Hong Kong)</timezone> <timezone id="Asia/Irkutsk">Irkutsk</timezone> <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone> <timezone id="Australia/Perth">Vestaustralsk tid (Perth)</timezone> - <timezone id="Asia/Taipei">Kinesisk standardtid (Taipei)</timezone> + <timezone id="Asia/Taipei">Taipei</timezone> <timezone id="Asia/Seoul">Koreansk standardtid (Seoul)</timezone> <timezone id="Asia/Tokyo">Japansk standardtid (Tokyo)</timezone> <timezone id="Asia/Yakutsk">Jakutsk</timezone> |