summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2013-01-31 04:10:11 -0800
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2013-01-31 04:10:11 -0800
commit148eb22eeafc699cdc10b1ae41c38d23f90dd04a (patch)
tree6b45f117a8db01907b93bafcc7d1023b643ae149
parent56f3c5fa9b6a18a83728d260e6be5fdfefdad0ce (diff)
parent83f40755372c2cdea62c610b8b2a57db445155cb (diff)
downloadpackages_apps_Settings-148eb22eeafc699cdc10b1ae41c38d23f90dd04a.zip
packages_apps_Settings-148eb22eeafc699cdc10b1ae41c38d23f90dd04a.tar.gz
packages_apps_Settings-148eb22eeafc699cdc10b1ae41c38d23f90dd04a.tar.bz2
Merge "Settings: Update time zones" into cm-10.1
-rw-r--r--res/xml-de/timezones.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/res/xml-de/timezones.xml b/res/xml-de/timezones.xml
index 6f0661d..223501d 100644
--- a/res/xml-de/timezones.xml
+++ b/res/xml-de/timezones.xml
@@ -30,7 +30,7 @@
<timezone id="Africa/Casablanca">Casablanca</timezone>
<timezone id="Europe/London">London</timezone>
<timezone id="Europe/Amsterdam">Mitteleuropäische Zeit (Amsterdam)</timezone>
- <timezone id="Europe/Belgrade">Mitteleuropäische Zeit (Belgrade)</timezone>
+ <timezone id="Europe/Belgrade">Mitteleuropäische Zeit (Belgrad)</timezone>
<timezone id="Europe/Brussels">Mitteleuropäische Zeit (Brüssel)</timezone>
<timezone id="Europe/Sarajevo">Mitteleuropäische Zeit (Sarajevo)</timezone>
<timezone id="Africa/Windhoek">Windhoek</timezone>
@@ -50,20 +50,20 @@
<timezone id="Asia/Tehran">Teheran</timezone>
<timezone id="Asia/Baku">Baku</timezone>
<timezone id="Asia/Tbilisi">Tiflis</timezone>
- <timezone id="Asia/Yerevan">Erivan</timezone>
+ <timezone id="Asia/Yerevan">Jerewan</timezone>
<timezone id="Asia/Dubai">Dubai</timezone>
<timezone id="Asia/Kabul">Afghanistan-Zeit (Kabul)</timezone>
- <timezone id="Asia/Karachi">Karachi</timezone>
+ <timezone id="Asia/Karachi">Karatschi</timezone>
<timezone id="Asia/Oral">Oral</timezone>
<timezone id="Asia/Yekaterinburg">Jekaterinburg</timezone>
- <timezone id="Asia/Calcutta">Calcutta</timezone>
+ <timezone id="Asia/Calcutta">Kalkutta</timezone>
<timezone id="Asia/Colombo">Colombo</timezone>
- <timezone id="Asia/Katmandu">Katmandu</timezone>
+ <timezone id="Asia/Katmandu">Kathmandu</timezone>
<timezone id="Asia/Almaty">Almaty</timezone>
- <timezone id="Asia/Rangoon">Rangoon</timezone>
+ <timezone id="Asia/Rangoon">Rangun</timezone>
<timezone id="Asia/Krasnoyarsk">Krasnojarsk</timezone>
<timezone id="Asia/Bangkok">Bangkok</timezone>
- <timezone id="Asia/Shanghai">Beijing</timezone>
+ <timezone id="Asia/Shanghai">Peking, Shanghai</timezone>
<timezone id="Asia/Hong_Kong">Hongkong</timezone>
<timezone id="Asia/Irkutsk">Irkutsk</timezone>
<timezone id="Asia/Kuala_Lumpur">Kuala Lumpur</timezone>