diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php
index a69a58f4..bfec504d 100755
--- a/GameEngine/Lang/en.php
+++ b/GameEngine/Lang/en.php
@@ -143,7 +143,8 @@ define("DONE_AT","done at");
 define("CANCEL","cancel");
 define("LOYALTY","Loyalty");
 define("CALCULATED_IN","Calculated in");
-define("SEVER_TIME","Server time:");
+define("CALCULATED","Calculated in");
+define("SERVER_TIME","Server time:");
 define("HI","HI");
 define("P_IN","in");
 
@@ -740,10 +741,6 @@ define("START_NOW","START NOW");
 define("NOTHING_HERE","Nothing here!");
 define("WE_LOOKED","We looked 404 times already but can't find anything");
 
-//TIME RELATED
-define("CALCULATED","Calculated in");
-define("SERVER_TIME","Server time:");
-
 //MASSMESSAGE.php
 define("MASS","Message Content");
 define("MASS_SUBJECT","Subject:");
diff --git a/GameEngine/Lang/zh_tw.php b/GameEngine/Lang/zh_tw.php
index 4e358961..e14df8b9 100644
--- a/GameEngine/Lang/zh_tw.php
+++ b/GameEngine/Lang/zh_tw.php
@@ -142,7 +142,8 @@ define("DONE_AT","完成于");
 define("CANCEL","取消");
 define("LOYALTY","忠诚度");
 define("CALCULATED_IN","响应延迟");
-define("SEVER_TIME","服务器时间:");
+define("CALCULATED","响应延迟");
+define("SERVER_TIME","服务器时间:");
 define("HI","嗨");
 define("P_IN","在");
 
@@ -739,10 +740,6 @@ define("START_NOW","现在启动");
 define("NOTHING_HERE","这儿什么也没有!");
 define("WE_LOOKED","我们找了 404 次，但什么都没有发现");
 
-//TIME RELATED
-define("CALCULATED","响应延迟");
-define("SERVER_TIME","服务器时间:");
-
 //MASSMESSAGE.php
 define("MASS","消息内容");
 define("MASS_SUBJECT","主题:");
diff --git a/Templates/menu.tpl b/Templates/menu.tpl
index 6a592891..80ea1bf1 100644
--- a/Templates/menu.tpl
+++ b/Templates/menu.tpl
@@ -126,7 +126,7 @@ div.c1 {text-align: center}
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
             </div>
         </div>
     </div>
diff --git a/a2b2.php b/a2b2.php
index a1aad2fa..c27a2a1a 100644
--- a/a2b2.php
+++ b/a2b2.php
@@ -367,7 +367,7 @@ include("Templates/res.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/banned.php b/banned.php
index 7fd9c756..8f2b4199 100644
--- a/banned.php
+++ b/banned.php
@@ -90,7 +90,7 @@ include("Templates/res.tpl")
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/berichte.php b/berichte.php
index 6aed74a1..2389b0bb 100644
--- a/berichte.php
+++ b/berichte.php
@@ -144,7 +144,7 @@ include("Templates/res.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/crop_finder.php b/crop_finder.php
index 9711f018..21179965 100644
--- a/crop_finder.php
+++ b/crop_finder.php
@@ -236,7 +236,7 @@ if(!NEW_FUNCTIONS_DISPLAY_LINKS) {
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/dorf1.php b/dorf1.php
index 8c67e77c..98e8cc9d 100644
--- a/dorf1.php
+++ b/dorf1.php
@@ -112,7 +112,7 @@ include("Templates/res.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/dorf2.php b/dorf2.php
index 8f43dbc6..15710557 100644
--- a/dorf2.php
+++ b/dorf2.php
@@ -101,7 +101,7 @@ include("Templates/res.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/dorf3.php b/dorf3.php
index 73a1d1d9..0116e339 100644
--- a/dorf3.php
+++ b/dorf3.php
@@ -121,7 +121,7 @@ include("Templates/res.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/karte.php b/karte.php
index d974e813..14151bca 100644
--- a/karte.php
+++ b/karte.php
@@ -117,7 +117,7 @@ include("Templates/res.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/logout.php b/logout.php
index b6a6d6ac..71d365c6 100644
--- a/logout.php
+++ b/logout.php
@@ -87,7 +87,7 @@ include("Templates/footer.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/maintenance.php b/maintenance.php
index 3e586666..b54f299c 100644
--- a/maintenance.php
+++ b/maintenance.php
@@ -116,7 +116,7 @@ if($_SESSION['ok'] == 2){
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 					</div>
 				</div>
 			</div>
diff --git a/nachrichten.php b/nachrichten.php
index e44eab14..fcdaebb4 100644
--- a/nachrichten.php
+++ b/nachrichten.php
@@ -180,7 +180,7 @@ include("Templates/res.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/packages.php b/packages.php
index 6d448f7f..b450c7aa 100644
--- a/packages.php
+++ b/packages.php
@@ -107,7 +107,7 @@ include("Templates/res.tpl")
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/plus.php b/plus.php
index f95c2e17..72671d7e 100644
--- a/plus.php
+++ b/plus.php
@@ -178,7 +178,7 @@ include("Templates/res.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/plus1.php b/plus1.php
index be628d7d..d3eefc6b 100644
--- a/plus1.php
+++ b/plus1.php
@@ -101,7 +101,7 @@ include("Templates/res.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/rules.php b/rules.php
index 8e469d62..54083154 100644
--- a/rules.php
+++ b/rules.php
@@ -95,7 +95,7 @@ include("Templates/res.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/spieler.php b/spieler.php
index 201e8aea..592a3c24 100644
--- a/spieler.php
+++ b/spieler.php
@@ -188,7 +188,7 @@ include("Templates/res.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/statistiken.php b/statistiken.php
index ccef3161..315b26ae 100644
--- a/statistiken.php
+++ b/statistiken.php
@@ -198,7 +198,7 @@ include("Templates/res.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/support.php b/support.php
index 2d681101..05676319 100644
--- a/support.php
+++ b/support.php
@@ -168,7 +168,7 @@ include("Templates/res.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/version.php b/version.php
index efd227f8..6b386dfb 100644
--- a/version.php
+++ b/version.php
@@ -135,7 +135,7 @@ include("Templates/res.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/warsim.php b/warsim.php
index b9de15fe..d955d7ad 100644
--- a/warsim.php
+++ b/warsim.php
@@ -192,7 +192,7 @@ include("Templates/res.tpl");
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 </div>
 	</div>
 </div>
diff --git a/winner.php b/winner.php
index 4d0a05ed..241095f2 100644
--- a/winner.php
+++ b/winner.php
@@ -251,7 +251,7 @@ if(isset($_GET['newdid'])) {
 echo round(($generator->pageLoadTimeEnd()-$start_timer)*1000);
 ?></b> ms
 
-<br /><?php echo SEVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
+<br /><?php echo SERVER_TIME;?> <span id="tp1" class="b"><?php echo date('H:i:s'); ?></span>
 					</div>
 				</div>
 			</div>