Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49e8d2e9 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 7060 into donut 

* changes:
  1. Added the missing timezone for mainland China "Asia/Shanghai". In each localized version of timezones.xml, the name of this timezone is defined like "China Standard Time (Beijing)" if some other timezones are also in this format, or just "Beijing" if all of other timezones are of city names.
parents 6dde8965 58d60179

res/xml-cs/timezones.xml

+2 −1
Original line number Diff line number Diff line
@@ -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>

res/xml-de/timezones.xml

+1 −0
Original line number Diff line number Diff line
@@ -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>

res/xml-es/timezones.xml

+2 −1
Original line number Diff line number Diff line
@@ -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>

res/xml-fr/timezones.xml

+2 −1
Original line number Diff line number Diff line
@@ -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>

res/xml-it/timezones.xml

+2 −1
Original line number Diff line number Diff line
@@ -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>