13 files changed, 22 insertions, 9 deletions
diff --git a/res/xml-cs/timezones.xml b/res/xml-cs/timezones.xml
index a02d0d2a2..26a971563 100644
--- a/res/xml-cs/timezones.xml
+++ b/res/xml-cs/timezones.xml
@@ -62,11 +62,12 @@
     <timezone id="Asia/Rangoon">Rangún</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Čínský standardní čas (Peking)</timezone>
     <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
     <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Čínský standardní čas (Taipei)</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
     <timezone id="Asia/Seoul">Soul</timezone>
     <timezone id="Asia/Tokyo">Japonský standardní čas (Tokio)</timezone>
     <timezone id="Asia/Yakutsk">Jakutsk</timezone>
diff --git a/res/xml-de/timezones.xml b/res/xml-de/timezones.xml
index 39bedfebc..50c6a85a9 100644
--- a/res/xml-de/timezones.xml
+++ b/res/xml-de/timezones.xml
@@ -62,6 +62,7 @@
     <timezone id="Asia/Rangoon">Rangoon</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Beijing</timezone>
     <timezone id="Asia/Hong_Kong">Hongkong</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
diff --git a/res/xml-es/timezones.xml b/res/xml-es/timezones.xml
index 674d55dfe..d59aabe94 100644
--- a/res/xml-es/timezones.xml
+++ b/res/xml-es/timezones.xml
@@ -62,11 +62,12 @@
     <timezone id="Asia/Rangoon">Rangún</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Hora estándar de China (Beijing)</timezone>
     <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
     <timezone id="Australia/Perth">Hora de Australia (Perth)</timezone>
-    <timezone id="Asia/Taipei">Hora estándar de China (Taipei)</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
     <timezone id="Asia/Seoul">Seúl</timezone>
     <timezone id="Asia/Tokyo">Hora estándar de Japón (Tokio)</timezone>
     <timezone id="Asia/Yakutsk">Yakutsk</timezone>
diff --git a/res/xml-fr/timezones.xml b/res/xml-fr/timezones.xml
index 99673829b..6def47577 100644
--- a/res/xml-fr/timezones.xml
+++ b/res/xml-fr/timezones.xml
@@ -62,11 +62,12 @@
     <timezone id="Asia/Rangoon">Rangoon</timezone>
     <timezone id="Asia/Krasnoyarsk">Heure de Krasnoïarsk (Krasnoïarsk)</timezone>
     <timezone id="Asia/Bangkok">Heure d’Indochine (Bangkok)</timezone>
+    <timezone id="Asia/Shanghai">Heure de Chine (Beijing)</timezone>
     <timezone id="Asia/Hong_Kong">Heure de Hong Kong (Hong-Kong)</timezone>
     <timezone id="Asia/Irkutsk">Heure d’Irkoutsk (Irkoutsk)</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
     <timezone id="Australia/Perth">Heure de l’Ouest australien (Perth)</timezone>
-    <timezone id="Asia/Taipei">Heure de Chine (Taipei)</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
     <timezone id="Asia/Seoul">Heure de Corée (Séoul)</timezone>
     <timezone id="Asia/Tokyo">Heure du Japon (Tokyo)</timezone>
     <timezone id="Asia/Yakutsk">Iakoutsk</timezone>
diff --git a/res/xml-it/timezones.xml b/res/xml-it/timezones.xml
index 506020218..beefbf645 100644
--- a/res/xml-it/timezones.xml
+++ b/res/xml-it/timezones.xml
@@ -62,11 +62,12 @@
     <timezone id="Asia/Rangoon">Rangoon</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Ora Standard Cina (Pechino)</timezone>
     <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
     <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Ora Standard Cina (Taipei)</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
     <timezone id="Asia/Seoul">Seul</timezone>
     <timezone id="Asia/Tokyo">Ora Standard Giappone (Tokyo)</timezone>
     <timezone id="Asia/Yakutsk">Yakutsk</timezone>
diff --git a/res/xml-ja/timezones.xml b/res/xml-ja/timezones.xml
index 9a698cf60..168ba049a 100644
--- a/res/xml-ja/timezones.xml
+++ b/res/xml-ja/timezones.xml
@@ -62,11 +62,12 @@
     <timezone id="Asia/Rangoon">ラングーン</timezone>
     <timezone id="Asia/Krasnoyarsk">クラスノヤルスク</timezone>
     <timezone id="Asia/Bangkok">バンコク</timezone>
+    <timezone id="Asia/Shanghai">中国標準時 (北京)</timezone>
     <timezone id="Asia/Hong_Kong">香港</timezone>
     <timezone id="Asia/Irkutsk">イルクーツク</timezone>
     <timezone id="Asia/Kuala_Lumpur">アジア/クアラルンプール</timezone>
     <timezone id="Australia/Perth">パース</timezone>
-    <timezone id="Asia/Taipei">中国標準時 (台北)</timezone>
+    <timezone id="Asia/Taipei">台北</timezone>
     <timezone id="Asia/Seoul">ソウル</timezone>
     <timezone id="Asia/Tokyo">日本標準時 (東京)</timezone>
     <timezone id="Asia/Yakutsk">ヤクーツク</timezone>
diff --git a/res/xml-ko/timezones.xml b/res/xml-ko/timezones.xml
index fcc151975..6d62d0354 100644
--- a/res/xml-ko/timezones.xml
+++ b/res/xml-ko/timezones.xml
@@ -62,11 +62,12 @@
     <timezone id="Asia/Rangoon">랑군</timezone>
     <timezone id="Asia/Krasnoyarsk">크라스노야르스크</timezone>
     <timezone id="Asia/Bangkok">방콕</timezone>
