This commit is contained in:
Shadow
2014-05-12 08:49:33 +03:00
parent 8e6a39a900
commit 74293e4f53
-8
View File
@@ -935,11 +935,6 @@ define("CONSTRUCT_NEW_BUILDING","Construct new building");
define("SHOWSOON_AVAILABLE_BUILDINGS","show soon available buildings");
define("HIDESOON_AVAILABLE_BUILDINGS","hide soon available buildings");
<<<<<<< HEAD
=======
>>>>>>> a8a79eb6ef20f64140101971a8ae64b060adf572
//artefact
define("ARCHITECTS_DESC","All buildings in the area of effect are stronger. This means that you will need more catapults to damage buildings protected by this artifacts powers.");
define("ARCHITECTS_SMALL","The architects slight secret");
@@ -1084,8 +1079,6 @@ define("WWVILLAGE","WW village");
$lang['forum'] = "Forum";
$lang['register'] = "Register";
$lang['login'] = "Login";
<<<<<<< HEAD
=======
$lang['screenshots']['title1']="Village";
$lang['screenshots']['desc1']="Village building";
$lang['screenshots']['title2']="Resource";
@@ -1100,7 +1093,6 @@ define("WWVILLAGE","WW village");
$lang['screenshots']['desc6']="View your ranking in statistics";
$lang['screenshots']['title7']="Weapons or dough";
$lang['screenshots']['desc7']="You can choose to play as military or economy";
>>>>>>> a8a79eb6ef20f64140101971a8ae64b060adf572
?>