OSDN Git Service

Merge "b/2335780 Fixed race conditions which causes BT to not be in the correct state...
[android-x86/packages-apps-Settings.git] / res / xml-pl / timezones.xml
index 8693f21..998aa75 100644 (file)
@@ -19,7 +19,7 @@
     <timezone id="America/Manaus">Manaus</timezone>
     <timezone id="America/Santiago">Santiago</timezone>
     <timezone id="America/St_Johns">St. John's</timezone>
-    <timezone id="America/Araguaina">Araguaina</timezone>
+    <timezone id="America/Sao_Paulo">Săo Paulo</timezone>
     <timezone id="America/Argentina/Buenos_Aires">Buenos Aires</timezone>
     <timezone id="America/Godthab">Grenlandia</timezone>
     <timezone id="America/Montevideo">Urugwaj</timezone>
@@ -62,6 +62,7 @@
     <timezone id="Asia/Rangoon">Rangun</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
     <timezone id="Asia/Bangkok">Tajlandia</timezone>
+    <timezone id="Asia/Shanghai">Pekin</timezone>
     <timezone id="Asia/Hong_Kong">Hongkong</timezone>
     <timezone id="Asia/Irkutsk">Irkuck</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>