Merge pull request #7 from rocco27/master

Incoming new updates

lang/English/install.php

@@ -63,6 +63,6 @@ define('setup_complete', "Setup has been completed successfully. The Open Game P
 define('remove_install_and_secure_config', "You should delete install.php from your server and chmod your includes/config.inc.php back to 644 for security purposes.");
 define('go_to_panel', "Click here to login to your OGP.");
 define('unable_to_resolve', "If you are unable to resolve this problem please visit OGP website ");
-define('slogan', "The OpenSource one!");
+define('slogan', "The Open-Source one!");
 define('default_welcome_title_message', "Welcome! <b style='font-size:12px; font-weight:normal;'>You can change this title in '<a href='?m=settings&p=themes'>Theme Settings</a>' under the '<a href='?m=administration&p=main'>Administration</a>' tab.</b>");
 ?>

lang/English/modules/TS3Admin.php

@@ -24,12 +24,12 @@
 
 define('error', "Error");
 define('title', "TeamSpeak 3 Web Interface");
-define('update_available', '<h3>Attention: A new version (v%1) of this software is available under <a href="%2" target="_blank">%2</a>.</h3>');
+define('update_available', "<h3>Attention: a new version (v%1) of this software is available under <a href=\"%2\" target=\"_blank\">%2</a>.</h3>");
 define('head_logout', "Logout");
 define('head_vserver_switch', "Change vServer");
 define('head_vserver_overview', "vServer Overview");
 define('head_vserver_token', "Token management");
-define('head_vserver_liveview', "Liveview");
+define('head_vserver_liveview', "Live View");
 define('e_fill_out', "Please fill out all required fields.");
 define('e_upload_failed', "Upload unsuccessfull.");
 define('e_server_responded', "The server responded: ");

lang/English/modules/gamemanager.php

@@ -124,8 +124,8 @@ define('need_set_remote_pass', "You need to set the remote control password on")
 define('before_sending_rcon_com', "before sending rcon commands to it.");
 define('retry', "Retry");
 define('page', "page");
-define('server_cant_start', "server cant start");
-define('server_cant_stop', "server cant stop");
+define('server_cant_start', "server can not start");
+define('server_cant_stop', "server can not stop");
 define('error_occured_remote_host', "Error occurred on the remote host");
 define('follow_server_status', "You can follow the server status from");
 define('addons', "Addons");
@@ -175,7 +175,7 @@ define('unavailable', "Unavailable");
 define('upload_map_image', "Upload map image");
 define('upload_image', "Upload image");
 define('jpg_gif_png_less_than_1mb', "The image must be jpg, gif or png and less than 1 MB.");
-define('check_dev_console', "Error uploading file, check the browser developer console.");
+define('check_dev_console', "Error during uploading file, please check the browser developer console.");
 define('uploaded_successfully', "Uploaded successfully.");
 define('cant_create_folder', "Can't create folder:<br><b>%s</b>");
 define('cant_write_file', "Can't write file:<br><b>%s</b>");

lang/English/modules/litefm.php

@@ -30,7 +30,7 @@ define('owner', "Owner");
 define('group', "Group");
 define('empty_directory', "Directory is empty.");
 define('currently_viewing', "Currently viewing directory '%s'");
-define('wrote_changes', "Wrote changes successfully.");
+define('wrote_changes', "Changes saved successfully.");
 define('failed_write', "Failed to write file to remote server.");
 define('failed_read', "Failed to read file from the remote server.");
 define('failed_list', "Failed to retrieve directory list.");

lang/English/modules/modulemanager.php

@@ -29,12 +29,13 @@ define('module_version', "Module Version");
 define('db_version', "DB Version");
 define('modules_available_for_install', "Custom Modules Available for Installation:");
 define('install', "Install");
+define('uninstall', "Uninstall");
 define('modules', "Modules");
 define('update_modules', "Update Modules");
 define('no_installed_modules', "No installed modules found.");
-define('not_complete', "The delete/install feature is not complete and might not work properly. WARNING: Data from ogp database might be lost!");
-define('core_mods_installed', "Core Modules Installed:");
-define('custom_mods_installed', "Custom Modules Installed:");
+define('not_complete', "The install/uninstall feature is not complete and might not work properly. WARNING: Data loss may occur in the OGP database!");
+define('core_mods_installed', "Installed Core Modules:");
+define('custom_mods_installed', "Installed Custom Modules:");
 define('installing_module', "Installing module '%s'");
 define('successfully_installed_module', "Successfully installed module %s.");
 define('failed_to_install_module', "Failed to install module %s.");

lang/English/modules/register.php

@@ -22,7 +22,7 @@
  *
  */
 
-define('login_name', "User name");
+define('login_name', "Username");
 define('users_fname', "First name");
 define('users_lname', "Last name");
 define('users_passwd', "Password");

lang/English/modules/server.php

@@ -32,19 +32,19 @@ define('remote_host_name', "Remote Host Name");
 define('remote_host_name_info', "Remote host name is used to help users to identify their servers.");
 define('add_remote_host', "Add Remote Host");
 define('remote_encryption_key', "Remote Encryption Key");
-define('remote_encryption_key_info', "Remote encryption key is used to encrypt the data between the webpages and the agent. This key must be some in both ends.");
+define('remote_encryption_key_info', "Remote encryption key is used to encrypt the data between the Panel and Agent(s). This key must be same in both sides.");
 define('server_name', "Server Name");
 define('agent_ip_port', "Agent IP:Port");
 define('agent_status', "Agent Status");
 define('ips', "IPs");
 define('add_more_ips', "If you want to enter more IPs press 'Set IPs' when all fields are full and an empty field will appear.");
-define('encryption_key_mismatch', "Encryption key does not match with the agent. Recheck your configuration files.");
+define('encryption_key_mismatch', "Encryption key does not match with the Agent. Recheck your configuration files.");
 define('no_ip_for_remote_host', "You need to add at least one (1) IP address for each remote host.");
 define('note_remote_host', "A remote host is a server where the OGP agent is running on. Each host can have multiple number of IP addresses on which users can bind servers to.");
 define('ip_administration', "Server & IP Administration :: Open Game Panel");
 define('unknown_error', "Unknown error - status_chk returned");
 define('remote_host_user_name', "UNIX user");
-define('remote_host_user_name_info', "User name where agent is running. Example: Jonhy");
+define('remote_host_user_name_info', "User name where Agent is running. Example: Jonhy");
 define('remote_host_ftp_ip', "FTP IP");
 define('remote_host_ftp_ip_info', "The FTP server <b>IP</b> for the current agent.");
 define('remote_host_ftp_port', "FTP port");

lang/English/modules/subusers.php

@@ -22,7 +22,7 @@
  *
  */
 
-define('login_name', "User name");
+define('login_name', "Username");
 define('first_name', "First name");
 define('last_name', "Last name");
 define('phone_number', "Phone number");

lang/English/modules/update.php

@@ -37,7 +37,7 @@ define('update_now', "Update Now");
 define('the_panel_is_up_to_date', "The panel is up to date.");
 define('files_overwritten', "%s files overwritten.");
 define('can_not_update_non_writable_files', "Can not update because the following files/folders are not writable");
-define('dwl_failed', "The download URL is not available: \"%s\".<br>Try again later.");
+define('dwl_failed', "The download link is not available: \"%s\".<br>Try again later.");
 define('temp_folder_not_writable', "The download can not be placed because Apache does not have write permision at the system temporary folder(%s).");
 define('base_dir_not_writable', "The panel can not update because Apache does not have write permision at folder \"%s\".");
 define('new_files', "%s new files.");

modules/modulemanager/modulemanager.php

@@ -68,7 +68,7 @@ function exec_ogp_module()
         // Don't allow the deletion of core modules
         if(!isCoreModule($row['folder'])){
 			$html .= "<a href='?m=modulemanager&amp;p=del&amp;id=".$row['id']."&amp;module=".$row['folder']."'>";
-			$html .= get_lang('delete');
+			$html .= get_lang('uninstall');
 			$html .= "</a>";
 			$coreModule = false;
 		}