Merge pull request #190 from rocco27/master

Life is Feudal xml and english language updates

lang/English/modules/TS3Admin.php

@@ -37,7 +37,7 @@ define('e_conn_serverquery', "Could not create ServerQuery access.");
 define('e_conn_vserver', "Could not choose virtual server.");
 define('e_session_timedout', "Session expired.");
 define('js_error', "Error");
-define('js_ajax_error', "An AJAX error has occurred. %1");
+define('js_ajax_error', "An AJAX error has occurred: %1.");
 define('js_confirm_server_stop', "Do you really want to stop server #%1?");
 define('js_confirm_server_delete', "Do you really want to DELETE server #%1?");
 define('js_notice_server_deleted', "Server %1 was deleted successfully.\nThe overview page will be getting reloaded now.");
@@ -172,4 +172,4 @@ define('select_subuser', "Select subuser.");
 define('no_ts3_servers_assigned_to_account', "You have no servers assigned to your account.");
 define('change_virtual_server', "Change Virtual Server");
 define('change_remote_server', "Change Remote Server");
-?>
+?>

lang/English/modules/gamemanager.php

@@ -142,8 +142,8 @@ define('steamid', "Steam ID");
 define('player', "Player");
 define('port', "Port");
 define('rcon_presets', "RCON presets");
-define('update_from_local_master_server', "Update from local master server");
-define('update_from_selected_rsync_server', "Update from selected rsync server");
+define('update_from_local_master_server', "Update from local Master Server");
+define('update_from_selected_rsync_server', "Update from selected Rsync server");
 define('execute_selected_server_operations', "Execute selected server operations");
 define('execute_operations', "Execute operations");
 define('account_expiration', "Account expiration");
@@ -198,4 +198,4 @@ define('attempting_nonmaster_update', "You are attempting to update this server
 define('cannot_update_from_own_self', "Local Server Update may not run on a master server.");
 define('show_server_id', "Show Server IDs");
 define('hide_server_id', "Hide Server IDs");
-?>
+?>

modules/config_games/server_configs/life_is_feudal_win32.xml → modules/config_games/server_configs/lifeisfeudal_win32.xml

@@ -1,15 +1,15 @@
 <game_config>
-  <game_key>lif_win32</game_key>
+  <game_key>lifeisfeudal_win32</game_key>
   <protocol>lgsl</protocol>
-  <lgsl_query_name>lif</lgsl_query_name>
+  <lgsl_query_name>lifeisfeudal</lgsl_query_name>
   <installer>steamcmd</installer>
-  <game_name>Life Is Feudal</game_name>
+  <game_name>Life is Feudal</game_name>
   <server_exec_name>ddctd_cm_yo_server.exe</server_exec_name>
   <cli_template>-worldID 1</cli_template>
   <max_user_amount>64</max_user_amount>
   <mods>
-    <mod key="LIF">
-      <name>none</name>
+    <mod key="default">
+      <name>None</name>
       <installer_name>320850</installer_name>
       <installer_login>anonymous</installer_login>
     </mod>

protocol/lgsl/lgsl_protocol.php

@@ -84,7 +84,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"killingfloor"	=> "Killing Floor",
 		"killingfloor2"	=> "Killing Floor 2",
 		"kingpin"		=> "Kingpin: Life of Crime",
-		"lif"			=> "Life is Feudal",
+		"lifeisfeudal"	=> "Life is Feudal",
 		"modernwarfare3"=> "CoD: Modern Warfare 3",
 		"moh"			=> "Medal of Honor",
 		"mohaa"			=> "Medal of Honor: Allied Assault",
@@ -224,7 +224,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"killingfloor"	=> "13",
 		"killingfloor2"	=> "05",
 		"kingpin"		=> "03",
-		"lif"			=> "05",
+		"lifeisfeudal"	=> "05",
 		"modernwarfare3"=> "31",
 		"moh"			=> "30",
 		"mohaa"			=> "03",
@@ -372,7 +372,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 		"killingfloor"	=> "steam://connect/{IP}:{C_PORT}",
 		"killingfloor2" => "steam://connect/{IP}:{S_PORT}",
 		"kingpin"		=> "qtracker://{IP}:{S_PORT}?game=Kingpin&action=show",
-		"lif"			=> "steam://connect/{IP}:{Q_PORT}",
+		"lifeisfeudal"	=> "steam://connect/{IP}:{Q_PORT}",
 		"modernwarfare3"=> "http://en.wikipedia.org/wiki/Call_of_Duty:_Modern_Warfare_3",
 		"mohaa"			=> "qtracker://{IP}:{S_PORT}?game=MedalofHonorAlliedAssault&action=show",
 		"mohaab"		=> "qtracker://{IP}:{S_PORT}?game=MedalofHonorAlliedAssaultBreakthrough&action=show",
@@ -486,7 +486,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 			case "kingpin"			: $c_to_q = -10;	$c_def = 31510;	$q_def = 31500;	$c_to_s = 0;	break;
 			case "killingfloor"		: $c_to_q = 1;		$c_def = 7708;	$q_def = 7709;	$c_to_s = 0;	break;
 			case "killingfloor2"	: $c_to_q = 19238; 	$c_def = 7777; 	$q_def = 27015; $c_to_s = 0;  	break;
-			case "lif"				: $c_to_q = 2;		$c_def = 28000; $q_def = 28002; $c_to_s = 0;	break;
+			case "lifeisfeudal"		: $c_to_q = 2;		$c_def = 28000; $q_def = 28002; $c_to_s = 0;	break;
 			case "modernwarfare3"	: $c_to_q = -1;		$c_def = 27015;	$q_def = 27014;	$c_to_s = 0;	break;
 			case "mohaa"			: $c_to_q = 97;		$c_def = 12203;	$q_def = 12300;	$c_to_s = 0;	break;
 			case "mohaab"			: $c_to_q = 97;		$c_def = 12203;	$q_def = 12300;	$c_to_s = 0;	break;