am 9f78ffb2: am 615f8446: reconcile main tree with open-source eclair

[android-x86/packages-apps-Settings.git] / res / xml-sv / timezones.xml

diff --git a/res/xml-sv/timezones.xml b/res/xml-sv/timezones.xml
index aaed828..2381e2a 100644 (file)
--- a/res/xml-sv/timezones.xml
+++ b/res/xml-sv/timezones.xml
@@ -18,8 +18,8 @@
     <timezone id="America/Barbados">Atlantic, normaltid (Barbados)</timezone>
     <timezone id="America/Manaus">Amazonastid (Manaus)</timezone>
     <timezone id="America/Santiago">Chilensk tid (Santiago)</timezone>
-    <timezone id="America/St_Johns">Newfoundland, normaltid (S:t Johns)</timezone>
-    <timezone id="America/Araguaina">Brasiliansk tid (Araguaina)</timezone>
+    <timezone id="America/St_Johns">Newfoundland, normaltid (St. Johns)</timezone>
+    <timezone id="America/Sao_Paulo">Brasiliansk tid (São Paulo)</timezone>
     <timezone id="America/Argentina/Buenos_Aires">östargentinsk tid (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">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Kinesisk tid (Peking)</timezone>
     <timezone id="Asia/Hong_Kong">Hongkong</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
     <timezone id="Australia/Perth">Västaustralisk tid (Perth)</timezone>
-    <timezone id="Asia/Taipei">Kinesisk tid (Taipei)</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
     <timezone id="Asia/Seoul">Söul</timezone>
     <timezone id="Asia/Tokyo">Japan, normaltid (Tokyo)</timezone>
     <timezone id="Asia/Yakutsk">Jakutsk</timezone>