From bfdd439231d7a84f8152ab51941bfa72116208a8 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 13 Feb 2015 17:40:33 +0100
Subject: [PATCH] russian time zone update

---
 .../install/files/lib/util/DateUtil.class.php  | 18 +++++++++---------
 wcfsetup/install/lang/de.xml                   | 18 +++++++++---------
 wcfsetup/install/lang/en.xml                   | 18 +++++++++---------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/wcfsetup/install/files/lib/util/DateUtil.class.php b/wcfsetup/install/files/lib/util/DateUtil.class.php
index 62f6d67b84..12536467b6 100644
--- a/wcfsetup/install/files/lib/util/DateUtil.class.php
+++ b/wcfsetup/install/files/lib/util/DateUtil.class.php
@@ -81,37 +81,39 @@ final class DateUtil {
 		'Europe/Helsinki', // (UTC+02:00) Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius
 		'Asia/Jerusalem', // (UTC+02:00) Jerusalem
 		'Africa/Cairo', // (UTC+02:00) Cairo
+		'Europe/Kaliningrad', // (UTC+02:00) Kaliningrad
 		'Asia/Amman', // (UTC+03:00) Amman
 		'Asia/Baghdad', // (UTC+03:00) Baghdad
-		'Europe/Minsk', // (UTC+03:00) Kaliningrad, Minsk
+		'Europe/Minsk', // (UTC+03:00) Minsk
+		'Europe/Moscow', // (UTC+03:00) Moscow, Volgograd
 		'Asia/Kuwait', // (UTC+03:00) Kuwait, Riyadh
 		'Africa/Nairobi', // (UTC+03:00) Nairobi
 		'Asia/Tehran', // (UTC+03:30) Tehran
 		'Asia/Muscat', // (UTC+04:00) Muscat
 		'Asia/Baku', // (UTC+04:00) Baku
 		'Asia/Yerevan', // (UTC+04:00) Yerevan
-		'Europe/Moscow', // (UTC+04:00) Moscow, Volgograd
 		'Indian/Mauritius', // (UTC+04:00) Port Loius
 		'Asia/Tbilisi', // (UTC+04:00) Tbilisi
 		'Asia/Kabul', // (UTC+04:30) Kabul
 		'Asia/Karachi', // (UTC+05:00) Karachi
+		'Asia/Yekaterinburg', // (UTC+05:00) Ekaterinburg
 		'Asia/Tashkent', // (UTC+05:00) Tashkent
 		'Asia/Kolkata', // (UTC+05:30) Calcutta, New Dehli
 		'Asia/Colombo', // (UTC+05:30) Sri Jayawardenepura
 		'Asia/Katmandu', // (UTC+05:45) Kathmandu
 		'Asia/Almaty', // (UTC+06:00) Almaty
 		'Asia/Dhaka', // (UTC+06:00) Dhaka
-		'Asia/Yekaterinburg', // (UTC+06:00) Ekaterinburg
+		'Asia/Novosibirsk', // (UTC+06:00) Novosibirsk
 		'Asia/Rangoon', // (UTC+06:30) Yangon (Rangoon)
 		'Asia/Bangkok', // (UTC+07:00) Bangkok, Jakarta
-		'Asia/Novosibirsk', // (UTC+07:00) Novosibirsk
-		'Asia/Krasnoyarsk', // (UTC+08:00) Krasnoyarsk
+		'Asia/Krasnoyarsk', // (UTC+07:00) Krasnoyarsk
+		'Asia/Irkutsk', // (UTC+08:00) Irkutsk
 		'Asia/Kuala_Lumpur', // (UTC+08:00) Kuala Lumpur, Singapore
 		'Asia/Chongqing', // (UTC+08:00) Beijing, Chongqing, Hong Kong
 		'Australia/Perth', // (UTC+08:00) Perth
 		'Asia/Taipei', // (UTC+08:00) Taipei
 		'Asia/Ulaanbaatar', // (UTC+08:00) Ulaan Bataar
-		'Asia/Irkutsk', // (UTC+09:00) Irkutsk
+		'Asia/Yakutsk', // (UTC+09:00) Yakutsk
 		'Asia/Tokyo', // (UTC+09:00) Tokyo
 		'Asia/Seoul', // (UTC+09:00) Seoul
 		'Australia/Adelaide', // (UTC+09:30) Adelaide
@@ -120,12 +122,10 @@ final class DateUtil {
 		'Australia/Sydney', // (UTC+10:00) Canberra, Melbourne, Sydney
 		'Pacific/Guam', // (UTC+10:00) Guam, Port Moresby
 		'Australia/Hobart', // (UTC+10:00) Hobart
-		'Asia/Yakutsk', // (UTC+10:00) Yakutsk
+		'Asia/Vladivostok', // (UTC+10:00) Vladivostok
 		'Pacific/Noumea', // (UTC+11:00) New Caledonia
-		'Asia/Vladivostok', // (UTC+11:00) Vladivostok
 		'Pacific/Auckland', // (UTC+12:00) Auckland
 		'Pacific/Fiji', // (UTC+12:00) Fiji
-		'Asia/Magadan', // (UTC+12:00) Magadan
 		'Pacific/Tongatapu', // (UTC+13:00) Nukualofa
 		'Pacific/Apia', // (UTC+13:00) Samoa
 	);
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 402e8fa838..4254a3ae55 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2064,7 +2064,8 @@ Fehler sind beispielsweise:
 		<item name="wcf.date.timezone.europe.helsinki"><![CDATA[(UTC+02:00) Helsinki, Kiew, Riga, Sofia, Tallinn, Wilna]]></item>
 		<item name="wcf.date.timezone.asia.jerusalem"><![CDATA[(UTC+02:00) Jerusalem]]></item>
 		<item name="wcf.date.timezone.africa.cairo"><![CDATA[(UTC+02:00) Kairo]]></item>
-		<item name="wcf.date.timezone.europe.minsk"><![CDATA[(UTC+03:00) Kaliningrad, Minsk]]></item>
+		<item name="wcf.date.timezone.europe.kaliningrad"><![CDATA[(UTC+02:00) Kaliningrad]]></item>
+		<item name="wcf.date.timezone.europe.minsk"><![CDATA[(UTC+03:00) Minsk]]></item>
 		<item name="wcf.date.timezone.asia.baghdad"><![CDATA[(UTC+03:00) Bagdad]]></item>
 		<item name="wcf.date.timezone.asia.kuwait"><![CDATA[(UTC+03:00) Kuwait, Riad]]></item>
 		<item name="wcf.date.timezone.africa.nairobi"><![CDATA[(UTC+03:00) Nairobi]]></item>
@@ -2072,29 +2073,29 @@ Fehler sind beispielsweise:
 		<item name="wcf.date.timezone.asia.muscat"><![CDATA[(UTC+04:00) Abu Dhabi, Muskat]]></item>
 		<item name="wcf.date.timezone.asia.baku"><![CDATA[(UTC+04:00) Baku]]></item>
 		<item name="wcf.date.timezone.asia.yerevan"><![CDATA[(UTC+04:00) Eriwan]]></item>
-		<item name="wcf.date.timezone.europe.moscow"><![CDATA[(UTC+04:00) Moskau, St. Petersburg, Wolgograd]]></item>
+		<item name="wcf.date.timezone.europe.moscow"><![CDATA[(UTC+03:00) Moskau, St. Petersburg, Wolgograd]]></item>
 		<item name="wcf.date.timezone.indian.mauritius"><![CDATA[(UTC+04:00) Port Louis]]></item>
 		<item name="wcf.date.timezone.asia.tbilisi"><![CDATA[(UTC+04:00) Tiflis]]></item>
 		<item name="wcf.date.timezone.asia.kabul"><![CDATA[(UTC+04:30) Kabul]]></item>
 		<item name="wcf.date.timezone.asia.karachi"><![CDATA[(UTC+05:00) Islamabad, Karatschi]]></item>
-		<item name="wcf.date.timezone.asia.yekaterinburg"><![CDATA[(UTC+06:00) Jekaterinburg]]></item>
+		<item name="wcf.date.timezone.asia.yekaterinburg"><![CDATA[(UTC+05:00) Jekaterinburg]]></item>
 		<item name="wcf.date.timezone.asia.tashkent"><![CDATA[(UTC+05:00) Taschkent]]></item>
 		<item name="wcf.date.timezone.asia.kolkata"><![CDATA[(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi]]></item>
 		<item name="wcf.date.timezone.asia.colombo"><![CDATA[(UTC+05:30) Sri Jayawardenepura]]></item>
 		<item name="wcf.date.timezone.asia.katmandu"><![CDATA[(UTC+05:45) Katmandu]]></item>
 		<item name="wcf.date.timezone.asia.almaty"><![CDATA[(UTC+06:00) Astana]]></item>
 		<item name="wcf.date.timezone.asia.dhaka"><![CDATA[(UTC+06:00) Dakka]]></item>
-		<item name="wcf.date.timezone.asia.novosibirsk"><![CDATA[(UTC+07:00) Nowosibirsk]]></item>
+		<item name="wcf.date.timezone.asia.novosibirsk"><![CDATA[(UTC+06:00) Nowosibirsk]]></item>
 		<item name="wcf.date.timezone.asia.rangoon"><![CDATA[(UTC+06:30) Yangon (Rangun)]]></item>
 		<item name="wcf.date.timezone.asia.bangkok"><![CDATA[(UTC+07:00) Bangkok, Hanoi, Jakarta]]></item>
-		<item name="wcf.date.timezone.asia.krasnoyarsk"><![CDATA[(UTC+08:00) Krasnojarsk]]></item>
-		<item name="wcf.date.timezone.asia.irkutsk"><![CDATA[(UTC+09:00) Irkutsk]]></item>
+		<item name="wcf.date.timezone.asia.krasnoyarsk"><![CDATA[(UTC+07:00) Krasnojarsk]]></item>
+		<item name="wcf.date.timezone.asia.irkutsk"><![CDATA[(UTC+08:00) Irkutsk]]></item>
 		<item name="wcf.date.timezone.asia.kuala_lumpur"><![CDATA[(UTC+08:00) Kuala Lumpur, Singapur]]></item>
 		<item name="wcf.date.timezone.asia.chongqing"><![CDATA[(UTC+08:00) Peking, Chongqing, Hongkong, Ürümqi]]></item>
 		<item name="wcf.date.timezone.australia.perth"><![CDATA[(UTC+08:00) Perth]]></item>
 		<item name="wcf.date.timezone.asia.taipei"><![CDATA[(UTC+08:00) Taipeh]]></item>
 		<item name="wcf.date.timezone.asia.ulaanbaatar"><![CDATA[(UTC+08:00) Ulan-Bator]]></item>
-		<item name="wcf.date.timezone.asia.yakutsk"><![CDATA[(UTC+10:00) Jakutsk]]></item>
+		<item name="wcf.date.timezone.asia.yakutsk"><![CDATA[(UTC+09:00) Jakutsk]]></item>
 		<item name="wcf.date.timezone.asia.tokyo"><![CDATA[(UTC+09:00) Osaka, Sapporo, Tokio]]></item>
 		<item name="wcf.date.timezone.asia.seoul"><![CDATA[(UTC+09:00) Seoul]]></item>
 		<item name="wcf.date.timezone.australia.adelaide"><![CDATA[(UTC+09:30) Adelaide]]></item>
@@ -2103,8 +2104,7 @@ Fehler sind beispielsweise:
 		<item name="wcf.date.timezone.australia.sydney"><![CDATA[(UTC+10:00) Canberra, Melbourne, Sydney]]></item>
 		<item name="wcf.date.timezone.pacific.guam"><![CDATA[(UTC+10:00) Guam, Port Moresby]]></item>
 		<item name="wcf.date.timezone.australia.hobart"><![CDATA[(UTC+10:00) Hobart]]></item>
-		<item name="wcf.date.timezone.asia.vladivostok"><![CDATA[(UTC+11:00) Wladiwostok]]></item>
-		<item name="wcf.date.timezone.asia.magadan"><![CDATA[(UTC+12:00) Magadan]]></item>
+		<item name="wcf.date.timezone.asia.vladivostok"><![CDATA[(UTC+10:00) Magadan, Wladiwostok]]></item>
 		<item name="wcf.date.timezone.pacific.noumea"><![CDATA[(UTC+11:00) Salomonen, Neu-Kaledonien]]></item>
 		<item name="wcf.date.timezone.pacific.auckland"><![CDATA[(UTC+12:00) Auckland, Wellington]]></item>
 		<item name="wcf.date.timezone.pacific.fiji"><![CDATA[(UTC+12:00) Fidschi]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 2370270ca1..bf12ce6e26 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2063,7 +2063,8 @@ Errors are:
 		<item name="wcf.date.timezone.europe.helsinki"><![CDATA[(UTC+02:00) Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius]]></item>
 		<item name="wcf.date.timezone.asia.jerusalem"><![CDATA[(UTC+02:00) Jerusalem]]></item>
 		<item name="wcf.date.timezone.africa.cairo"><![CDATA[(UTC+02:00) Cairo]]></item>
-		<item name="wcf.date.timezone.europe.minsk"><![CDATA[(UTC+03:00) Kaliningrad, Minsk]]></item>
+		<item name="wcf.date.timezone.europe.kaliningrad"><![CDATA[(UTC+02:00) Kaliningrad]]></item>
+		<item name="wcf.date.timezone.europe.minsk"><![CDATA[(UTC+03:00) Minsk]]></item>
 		<item name="wcf.date.timezone.asia.baghdad"><![CDATA[(UTC+03:00) Baghdad]]></item>
 		<item name="wcf.date.timezone.asia.kuwait"><![CDATA[(UTC+03:00) Kuwait, Riyadh]]></item>
 		<item name="wcf.date.timezone.africa.nairobi"><![CDATA[(UTC+03:00) Nairobi]]></item>
@@ -2071,29 +2072,29 @@ Errors are:
 		<item name="wcf.date.timezone.asia.muscat"><![CDATA[(UTC+04:00) Abu Dhabi, Muscat]]></item>
 		<item name="wcf.date.timezone.asia.baku"><![CDATA[(UTC+04:00) Baku]]></item>
 		<item name="wcf.date.timezone.asia.yerevan"><![CDATA[(UTC+04:00) Yerevan]]></item>
-		<item name="wcf.date.timezone.europe.moscow"><![CDATA[(UTC+04:00) Moscow, Saint Petersburg, Volgograd]]></item>
+		<item name="wcf.date.timezone.europe.moscow"><![CDATA[(UTC+03:00) Moscow, Saint Petersburg, Volgograd]]></item>
 		<item name="wcf.date.timezone.indian.mauritius"><![CDATA[(UTC+04:00) Port Louis]]></item>
 		<item name="wcf.date.timezone.asia.tbilisi"><![CDATA[(UTC+04:00) Tbilisi]]></item>
 		<item name="wcf.date.timezone.asia.kabul"><![CDATA[(UTC+04:30) Kabul]]></item>
 		<item name="wcf.date.timezone.asia.karachi"><![CDATA[(UTC+05:00) Islamabad, Karachi]]></item>
-		<item name="wcf.date.timezone.asia.yekaterinburg"><![CDATA[(UTC+06:00) Yekaterinburg]]></item>
+		<item name="wcf.date.timezone.asia.yekaterinburg"><![CDATA[(UTC+05:00) Yekaterinburg]]></item>
 		<item name="wcf.date.timezone.asia.tashkent"><![CDATA[(UTC+05:00) Tashkent]]></item>
 		<item name="wcf.date.timezone.asia.kolkata"><![CDATA[(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi]]></item>
 		<item name="wcf.date.timezone.asia.colombo"><![CDATA[(UTC+05:30) Sri Jayawardenapura]]></item>
 		<item name="wcf.date.timezone.asia.katmandu"><![CDATA[(UTC+05:45) Kathmandu]]></item>
 		<item name="wcf.date.timezone.asia.almaty"><![CDATA[(UTC+06:00) Astana]]></item>
 		<item name="wcf.date.timezone.asia.dhaka"><![CDATA[(UTC+06:00) Dhaka]]></item>
-		<item name="wcf.date.timezone.asia.novosibirsk"><![CDATA[(UTC+07:00) Novosibirsk]]></item>
+		<item name="wcf.date.timezone.asia.novosibirsk"><![CDATA[(UTC+06:00) Novosibirsk]]></item>
 		<item name="wcf.date.timezone.asia.rangoon"><![CDATA[(UTC+06:30) Yangon (Rangoon)]]></item>
 		<item name="wcf.date.timezone.asia.bangkok"><![CDATA[(UTC+07:00) Bangkok, Hanoi, Jakarta]]></item>
-		<item name="wcf.date.timezone.asia.krasnoyarsk"><![CDATA[(UTC+08:00) Krasnoyarsk]]></item>
-		<item name="wcf.date.timezone.asia.irkutsk"><![CDATA[(UTC+09:00) Irkutsk]]></item>
+		<item name="wcf.date.timezone.asia.krasnoyarsk"><![CDATA[(UTC+07:00) Krasnoyarsk]]></item>
+		<item name="wcf.date.timezone.asia.irkutsk"><![CDATA[(UTC+08:00) Irkutsk]]></item>
 		<item name="wcf.date.timezone.asia.kuala_lumpur"><![CDATA[(UTC+08:00) Kuala Lumpur, Singapore]]></item>
 		<item name="wcf.date.timezone.asia.chongqing"><![CDATA[(UTC+08:00) Beijing, Chongqing, Hong Kong, Ürümqi]]></item>
 		<item name="wcf.date.timezone.australia.perth"><![CDATA[(UTC+08:00) Perth]]></item>
 		<item name="wcf.date.timezone.asia.taipei"><![CDATA[(UTC+08:00) Taipei]]></item>
 		<item name="wcf.date.timezone.asia.ulaanbaatar"><![CDATA[(UTC+08:00) Ulan Bator]]></item>
-		<item name="wcf.date.timezone.asia.yakutsk"><![CDATA[(UTC+10:00) Yakutsk]]></item>
+		<item name="wcf.date.timezone.asia.yakutsk"><![CDATA[(UTC+09:00) Yakutsk]]></item>
 		<item name="wcf.date.timezone.asia.tokyo"><![CDATA[(UTC+09:00) Osaka, Sapporo, Tokyo]]></item>
 		<item name="wcf.date.timezone.asia.seoul"><![CDATA[(UTC+09:00) Seoul]]></item>
 		<item name="wcf.date.timezone.australia.adelaide"><![CDATA[(UTC+09:30) Adelaide]]></item>
@@ -2102,8 +2103,7 @@ Errors are:
 		<item name="wcf.date.timezone.australia.sydney"><![CDATA[(UTC+10:00) Canberra, Melbourne, Sydney]]></item>
 		<item name="wcf.date.timezone.pacific.guam"><![CDATA[(UTC+10:00) Guam, Port Moresby]]></item>
 		<item name="wcf.date.timezone.australia.hobart"><![CDATA[(UTC+10:00) Hobart]]></item>
-		<item name="wcf.date.timezone.asia.vladivostok"><![CDATA[(UTC+11:00) Vladivostok]]></item>
-		<item name="wcf.date.timezone.asia.magadan"><![CDATA[(UTC+12:00) Magadan]]></item>
+		<item name="wcf.date.timezone.asia.vladivostok"><![CDATA[(UTC+10:00) Magadan, Vladivostok]]></item>
 		<item name="wcf.date.timezone.pacific.noumea"><![CDATA[(UTC+11:00) Solomon Islands, New Caledonia]]></item>
 		<item name="wcf.date.timezone.pacific.auckland"><![CDATA[(UTC+12:00) Auckland, Wellington]]></item>
 		<item name="wcf.date.timezone.pacific.fiji"><![CDATA[(UTC+12:00) Fiji]]></item>
-- 
2.20.1