+    <timezone id="Asia/Shanghai">중국 표준시 (베이징)</timezone>
     <timezone id="Asia/Hong_Kong">홍콩</timezone>
     <timezone id="Asia/Irkutsk">이르쿠츠크</timezone>
     <timezone id="Asia/Kuala_Lumpur">쿠알라룸푸르</timezone>
     <timezone id="Australia/Perth">서부 오스트레일리아 시간 (퍼스)</timezone>
-    <timezone id="Asia/Taipei">중국 표준시 (타이베이)</timezone>
+    <timezone id="Asia/Taipei">타이베이</timezone>
     <timezone id="Asia/Seoul">한국 표준시 (서울)</timezone>
     <timezone id="Asia/Tokyo">일본 표준시 (도쿄)</timezone>
     <timezone id="Asia/Yakutsk">야쿠츠크</timezone>
diff --git a/res/xml-nl/timezones.xml b/res/xml-nl/timezones.xml
index 2b115b335..e2315dfbc 100644
--- a/res/xml-nl/timezones.xml
+++ b/res/xml-nl/timezones.xml
@@ -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">Chinese standaardtijd (Peking)</timezone>
     <timezone id="Asia/Hong_Kong">Hongkong</timezone>
     <timezone id="Asia/Irkutsk">Irkoetsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
     <timezone id="Australia/Perth">Perth</timezone>
-    <timezone id="Asia/Taipei">Chinese standaardtijd (Taipei)</timezone>
+    <timezone id="Asia/Taipei">Taipei</timezone>
     <timezone id="Asia/Seoul">Seoul</timezone>
     <timezone id="Asia/Tokyo">Japanse standaardtijd (Tokio)</timezone>
     <timezone id="Asia/Yakutsk">Jakoetsk</timezone>
diff --git a/res/xml-no/timezones.xml b/res/xml-no/timezones.xml
index d43a17b76..85201b96e 100644
--- a/res/xml-no/timezones.xml
+++ b/res/xml-no/timezones.xml
@@ -62,6 +62,7 @@
     <timezone id="Asia/Rangoon">Rangoon</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
+    <timezone id="Asia/Shanghai">Beijing</timezone>
     <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
diff --git a/res/xml-pl/timezones.xml b/res/xml-pl/timezones.xml
index 8693f21a2..ea0d72d9d 100644
--- a/res/xml-pl/timezones.xml
+++ b/res/xml-pl/timezones.xml
@@ -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>
diff --git a/res/xml-ru/timezones.xml b/res/xml-ru/timezones.xml
index 2a60f8fd1..e21095f2d 100644
--- a/res/xml-ru/timezones.xml
+++ b/res/xml-ru/timezones.xml
@@ -62,6 +62,7 @@
     <timezone id="Asia/Rangoon">Рангун</timezone>
     <timezone id="Asia/Krasnoyarsk">Красноярск</timezone>
     <timezone id="Asia/Bangkok">Бангкок</timezone>
+    <timezone id="Asia/Shanghai">Пекин</timezone>
     <timezone id="Asia/Hong_Kong">Гонконг</timezone>
     <timezone id="Asia/Irkutsk">Иркутск</timezone>
     <timezone id="Asia/Kuala_Lumpur">Куала-Лумпур</timezone>
diff --git a/res/xml-zh/timezones.xml b/res/xml-zh/timezones.xml
index 0d61debb5..7f852aa97 100644
--- a/res/xml-zh/timezones.xml
+++ b/res/xml-zh/timezones.xml
@@ -62,11 +62,12 @@
     <timezone id="Asia/Rangoon">仰光</timezone>
     <timezone id="Asia/Krasnoyarsk">克拉斯诺亚尔斯克</timezone>
     <timezone id="Asia/Bangkok">曼谷</timezone>
+    <timezone id="Asia/Shanghai">中国标准时间 (北京)</timezone>
     <timezone id="Asia/Hong_Kong">香港</timezone>
     <timezone id="Asia/Irkutsk">伊尔库茨克</timezone>
     <timezone id="Asia/Kuala_Lumpur">吉隆坡</timezone>
     <timezone id="Australia/Perth">佩思</timezone>
-    <timezone id="Asia/Taipei">中国标准时间 (台北)</timezone>
+    <timezone id="Asia/Taipei">台北</timezone>
     <timezone id="Asia/Seoul">首尔</timezone>
     <timezone id="Asia/Tokyo">日本标准时间 (东京)</timezone>
     <timezone id="Asia/Yakutsk">雅库茨克</timezone>
diff --git a/res/xml/timezones.xml b/res/xml/timezones.xml
index e515f16b7..c9667b82f 100644
--- a/res/xml/timezones.xml
+++ b/res/xml/timezones.xml
@@ -62,7 +62,8 @@
     <timezone id="Asia/Rangoon">Yangon</timezone>
     <timezone id="Asia/Krasnoyarsk">Krasnoyarsk</timezone>
     <timezone id="Asia/Bangkok">Bangkok</timezone>
-    <timezone id="Asia/Hong_Kong">Beijing, Hong Kong</timezone>
+    <timezone id="Asia/Shanghai">Beijing</timezone>
+    <timezone id="Asia/Hong_Kong">Hong Kong</timezone>
     <timezone id="Asia/Irkutsk">Irkutsk</timezone>
     <timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>
     <timezone id="Australia/Perth">Perth</timezone>