Просмотр исходного кода

Merge remote-tracking branch 'upstream/master'

own3mall 8 лет назад
Родитель
Сommit
938076f80b
79 измененных файлов с 891 добавлено и 259 удалено
  1. BIN
      images/countries/bl.png
  2. BIN
      images/countries/cw.png
  3. BIN
      images/countries/gg.png
  4. BIN
      images/countries/im.png
  5. BIN
      images/countries/je.png
  6. BIN
      images/countries/ly.png
  7. BIN
      images/editconfig.png
  8. BIN
      images/filemanager.png
  9. BIN
      images/icons/aliensvspredator.png
  10. BIN
      images/icons/brainbread2.png
  11. BIN
      images/icons/hurtworld.png
  12. BIN
      images/icons/m2o.png
  13. BIN
      images/icons/squad.png
  14. 1 1
      lang/Arabic/global.php
  15. 2 1
      lang/Arabic/modules/gamemanager.php
  16. 21 21
      lang/Arabic/modules/modulemanager.php
  17. 8 0
      lang/Arabic/modules/status.php
  18. 1 1
      lang/Arabic/modules/update.php
  19. 2 1
      lang/Danish/modules/gamemanager.php
  20. 8 0
      lang/Danish/modules/status.php
  21. 2 1
      lang/English/modules/gamemanager.php
  22. 8 0
      lang/English/modules/status.php
  23. 1 1
      lang/French/modules/TS3Admin.php
  24. 2 1
      lang/French/modules/gamemanager.php
  25. 8 0
      lang/French/modules/status.php
  26. 2 1
      lang/German/modules/gamemanager.php
  27. 8 0
      lang/German/modules/status.php
  28. 3 2
      lang/Hungarian/modules/gamemanager.php
  29. 8 0
      lang/Hungarian/modules/status.php
  30. 2 2
      lang/Hungarian/modules/user_games.php
  31. 2 1
      lang/Italian/modules/gamemanager.php
  32. 8 0
      lang/Italian/modules/status.php
  33. 2 1
      lang/Persian/modules/gamemanager.php
  34. 8 0
      lang/Persian/modules/status.php
  35. 2 1
      lang/Polish/modules/gamemanager.php
  36. 8 0
      lang/Polish/modules/status.php
  37. 8 0
      lang/Portuguese(Brazil)/modules/status.php
  38. 15 15
      lang/Portuguese/global.php
  39. 2 1
      lang/Portuguese/modules/gamemanager.php
  40. 1 1
      lang/Portuguese/modules/register.php
  41. 8 0
      lang/Portuguese/modules/status.php
  42. 11 11
      lang/Portuguese/modules/user_games.php
  43. 8 0
      lang/Romanian(Romania)/modules/status.php
  44. 10 10
      lang/Russian/global.php
  45. 2 1
      lang/Russian/modules/gamemanager.php
  46. 1 1
      lang/Russian/modules/settings.php
  47. 8 0
      lang/Russian/modules/status.php
  48. 2 2
      lang/Russian/modules/user_games.php
  49. 2 1
      lang/Spanish/modules/gamemanager.php
  50. 8 0
      lang/Spanish/modules/status.php
  51. 8 0
      lang/Swedish(Sweden)/modules/status.php
  52. 2 1
      lang/Turkish/modules/gamemanager.php
  53. 8 0
      lang/Turkish/modules/status.php
  54. 22 19
      modules/config_games/server_configs/7daystodie_linux32.xml
  55. 22 19
      modules/config_games/server_configs/7daystodie_linux64.xml
  56. 19 19
      modules/config_games/server_configs/7daystodie_win64.xml
  57. 6 3
      modules/config_games/server_configs/aliensvspredator_win32.xml
  58. 149 0
      modules/config_games/server_configs/brainbread2_linux32.xml
  59. 149 0
      modules/config_games/server_configs/brainbread2_win32.xml
  60. 0 73
      modules/config_games/server_configs/egs_win64.xml
  61. 114 0
      modules/config_games/server_configs/empyriongs_win64.xml
  62. 22 10
      modules/config_games/server_configs/homefront_win32.xml
  63. 18 2
      modules/config_games/server_configs/hurtworld_linux32.xml
  64. 8 2
      modules/config_games/server_configs/hurtworld_linux64.xml
  65. 5 2
      modules/config_games/server_configs/hurtworld_win64.xml
  66. 5 3
      modules/config_games/server_configs/left_4_dead.xml
  67. 36 0
      modules/config_games/server_configs/mafia2online_linux32.xml
  68. 36 0
      modules/config_games/server_configs/mafia2online_win32.xml
  69. 7 0
      modules/config_games/server_configs/squad_linux64.xml
  70. 7 0
      modules/config_games/server_configs/squad_win64.xml
  71. 10 10
      modules/gamemanager/rsync_install.php
  72. 2 2
      modules/gamemanager/server_monitor.php
  73. 4 4
      modules/status/include/uptime.php
  74. 2 2
      protocol/TeamSpeak3/Node/Channel.php
  75. 1 1
      protocol/TeamSpeak3/Node/Channelgroup.php
  76. 5 5
      protocol/TeamSpeak3/Node/Server.php
  77. 1 1
      protocol/TeamSpeak3/Node/Servergroup.php
  78. 19 1
      protocol/TeamSpeak3/Viewer/Html.php
  79. 1 1
      protocol/lgsl/lgsl_protocol.php

BIN
images/countries/bl.png


BIN
images/countries/cw.png


BIN
images/countries/gg.png


BIN
images/countries/im.png


BIN
images/countries/je.png


BIN
images/countries/ly.png


BIN
images/editconfig.png


BIN
images/filemanager.png


BIN
images/icons/aliensvspredator.png


BIN
images/icons/brainbread2.png


BIN
images/icons/hurtworld.png


BIN
images/icons/m2o.png


BIN
images/icons/squad.png


+ 1 - 1
lang/Arabic/global.php

@@ -110,7 +110,7 @@ define('version', "نسخة");
 define('show_version', "أظهر النسخة");
 define('queries_executed', "الاستعلامات التي تم تنفيذها");
 define('lang', "لغة");
-define('get_size', "Show Size");
+define('get_size', "عرض الحجم");
 define('total_size', "الحجم الإجمالي");
 define('lgsl', "LGSL");
 define('lgsl_admin', "أدمن LGSL");

+ 2 - 1
lang/Arabic/modules/gamemanager.php

@@ -203,4 +203,5 @@ define('admin', "Admin");
 define('cid', "CID");
 define('phan', "Phantom");
 define('sec', "Seconds");
-?>
+define('unknown_rsync_mirror', "You attempted to start an update from a mirror which doesn't exist.");
+?>

+ 21 - 21
lang/Arabic/modules/modulemanager.php

@@ -22,23 +22,23 @@
  *
  */
 
-define('module_id', "Module ID");
-define('module_name', "Module Name");
-define('module_folder', "Module Folder");
-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('module_id', "أي دي الوحدة");
+define('module_name', "إسم الوحدة");
+define('module_folder', "ملف الوحدة");
+define('module_version', "إصدار الوحدة");
+define('db_version', "إصدار قاعدة البيانات");
+define('modules_available_for_install', "الوحدات المخصصة المتاحة للتثبيت:");
+define('install', "التثبت");
+define('uninstall', "الغاء التثبيت");
+define('modules', "الوحدات");
+define('update_modules', "تحديث الوحدات");
+define('no_installed_modules', "لم يتم العثور على وحدات مثبتة.");
 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.");
+define('core_mods_installed', "الوحدات الأساسية المثبتة:");
+define('custom_mods_installed', "الوحدات المخصصة المثبتة:");
+define('installing_module', "تثبيت وحدة '%s'");
+define('successfully_installed_module', "تم تثبيت الوحدة %s بنجاح.");
+define('failed_to_install_module', "أخفق تثبيت الوحدة %s.");
 define('adding_module', "Adding module called '%s'.");
 define('module_already_installed', "Module called '%s' is already installed.");
 define('uninstalling_module', "Uninstalling module '%s'");
@@ -47,9 +47,9 @@ define('failed_to_uninstall_module', "Failed to uninstall module %s.");
 define('module_file_missing', "directory is missing the module.php file.");
 define('module_file_missing_info', "is missing the required information.");
 define('query_failed', "Failed to execute query");
-define('query_failed_2', "to database.");
-define('failed_del_db', "Failed to delete module from database.");
-define('updated_module', "Updated module: '%s'.");
-define('updating_modules', "Updating Modules");
-define('updating_finished', "Updating Finished");
+define('query_failed_2', "إلى قاعدة البيانات.");
+define('failed_del_db', "أخفق حذف الوحدة من قاعدة البيانات.");
+define('updated_module', "الوحدة المحدثة: '%s'.");
+define('updating_modules', "تحديث الوحدات");
+define('updating_finished', "تم الانتهاء من التحديث");
 ?>

+ 8 - 0
lang/Arabic/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "مدة تشغيل النظام");
 define('system_up_time', "مدة التشغيل");
 define('system_up_since', "منذ");
+define('day_word', "Day");
+define('days_word', "Days");
+define('hour_word', "Hour");
+define('hours_word', "Hours");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Second");
+define('seconds_word', "Seconds");
 define('cpu_usage', "استخدام المعالج");
 define('cpu_load', "حمل");
 define('ram_usage', "استخدام ذاكرة الوصول العشوائي");

+ 1 - 1
lang/Arabic/modules/update.php

@@ -36,7 +36,7 @@ define('panel_version', "نسخة اللوحة");
 define('update_now', "تحديث الان");
 define('the_panel_is_up_to_date', "اللوحة محدثة لاخر إصدار.");
 define('files_overwritten', "%s ملف استبدل");
-define('files_not_overwritten', "%s files are NOT overwritten due to blacklist");
+define('files_not_overwritten', "%s لا يتم الكتابة فوق الملفات بسبب القائمة السوداء");
 define('can_not_update_non_writable_files', "لايمكن تحديث الملفات/المجلدات التالية لانها غير قابلة لإستبدال");
 define('dwl_failed', "رابط التحميل غير متوفر: \"%s\".<br>جرب مجدداً في وقت لاحق.");
 define('temp_folder_not_writable', "لا يمكن وضع التنزيل، لأن أباتشي ليس لديه إذن كتابة في المجلد المؤقت للنظام (%s).");

+ 2 - 1
lang/Danish/modules/gamemanager.php

@@ -203,4 +203,5 @@ define('admin', "Admin");
 define('cid', "CID");
 define('phan', "Phantom");
 define('sec', "Seconds");
-?>
+define('unknown_rsync_mirror', "You attempted to start an update from a mirror which doesn't exist.");
+?>

+ 8 - 0
lang/Danish/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "System Uptime");
 define('system_up_time', "Up Time");
 define('system_up_since', "Since");
+define('day_word', "Day");
+define('days_word', "Days");
+define('hour_word', "Hour");
+define('hours_word', "Hours");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Second");
+define('seconds_word', "Seconds");
 define('cpu_usage', "CPU Usage");
 define('cpu_load', "Load");
 define('ram_usage', "RAM Usage");

+ 2 - 1
lang/English/modules/gamemanager.php

@@ -203,4 +203,5 @@ define('admin', "Admin");
 define('cid', "CID");
 define('phan', "Phantom");
 define('sec', "Seconds");
-?>
+define('unknown_rsync_mirror', "You attempted to start an update from a mirror which doesn't exist.");
+?>

+ 8 - 0
lang/English/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "System Uptime");
 define('system_up_time', "Up Time");
 define('system_up_since', "Since");
+define('day_word', "Day");
+define('days_word', "Days");
+define('hour_word', "Hour");
+define('hours_word', "Hours");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Second");
+define('seconds_word', "Seconds");
 define('cpu_usage', "CPU Usage");
 define('cpu_load', "Load");
 define('ram_usage', "RAM Usage");

+ 1 - 1
lang/French/modules/TS3Admin.php

@@ -105,7 +105,7 @@ define('vsoverview_conn_total_packets', "paquets");
 define('vsoverview_conn_total_bytes', "octets");
 define('vsoverview_conn_total_send', "envoyés");
 define('vsoverview_conn_total_received', "reçus");
-define('vsoverview_conn_bandwidth_head', "Bande passane");
+define('vsoverview_conn_bandwidth_head', "Bande passante");
 define('vsoverview_conn_bandwidth_last', "dernière");
 define('vsoverview_conn_bandwidth_second', "seconde");
 define('vsoverview_conn_bandwidth_minute', "minute");

+ 2 - 1
lang/French/modules/gamemanager.php

@@ -203,4 +203,5 @@ define('admin', "Admin");
 define('cid', "CID");
 define('phan', "Phantom");
 define('sec', "Seconds");
-?>
+define('unknown_rsync_mirror', "Vous avez tenté de faire une mise à jour à partir d'un miroir qui n'existe pas.");
+?>

+ 8 - 0
lang/French/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "Temps de Disponibilité du Serveur");
 define('system_up_time', "Démarré depuis");
 define('system_up_since', "Démarré le");
+define('day_word', "Jour");
+define('days_word', "Jours");
+define('hour_word', "Heure");
+define('hours_word', "Heures");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Seconde");
+define('seconds_word', "Secondes");
 define('cpu_usage', "Utilisation du CPU");
 define('cpu_load', "Charge");
 define('ram_usage', "Utilisation de la RAM");

+ 2 - 1
lang/German/modules/gamemanager.php

@@ -211,4 +211,5 @@ define('admin', "Admin");
 define('cid', "CID");
 define('phan', "Phantom");
 define('sec', "Seconds");
-?>
+define('unknown_rsync_mirror', "You attempted to start an update from a mirror which doesn't exist.");
+?>

+ 8 - 0
lang/German/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "System Betriebszeit");
 define('system_up_time', "Betriebszeit");
 define('system_up_since', "Seit");
+define('day_word', "Day");
+define('days_word', "Days");
+define('hour_word', "Hour");
+define('hours_word', "Hours");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Second");
+define('seconds_word', "Seconds");
 define('cpu_usage', "CPU-Auslastung");
 define('cpu_load', "Last");
 define('ram_usage', "RAM Auslastung");

+ 3 - 2
lang/Hungarian/modules/gamemanager.php

@@ -168,7 +168,7 @@ define('game_name', "Játék neve");
 define('dest_dir', "Cél könyvtár");
 define('remote_server', "Távoli szerver");
 define('file_url', "Fájl URL");
-define('file_url_info', "Az URL a fájl feltöltve és kicsomagolva a könyvtárba.");
+define('file_url_info', "A feltöltött és tömörítetlen fájl URL-címe a könyvtárhoz.");
 define('dest_filename', "Célfájlnév");
 define('dest_filename_info', "A célfájl fájlneve.");
 define('update_server', "Szerver frissítés");
@@ -203,4 +203,5 @@ define('admin', "Adminisztrátor");
 define('cid', "CID");
 define('phan', "Fantom");
 define('sec', "Másodpercek");
-?>
+define('unknown_rsync_mirror', "You attempted to start an update from a mirror which doesn't exist.");
+?>

+ 8 - 0
lang/Hungarian/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "Rendszer üzemidő");
 define('system_up_time', "Újraindítás óta eltelt idő");
 define('system_up_since', "Mióta");
+define('day_word', "Day");
+define('days_word', "Days");
+define('hour_word', "Hour");
+define('hours_word', "Hours");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Second");
+define('seconds_word', "Seconds");
 define('cpu_usage', "Processor használat");
 define('cpu_load', "terhelése");
 define('ram_usage', "Memória használat");

+ 2 - 2
lang/Hungarian/modules/user_games.php

@@ -182,12 +182,12 @@ define('clone_mods', "Modok klónozása");
 define('game_server_owner', "Játékszerver tulajdonos");
 define('the_name_of_the_server_to_help_users_to_identify_it', "A szerver neve segít a felhasználóknak a szerver azonosításában.");
 define('ips_and_ports_used_in_this_home', "Az IP-k és portok ehhez a szerverhez használva");
-define('note_ips_and_ports_are_not_cloned', "Megjegyzés - az IPk és a portok nincsenek klónozva");
+define('note_ips_and_ports_are_not_cloned', "Megjegyzés - Az IP-címek és a portok nincsenek klónozva");
 define('mods_and_settings_for_this_game_server', "Modok és beállítások ehhez a játékszerverhez");
 define('sure_to_delete_serverid_from_remoteip_and_directory', "Biztosan törölni akarod a játékszervert (ID: %s) a(z) %s szerverről és a(z) %s mappából.");
 define('yes_and_delete_the_files', "Igen és töröld a fájlokat");
 define('failed_to_remove_gamehome_from_database', "Failed to remove gamehome from database.");
-define('successfully_deleted_game_server_with_id', "Sikeresen törölt játékkiszolgáló %s IDvel.");
+define('successfully_deleted_game_server_with_id', "Sikeresen törölted a játékszervert a(z) %s-es azonosítóval.");
 define('failed_to_remove_ftp_account_from_remote_server', "Nem sikerült eltávolítani az FTP fiókot a távoli szerverről.");
 define('remove_it_anyway', "Szeretnéd ezt egyébként eltávolítani?");
 define('sucessfully_deleted', "A(z) %s sikeresen törölve.");

+ 2 - 1
lang/Italian/modules/gamemanager.php

@@ -203,4 +203,5 @@ define('admin', "Admin");
 define('cid', "CID");
 define('phan', "Phantom");
 define('sec', "Seconds");
-?>
+define('unknown_rsync_mirror', "You attempted to start an update from a mirror which doesn't exist.");
+?>

+ 8 - 0
lang/Italian/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "System Uptime");
 define('system_up_time', "Up Time");
 define('system_up_since', "Since");
+define('day_word', "Day");
+define('days_word', "Days");
+define('hour_word', "Hour");
+define('hours_word', "Hours");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Second");
+define('seconds_word', "Seconds");
 define('cpu_usage', "CPU Usage");
 define('cpu_load', "Load");
 define('ram_usage', "RAM Usage");

+ 2 - 1
lang/Persian/modules/gamemanager.php

@@ -203,4 +203,5 @@ define('admin', "Admin");
 define('cid', "CID");
 define('phan', "Phantom");
 define('sec', "Seconds");
-?>
+define('unknown_rsync_mirror', "You attempted to start an update from a mirror which doesn't exist.");
+?>

+ 8 - 0
lang/Persian/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "آپتایم سیستم");
 define('system_up_time', "آپتایم");
 define('system_up_since', "از");
+define('day_word', "Day");
+define('days_word', "Days");
+define('hour_word', "Hour");
+define('hours_word', "Hours");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Second");
+define('seconds_word', "Seconds");
 define('cpu_usage', "مصرف پردازنده");
 define('cpu_load', "بارگذاری");
 define('ram_usage', "مصرف RAM");

+ 2 - 1
lang/Polish/modules/gamemanager.php

@@ -203,4 +203,5 @@ define('admin', "Admin");
 define('cid', "CID");
 define('phan', "Phantom");
 define('sec', "Seconds");
-?>
+define('unknown_rsync_mirror', "You attempted to start an update from a mirror which doesn't exist.");
+?>

+ 8 - 0
lang/Polish/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "Czas Działania Serwera");
 define('system_up_time', "Uruchomiony Od");
 define('system_up_since', "Uruchomiony");
+define('day_word', "Day");
+define('days_word', "Days");
+define('hour_word', "Hour");
+define('hours_word', "Hours");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Second");
+define('seconds_word', "Seconds");
 define('cpu_usage', "Użycie Rdzeni Procesora");
 define('cpu_load', "Użycie");
 define('ram_usage', "Wykorzystanie Pamięci");

+ 8 - 0
lang/Portuguese(Brazil)/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "Tempo de Inicialização do Sistema");
 define('system_up_time', "Ativo há");
 define('system_up_since', "Ativo desde");
+define('day_word', "Day");
+define('days_word', "Days");
+define('hour_word', "Hour");
+define('hours_word', "Hours");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Second");
+define('seconds_word', "Seconds");
 define('cpu_usage', "Uso de CPU");
 define('cpu_load', "em uso");
 define('ram_usage', "Utilização de memória");

+ 15 - 15
lang/Portuguese/global.php

@@ -24,7 +24,7 @@
 
 define('lang_charset', "UTF-8");
 define('already_logged_in_redirecting_to_dashboard', "Desculpe, mas você já tem sessão iniciada, será agora redireccionado para a pagina de inicio.");
-define('logging_in', "<center>Sessão iniciada com sucesso, Por favor aguarde,,.</center>");
+define('logging_in', "<center>Sessão iniciada com sucesso, Por favor aguarde...</center>");
 define('redirecting_in', "Você esta a ser redireccionado, por favor aguarde...");
 define('refresh_page', "Atualizar Página");
 define('no_rights', "Você não tem privilégios suficientes para acessar esta página.");
@@ -39,11 +39,11 @@ define('solve_captcha', "Verificação humana");
 define('lost_passwd', "Perdeu a sua senha?");
 define('no_db_connection', "Não é possível conectar ao banco de dados.");
 define('bad_login', "Senha ou nome de usuário incorrectos.");
-define('not_logged_in', "Você está logado no painel de controle.");
+define('not_logged_in', "Você não está conectado no momento.");
 define('remove_install', "Por favor remova o arquivo install.php por motivos de segurança.");
 define('agent_offline', "O agente que controla o servidor está desativado, rode-o na máquina remota.");
 define('logged_in', "Você está logado como");
-define('delete', "Deletar");
+define('delete', "Apagar");
 define('edit', "Editar");
 define('actions', "Ações");
 define('invalid_subpage', "Subpágina inválida");
@@ -68,7 +68,7 @@ define('maintenance_mode_on', "O modo de manutenção está ligado");
 define('logging_out_10', "A deslogar da sua conta em 10 segundos");
 define('invalid_redirect', "A rederecionar...");
 define('login_title', "Control Panel Login");
-define('module_not_installed', "Pedimos desculpa, mas no momento não é possível avançar com o seu pedido.");
+define('module_not_installed', "O módulo não está instalado.");
 define('no_access_to_home', "Você não tem acesso a home.");
 define('not_available', "Sem informação disponível");
 define('offline', "Offline");
@@ -88,7 +88,7 @@ define('administration', "Administração");
 define('config_games', "Game/Mod Config");
 define('modulemanager', "Modules");
 define('server', "Servidores");
-define('settings', "Configurações do painel");
+define('settings', "Definições do painel");
 define('themes', "Definições de tema");
 define('user_admin', "Usuários");
 define('sub_users', "Sub Usuários");
@@ -112,30 +112,30 @@ define('queries_executed', "queries executed");
 define('lang', "Idioma");
 define('get_size', "Mostrar tamanho");
 define('total_size', "Tamanho total");
-define('lgsl', "Lista de servidores de jogo\"s\" ao vivo");
-define('lgsl_admin', "Live Game Server List Admin");
+define('lgsl', "Lista de servidores tempo real");
+define('lgsl_admin', "ADMIN - lista de servidores tempo real ");
 define('rcon', "RCON");
 define('watch_logger', "Logs do Servidor");
 define('litefm_settings', "Config. LiteFileManeger");
 define('assign_expiration_date', "Data em que ira expirar a app/servidor");
 define('assign_expiration_date_info', "Uma vez que expira, o servidor não está atribuído mas não foi removido.");
-define('server_expiration_date', "Data de expiração do servidor");
+define('server_expiration_date', "Data de expiração");
 define('server_expiration_date_info', "Uma vez que expira o servidor é removido (banco de dados e arquivos).");
-define('set_expiration_date', "Definir Data de Expiração");
-define('admin_dsi', "Config. Imagem Dinâmica de Servidor\"es\"");
+define('set_expiration_date', "Definir data de expiração");
+define('admin_dsi', "Config. Imagem Dinâmica de Servidores");
 define('user_dsi', "Imagem Dinâmica de Servidor");
 define('list_dsi', "Lista de Servidores de Jogos Ativos");
 define('no_remote_servers', "Não há servidores remotos conhecidos! Adicione um servidor para usar esta função.");
 define('no_results_found', "Não foram encontrados resultados de pesquisa para %s");
 define('tickets', "Tickets de Suporte");
 define('news', "Noticias");
-define('admin_news', "Notícias de Administrador");
+define('admin_news', "Notícias - Administrador");
 define('rcon', "RCON");
 define('support', "Suporte");
-define('util', "Serviços de utilidade");
-define('fast_download', "Download Rápido");
-define('fd_user', "Download Rápido");
-define('cron', "Cron -programador de tarefas- de administrador");
+define('util', "Serviços/utiliarios");
+define('fast_download', "Fast Download");
+define('fd_user', "Fast Download");
+define('cron', "Administrador - programador de tarefas");
 define('user_cron', "Programador de tarefas CRON");
 define('faq', "Perguntas Frequentes");
 define('mysql_admin', "MySQL Admin");

+ 2 - 1
lang/Portuguese/modules/gamemanager.php

@@ -203,4 +203,5 @@ define('admin', "Administrador");
 define('cid', "CID");
 define('phan', "Fantasma");
 define('sec', "Segundos");
-?>
+define('unknown_rsync_mirror', "You attempted to start an update from a mirror which doesn't exist.");
+?>

+ 1 - 1
lang/Portuguese/modules/register.php

@@ -48,7 +48,7 @@ define('err_last_name', "Deve especificar o seu Sobrenome.");
 define('err_phone_number', "Número de telefone está vazia.");
 define('err_email_address', "Endereço de e-mail está vazio ou incorreto.");
 define('err_email_address_already_in_use_by', "O e-mail já está em uso por <b>%s</b>.");
-define('user_registration', "Registro de Usuário");
+define('user_registration', "Registo de usuário");
 define('your_account_details_has_been_sent_by_email_to', "Detalhes de sua conta foi enviado por e-mail para <b>%s</b>.");
 define('account_created', "Sua conta foi criada.");
 define('subject', "%s :: Informações da conta");

+ 8 - 0
lang/Portuguese/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "Tempo de Inicialização do Sistema");
 define('system_up_time', "Ativo há");
 define('system_up_since', "Ativo desde");
+define('day_word', "Day");
+define('days_word', "Days");
+define('hour_word', "Hour");
+define('hours_word', "Hours");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Second");
+define('seconds_word', "Seconds");
 define('cpu_usage', "Uso de CPU");
 define('cpu_load', "em uso");
 define('ram_usage', "Utilização de memória");

+ 11 - 11
lang/Portuguese/modules/user_games.php

@@ -65,7 +65,7 @@ define('remove_mod', "Remover Mod");
 define('mods', "Mods");
 define('ip', "IP");
 define('port', "Porta");
-define('no_ip_ports_assigned', "Pelo menos um IP: o par de portas deve ser atribuído ao caminho mestre\"home\".");
+define('no_ip_ports_assigned', "Atenção: Sem quaisquer portas IP atribuídas. Você não pode prosseguir com a configuração sem primeiro atribuir uma porta disponível ao servidor");
 define('successfully_assigned_ip_port', "IP atribuído com sucesso: par de portas para Home.");
 define('port_range_error', "As portas deve estar entre o intervalo 0 e 65535.");
 define('failed_to_assing_mod_to_home', "Falha ao atribuir mod com id %d no diretorio \"home\".");
@@ -131,7 +131,7 @@ define('game_server', "Game Server");
 define('game_type', "Tipo de jogo");
 define('game_home', "Caminho Raiz");
 define('game_home_name', "Nome do Servidor do Jogo");
-define('clone', "Clone");
+define('clone', "Clonar");
 define('unassign', "Desatribuir");
 define('access_rights', "Direitos de acesso");
 define('assigned_homes', "Locais atualmente atribuídos");
@@ -171,10 +171,10 @@ define('copying_home_remotely', "Copiando o diretório em um server remoto a par
 define('cloning_home', "Clonagem do diretório camado '%s'");
 define('current_home_path', "Caminho do diretório atual");
 define('current_home_path_info', "A localização atual do diretório copiado no servidor remoto.");
-define('clone_home', "Diretório clone");
+define('clone_home', "Clonar o directório");
 define('new_home_name', "Novo nome do diretório");
-define('new_home_path', "Novo caminho de diretório");
-define('agent_ip', "Agent IP");
+define('new_home_path', "Novo caminho para o directório raiz");
+define('agent_ip', "IP do Agent");
 define('game_server_copy_is_running', "A cópia do servidor do jogo está sendo executada ...");
 define('game_server_copy_was_successful', "A cópia do servidor do jogo foi bem sucedida");
 define('game_server_copy_failed_with_return_code', "A cópia do servidor de jogos falhou com o código de retorno %s");
@@ -183,10 +183,10 @@ define('game_server_owner', "Proprietário do servidor de jogo");
 define('the_name_of_the_server_to_help_users_to_identify_it', "O nome do servidor para ajudar os usuários a identificá-lo.");
 define('ips_and_ports_used_in_this_home', "IPs e Portas utilizados neste diretório");
 define('note_ips_and_ports_are_not_cloned', "Nota: IPs e portas não estão clonados");
-define('mods_and_settings_for_this_game_server', "Mods e configurações para este servidor de jogo");
+define('mods_and_settings_for_this_game_server', "Os mods e as configurações para este servidor do jogo/app");
 define('sure_to_delete_serverid_from_remoteip_and_directory', "Tem certeza de que deseja excluir o servidor do jogo (ID: %s) do servidor %s e está no diretório %s");
 define('yes_and_delete_the_files', "Sim e Excluir os arquivos");
-define('failed_to_remove_gamehome_from_database', "Falha ao remover o gamehome do banco de dados.");
+define('failed_to_remove_gamehome_from_database', "Falha ao remover o directório raiz do banco de dados.");
 define('successfully_deleted_game_server_with_id', "Servidor de jogo excluído com sucesso com o ID %s.");
 define('failed_to_remove_ftp_account_from_remote_server', "Falha ao remover a conta FTP do servidor remoto.");
 define('remove_it_anyway', "Gostaria de removê-lo de qualquer maneira?");
@@ -213,8 +213,8 @@ define('add_folder_info', "Escreva o nome da nova pasta e clique no ícone.");
 define('valid_user', "Por favor, especifique um usuário válido.");
 define('valid_group', "Por favor, especifique um grupo válido.");
 define('set_affinity', "Definir afinidade do servidor");
-define('cpu_affinity_info', "Selecione o(s) núcleos do CPU que deseja atribuir ao servidor do jogo.");
-define('expiration_date_changed', "A data de validade para o diretório selecionado foi alterada.");
-define('expiration_date_could_not_be_changed', "A data de validade para o diretório selecionado não pôde ser alterada.");
-define('search', "Pesquisa");
+define('cpu_affinity_info', "Seleccione o(s) núcleos do CPU que deseja atribuir ao servidor do jogo/app.");
+define('expiration_date_changed', "A data de validade para o directório seleccionado foi alterada.");
+define('expiration_date_could_not_be_changed', "A data de validade para o directório seleccionado não pôde ser alterado.");
+define('search', "Pesquisar");
 ?>

+ 8 - 0
lang/Romanian(Romania)/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "System Uptime");
 define('system_up_time', "Up Time");
 define('system_up_since', "Since");
+define('day_word', "Day");
+define('days_word', "Days");
+define('hour_word', "Hour");
+define('hours_word', "Hours");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Second");
+define('seconds_word', "Seconds");
 define('cpu_usage', "CPU Usage");
 define('cpu_load', "Load");
 define('ram_usage', "RAM Usage");

+ 10 - 10
lang/Russian/global.php

@@ -82,7 +82,7 @@ define('dashboard', "Главная");
 define('user_addons', "Аддоны");
 define('ftp', "FTP");
 define('shop', "Магазин");
-define('shop_guest', "Shop");
+define('shop_guest', "Магазин");
 define('TS3Admin', "TS3 Админ");
 define('administration', "Админка");
 define('config_games', "Игры/Моды конфигурация");
@@ -110,7 +110,7 @@ define('version', "Версия");
 define('show_version', "Показать версию");
 define('queries_executed', "запросов к базе");
 define('lang', "Язык");
-define('get_size', "Show Size");
+define('get_size', "Показать размер");
 define('total_size', "Общий размер");
 define('lgsl', "LGSL");
 define('lgsl_admin', "Настройки LGSL");
@@ -127,16 +127,16 @@ define('user_dsi', "DSi");
 define('list_dsi', "DSi Список");
 define('no_remote_servers', "Нет известных удаленных серверов! Добавьте сервер для использования этой функции.");
 define('no_results_found', "Не найдено результатов поиска для %s");
-define('tickets', "Support Tickets");
-define('news', "News");
-define('admin_news', "News Admin");
+define('tickets', "Система поддержки");
+define('news', "Новости");
+define('admin_news', "Управление Новостями");
 define('rcon', "RCON команды");
 define('support', "Поддержка");
-define('util', "Utilities");
-define('fast_download', "Fast Download");
+define('util', "Утилиты");
+define('fast_download', "Быстрая Загрузка");
 define('fd_user', "Fast Download");
-define('cron', "Cron Admin");
-define('user_cron', "Cron");
+define('cron', "Управление Заданиями");
+define('user_cron', "Задания");
 define('faq', "F.A.Q.");
-define('mysql_admin', "MySQL Admin");
+define('mysql_admin', "Управление MySQL");
 ?>

+ 2 - 1
lang/Russian/modules/gamemanager.php

@@ -203,4 +203,5 @@ define('admin', "Admin");
 define('cid', "CID");
 define('phan', "Phantom");
 define('sec', "Seconds");
-?>
+define('unknown_rsync_mirror', "You attempted to start an update from a mirror which doesn't exist.");
+?>

+ 1 - 1
lang/Russian/modules/settings.php

@@ -80,7 +80,7 @@ define('header_code_info', "Здесь вы можете написать соб
 define('support_widget_title', "Название виджета поддержки");
 define('support_widget_title_info', "Пользовательский заголовок для виджета поддержки в панели.");
 define('support_widget_content', "Содержимое виджета поддержки");
-define('support_widget_content_info', "The content of the support widget (HTML code allowed).");
+define('support_widget_content_info', "Содержимое виджета поддержки  (HTML-код разрешено использовать).");
 define('support_widget_link', "Ссылка на виджет поддержки");
 define('support_widget_link_info', "URL вашего сайта поддержки.");
 define('recaptcha_site_key', "Ключ - Recaptcha Site Key");

+ 8 - 0
lang/Russian/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "Время работы системы");
 define('system_up_time', "Работает");
 define('system_up_since', "Запущен");
+define('day_word', "Day");
+define('days_word', "Days");
+define('hour_word', "Hour");
+define('hours_word', "Hours");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Second");
+define('seconds_word', "Seconds");
 define('cpu_usage', "Использование процессора");
 define('cpu_load', "Нагрузка");
 define('ram_usage', "Использование ОЗУ");

+ 2 - 2
lang/Russian/modules/user_games.php

@@ -138,7 +138,7 @@ define('assigned_homes', "Уже назначенные сервера");
 define('assign', "Назначить");
 define('allow_updates', "Разрешить обновление игры");
 define('allow_updates_info', "Разрешить пользователю обновлять игу, если это доступно.");
-define('allow_file_management', "Allow File Management");
+define('allow_file_management', "Разрешить доступ к Файловому менеджеру");
 define('allow_file_management_info', "Разрешить пользователю доступ к файлам сервера через модуль.");
 define('allow_parameter_usage', "Разрешить использование параметров запуска");
 define('allow_parameter_usage_info', "Разрешить пользователю использовать заданные параметры запуска.");
@@ -191,7 +191,7 @@ define('successfully_deleted_game_server_with_id', "Игровой сервер
 define('failed_to_remove_ftp_account_from_remote_server', "Ну удалось удалить FTP аккаунт из удаленного сервера.");
 define('remove_it_anyway', "Вы все равно хотите его удалить?");
 define('sucessfully_deleted', "Успешное удаление %s");
-define('the_agent_had_a_problem_deleting', "The Agent had a problem while deleting %s. Please, check the Agent's log.");
+define('the_agent_had_a_problem_deleting', "У агента возникла проблема с удалением %s, посмотрите логи Агента");
 define('connection_timeout_or_problems_reaching_the_agent', "Время соединения вышло или проблемы связи с Агентом");
 define('does_not_exist_yet', "Пока не существует.");
 define('go_to_custom_fields', "Перейти к настраиваемым поля");

+ 2 - 1
lang/Spanish/modules/gamemanager.php

@@ -203,4 +203,5 @@ define('admin', "Admin");
 define('cid', "CID");
 define('phan', "Phantom");
 define('sec', "Seconds");
-?>
+define('unknown_rsync_mirror', "You attempted to start an update from a mirror which doesn't exist.");
+?>

+ 8 - 0
lang/Spanish/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "Tiempo Encendido");
 define('system_up_time', "Tiempo Encendido");
 define('system_up_since', "Desde");
+define('day_word', "Day");
+define('days_word', "Days");
+define('hour_word', "Hour");
+define('hours_word', "Hours");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Second");
+define('seconds_word', "Seconds");
 define('cpu_usage', "Consumo de CPU");
 define('cpu_load', "consumo");
 define('ram_usage', "Uso de memoria RAM");

+ 8 - 0
lang/Swedish(Sweden)/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "System Uptime");
 define('system_up_time', "Up Time");
 define('system_up_since', "Since");
+define('day_word', "Day");
+define('days_word', "Days");
+define('hour_word', "Hour");
+define('hours_word', "Hours");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Second");
+define('seconds_word', "Seconds");
 define('cpu_usage', "CPU Usage");
 define('cpu_load', "Load");
 define('ram_usage', "RAM Usage");

+ 2 - 1
lang/Turkish/modules/gamemanager.php

@@ -203,4 +203,5 @@ define('admin', "Admin");
 define('cid', "CID");
 define('phan', "Phantom");
 define('sec', "Seconds");
-?>
+define('unknown_rsync_mirror', "You attempted to start an update from a mirror which doesn't exist.");
+?>

+ 8 - 0
lang/Turkish/modules/status.php

@@ -25,6 +25,14 @@
 define('system_uptime', "System Uptime");
 define('system_up_time', "Up Time");
 define('system_up_since', "Since");
+define('day_word', "Day");
+define('days_word', "Days");
+define('hour_word', "Hour");
+define('hours_word', "Hours");
+define('minute_word', "Minute");
+define('minutes_word', "Minutes");
+define('second_word', "Second");
+define('seconds_word', "Seconds");
 define('cpu_usage', "CPU Usage");
 define('cpu_load', "Load");
 define('ram_usage', "RAM Usage");

+ 22 - 19
modules/config_games/server_configs/7daystodie_linux32.xml

@@ -5,9 +5,9 @@
   <installer>steamcmd</installer>
   <game_name>7 Days to Die</game_name>
   <server_exec_name>7DaysToDieServer.x86</server_exec_name>
-  <cli_template>-logfile logs/output_log.txt -quit -batchmode -nographics -configfile=serverconfig.xml -dedicated</cli_template>
+  <cli_template>-logfile 7DaysToDieServer_Data/output_log.txt -quit -batchmode -nographics -configfile=serverconfig.xml -dedicated</cli_template>
   <maps_location>Data/Worlds</maps_location>
-  <console_log>logs/output_log.txt</console_log>
+  <console_log>7DaysToDieServer_Data/output_log.txt</console_log>
   <max_user_amount>64</max_user_amount>
   <mods>
     <mod key="7daystodie1">
@@ -16,7 +16,7 @@
       <installer_login>anonymous</installer_login>
     </mod>
     <mod key="7daystodie2">
-      <name>Latest Experimental</name>
+      <name>Unstable build</name>
       <installer_name>294420</installer_name>
       <installer_login>anonymous</installer_login>
       <betaname>latest_experimental</betaname>
@@ -67,14 +67,6 @@
     </text>
   </replace_texts>
   <custom_fields>
-    <field key="Game Name" type="text">
-      <default>property</default>
-      <default_value>My Game</default_value>
-      <var>GameName</var>
-      <filepath>serverconfig.xml</filepath>
-      <options>tagValueByName</options>
-      <desc>Whatever you want the game name to be (this controls the random generation seed as well).</desc>
-    </field>
     <field key="Control Panel Enabled" type="select">
       <option value="false">False</option>
       <option value="true">True</option>
@@ -111,14 +103,6 @@
       <options>tagValueByName</options>
       <desc>Port of the Telnet server.</desc>
     </field>
-    <field key="Max Spawned Zombies" type="text">
-      <default>property</default>
-      <default_value>60</default_value>
-      <var>MaxSpawnedZombies</var>
-      <filepath>serverconfig.xml</filepath>
-      <options>tagValueByName</options>
-      <desc>Making this number too large (more than about 80) may cause servers to run at poor framerates which will effect lag and play quality for clients.</desc>
-    </field>
     <field key="EAC Enabled" type="select">
       <option value="false">False</option>
       <option value="true">True</option>
@@ -129,7 +113,26 @@
       <options>tagValueByName</options>
       <desc>Enables/Disables EasyAntiCheat.</desc>
     </field>
+    <field key="Game Name" type="text">
+      <default>property</default>
+      <default_value>My Game</default_value>
+      <var>GameName</var>
+      <filepath>serverconfig.xml</filepath>
+      <options>tagValueByName</options>
+      <desc>Whatever you want the game name to be (this controls the random generation seed as well).</desc>
+    </field>
+    <field key="Max Spawned Zombies" type="text">
+      <default>property</default>
+      <default_value>60</default_value>
+      <var>MaxSpawnedZombies</var>
+      <filepath>serverconfig.xml</filepath>
+      <options>tagValueByName</options>
+      <desc>Making this number too large (more than about 80) may cause servers to run at poor framerates which will effect lag and play quality for clients.</desc>
+    </field>
   </custom_fields>
+  <lock_files>
+    7DaysToDieServer.x86_64
+  </lock_files>
   <configuration_files>
     <file description="Server Configurations">serverconfig.xml</file>
     <file description="Admin Configurations">Saves/serveradmin.xml</file>

+ 22 - 19
modules/config_games/server_configs/7daystodie_linux64.xml

@@ -5,9 +5,9 @@
   <installer>steamcmd</installer>
   <game_name>7 Days to Die</game_name>
   <server_exec_name>7DaysToDieServer.x86_64</server_exec_name>
-  <cli_template>-logfile logs/output_log.txt -quit -batchmode -nographics -configfile=serverconfig.xml -dedicated</cli_template>
+  <cli_template>-logfile 7DaysToDieServer_Data/output_log.txt -quit -batchmode -nographics -configfile=serverconfig.xml -dedicated</cli_template>
   <maps_location>Data/Worlds</maps_location>
-  <console_log>logs/output_log.txt</console_log>
+  <console_log>7DaysToDieServer_Data/output_log.txt</console_log>
   <max_user_amount>64</max_user_amount>
   <mods>
     <mod key="7daystodie1">
@@ -16,7 +16,7 @@
       <installer_login>anonymous</installer_login>
     </mod>
     <mod key="7daystodie2">
-      <name>Latest Experimental</name>
+      <name>Unstable build</name>
       <installer_name>294420</installer_name>
       <installer_login>anonymous</installer_login>
       <betaname>latest_experimental</betaname>
@@ -67,14 +67,6 @@
     </text>
   </replace_texts>
   <custom_fields>
-    <field key="Game Name" type="text">
-      <default>property</default>
-      <default_value>My Game</default_value>
-      <var>GameName</var>
-      <filepath>serverconfig.xml</filepath>
-      <options>tagValueByName</options>
-      <desc>Whatever you want the game name to be (this controls the random generation seed as well).</desc>
-    </field>
     <field key="Control Panel Enabled" type="select">
       <option value="false">False</option>
       <option value="true">True</option>
@@ -111,14 +103,6 @@
       <options>tagValueByName</options>
       <desc>Port of the Telnet server.</desc>
     </field>
-    <field key="Max Spawned Zombies" type="text">
-      <default>property</default>
-      <default_value>60</default_value>
-      <var>MaxSpawnedZombies</var>
-      <filepath>serverconfig.xml</filepath>
-      <options>tagValueByName</options>
-      <desc>Making this number too large (more than about 80) may cause servers to run at poor framerates which will effect lag and play quality for clients.</desc>
-    </field>
     <field key="EAC Enabled" type="select">
       <option value="false">False</option>
       <option value="true">True</option>
@@ -129,7 +113,26 @@
       <options>tagValueByName</options>
       <desc>Enables/Disables EasyAntiCheat.</desc>
     </field>
+    <field key="Game Name" type="text">
+      <default>property</default>
+      <default_value>My Game</default_value>
+      <var>GameName</var>
+      <filepath>serverconfig.xml</filepath>
+      <options>tagValueByName</options>
+      <desc>Whatever you want the game name to be (this controls the random generation seed as well).</desc>
+    </field>
+    <field key="Max Spawned Zombies" type="text">
+      <default>property</default>
+      <default_value>60</default_value>
+      <var>MaxSpawnedZombies</var>
+      <filepath>serverconfig.xml</filepath>
+      <options>tagValueByName</options>
+      <desc>Making this number too large (more than about 80) may cause servers to run at poor framerates which will effect lag and play quality for clients.</desc>
+    </field>
   </custom_fields>
+  <lock_files>
+    7DaysToDieServer.x86
+  </lock_files>
   <configuration_files>
     <file description="Server Configurations">serverconfig.xml</file>
     <file description="Admin Configurations">Saves/serveradmin.xml</file>

+ 19 - 19
modules/config_games/server_configs/7daystodie_win64.xml

@@ -5,9 +5,9 @@
   <installer>steamcmd</installer>
   <game_name>7 Days to Die</game_name>
   <server_exec_name>7DaysToDieServer.exe</server_exec_name>
-  <cli_template>-logfile logs/output_log.txt -quit -batchmode -nographics -configfile=serverconfig.xml -dedicated</cli_template>
+  <cli_template>-logfile 7DaysToDieServer_Data/output_log.txt -quit -batchmode -nographics -configfile=serverconfig.xml -dedicated</cli_template>
   <maps_location>Data/Worlds</maps_location>
-  <console_log>logs/output_log.txt</console_log>
+  <console_log>7DaysToDieServer_Data/output_log.txt</console_log>
   <max_user_amount>64</max_user_amount>
   <mods>
     <mod key="7daystodie1">
@@ -16,7 +16,7 @@
       <installer_login>anonymous</installer_login>
     </mod>
     <mod key="7daystodie2">
-      <name>Latest Experimental</name>
+      <name>Unstable build</name>
       <installer_name>294420</installer_name>
       <installer_login>anonymous</installer_login>
       <betaname>latest_experimental</betaname>
@@ -67,14 +67,6 @@
     </text>
   </replace_texts>
   <custom_fields>
-    <field key="Game Name" type="text">
-      <default>property</default>
-      <default_value>My Game</default_value>
-      <var>GameName</var>
-      <filepath>serverconfig.xml</filepath>
-      <options>tagValueByName</options>
-      <desc>Whatever you want the game name to be (this controls the random generation seed as well).</desc>
-    </field>
     <field key="Control Panel Enabled" type="select">
       <option value="false">False</option>
       <option value="true">True</option>
@@ -111,14 +103,6 @@
       <options>tagValueByName</options>
       <desc>Port of the Telnet server.</desc>
     </field>
-    <field key="Max Spawned Zombies" type="text">
-      <default>property</default>
-      <default_value>60</default_value>
-      <var>MaxSpawnedZombies</var>
-      <filepath>serverconfig.xml</filepath>
-      <options>tagValueByName</options>
-      <desc>Making this number too large (more than about 80) may cause servers to run at poor framerates which will effect lag and play quality for clients.</desc>
-    </field>
     <field key="EAC Enabled" type="select">
       <option value="false">False</option>
       <option value="true">True</option>
@@ -129,6 +113,22 @@
       <options>tagValueByName</options>
       <desc>Enables/Disables EasyAntiCheat.</desc>
     </field>
+    <field key="Game Name" type="text">
+      <default>property</default>
+      <default_value>My Game</default_value>
+      <var>GameName</var>
+      <filepath>serverconfig.xml</filepath>
+      <options>tagValueByName</options>
+      <desc>Whatever you want the game name to be (this controls the random generation seed as well).</desc>
+    </field>
+    <field key="Max Spawned Zombies" type="text">
+      <default>property</default>
+      <default_value>60</default_value>
+      <var>MaxSpawnedZombies</var>
+      <filepath>serverconfig.xml</filepath>
+      <options>tagValueByName</options>
+      <desc>Making this number too large (more than about 80) may cause servers to run at poor framerates which will effect lag and play quality for clients.</desc>
+    </field>
   </custom_fields>
   <configuration_files>
     <file description="Server Configurations">serverconfig.xml</file>

+ 6 - 3
modules/config_games/server_configs/aliensvspredator_win32.xml

@@ -51,7 +51,7 @@
     </text>
   </replace_texts>
   <custom_fields>
-    <field key="authport" type="text">
+    <field key="Auth Port" type="text">
       <default>authport.*</default>
       <default_value>8766</default_value>
       <var>authport</var>
@@ -59,7 +59,7 @@
    	  <options>s</options>
       <desc>Port of Auth.</desc>
     </field>
-    <field key="gameport" type="text">
+    <field key="Game Port" type="text">
       <default>gameport.*</default>
       <default_value>27016</default_value>
       <var>gameport</var>
@@ -88,4 +88,7 @@
         echo host>> $config
     fi
   </post_install>
-</game_config>
+  <configuration_files>
+    <file description="Server Configurations">default.cfg</file>
+  </configuration_files>
+</game_config>

+ 149 - 0
modules/config_games/server_configs/brainbread2_linux32.xml

@@ -0,0 +1,149 @@
+<game_config>
+	<game_key>brainbread2_linux32</game_key>
+	<protocol>lgsl</protocol>
+	<lgsl_query_name>source</lgsl_query_name>
+	<installer>steamcmd</installer>
+	<game_name>BrainBread 2</game_name>
+	<server_exec_name>srcds_run</server_exec_name>
+	<cli_template>%GAME_TYPE% %PID_FILE% %MAP% %IP% %PORT% %PLAYERS%</cli_template>
+	<cli_params>
+		<cli_param id="GAME_TYPE" cli_string="-game" options="s" />
+		<cli_param id="PID_FILE" cli_string="-pid_file ../" />
+		<cli_param id="MAP" cli_string="+map" options="s" />
+		<cli_param id="IP" cli_string="+ip" options="s" />
+		<cli_param id="PORT" cli_string="-port" options="s" />
+		<cli_param id="PLAYERS" cli_string="+maxplayers" options="s" />
+	</cli_params>
+	<maps_location>brainbread2/maps/</maps_location>
+	<map_list>brainbread2/maplist.txt</map_list>
+	<max_user_amount>12</max_user_amount>
+	<control_protocol>rcon2</control_protocol>
+	<mods>
+		<mod key="brainbread2">
+			<name>none</name>
+			<installer_name>475370</installer_name>
+			<installer_login>anonymous</installer_login>
+		</mod>
+	</mods>
+	<replace_texts>
+		<text key="control_password">
+			<default>rcon_password.*</default>
+			<var>rcon_password</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>sq</options>
+		</text>
+		<text key="home_name">
+			<default>hostname.*</default>
+			<var>hostname</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>sq</options>
+		</text>
+	</replace_texts>
+	<server_params>
+		<param key="+sv_setsteamaccount" type="text">
+			<caption>Steam Account Login Token</caption>
+			<desc>Manage your steam tokens &lt;a href=https://steamcommunity.com/dev/managegameservers target=_blank&gt;here&lt;/a&gt;</desc>
+		</param>
+
+		<param key="-autoupdate -steam_dir {OGP_STEAM_CMD_DIR} -steamcmd_script {STEAMCMD_INSTALL_FILE}" type="checkbox_key_value">
+			<caption>Auto-Update</caption>
+			<desc>The server will automatically download official updates as they are released.</desc>
+		</param>
+		<param key="-sv_pure" type="select">
+			<option value="-1">Do not apply any rules or restrict which files the client may load. (Default)</option>
+			<option value="0">Apply rules in cfg/pure_server_minimal.txt only</option>
+			<option value="1">Apply rules in cfg/pure_server_full.txt and then cfg/pure_server_whitelist.txt</option>
+			<option value="2">Apply rules in cfg/pure_server_full.txt</option>
+			<caption>Pure Server</caption>
+			<desc>A pure server is one that forces all clients on the server to use content that matches what is on the server.</desc>
+		</param>
+		<param key="-dev" type="checkbox_key_value">
+			<caption>Developer Messages.</caption>
+			<desc>Show developer messages.</desc>
+		</param>
+		<param key="-debuglog custom_error.log" type="checkbox_key_value">
+			<caption>Error Logging</caption>
+			<desc>File Errors are Logged to.</desc>
+		</param>
+		<param key="-debug" type="checkbox_key_value">
+			<caption>Debugging</caption>
+			<desc>Turns on Debugging.</desc>
+		</param>
+		<param key="+motdfile custom_motd.txt" type="checkbox_key_value">
+			<caption>Custom MOTD</caption>
+			<desc>Custom MOTD file.</desc>
+		</param>
+		<param key="+mapcyclefile custom_mapcycle.txt" type="checkbox_key_value">
+			<caption>Custom Mapcycle</caption>
+			<desc>Custom Mapcycle file.</desc>
+		</param>
+		<param key="-nomaster" type="checkbox_key_value">
+			<caption>Disable master server communication</caption>
+		</param>
+		<param key="-insecure" type="checkbox_key_value">
+			<caption>Disable Valve Anti-Cheat</caption>
+			<desc>Will start the server without Valve Anti-Cheat technology.</desc>
+		</param>
+		<param key="-nohltv" type="checkbox_key_value">
+			<caption>No SourceTV</caption>
+			<desc>Disables SourceTV and closes its port.</desc>
+		</param>
+		<param key="-norestart" type="checkbox_key_value">
+			<caption>No Restart</caption>
+			<desc>Won't attempt to restart failed servers.</desc>
+		</param>
+	</server_params>
+	<custom_fields>
+		<field key="sv_maxrate" type="text">
+			<default>sv_maxrate.*</default>
+			<default_value>0</default_value>
+			<var>sv_maxrate</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>s</options>
+			<desc>Max bandwidth rate allowed on server ( bytes per second ), 0 == unlimited.</desc>
+		</field>
+		<field key="sv_minrate" type="text">
+			<default>sv_minrate.*</default>
+			<default_value>16000</default_value>
+			<var>sv_minrate</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>s</options>
+			<desc>Min bandwidth rate allowed on server ( bytes per second ), 0 == unlimited.</desc>
+		</field>
+		<field key="sv_maxcmdrate" type="text">
+			<default>sv_maxcmdrate.*</default>
+			<default_value>66</default_value>
+			<var>sv_maxcmdrate</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>s</options>
+			<desc>If sv_mincmdrate is > 0, this sets the maximum value for cl_cmdrate.</desc>
+		</field>
+		<field key="sv_mincmdrate" type="text">
+			<default>sv_mincmdrate.*</default>
+			<default_value>66</default_value>
+			<var>sv_mincmdrate</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>s</options>
+			<desc>This sets the minimum value for cl_cmdrate. 0 == unlimited.</desc>
+		</field>
+		<field key="sv_maxupdaterate" type="text">
+			<default>sv_maxupdaterate.*</default>
+			<default_value>66</default_value>
+			<var>sv_maxupdaterate</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>s</options>
+			<desc>Maximum updates per second that the server will allow.</desc>
+		</field>
+		<field key="sv_minupdaterate" type="text">
+			<default>sv_minupdaterate.*</default>
+			<default_value>66</default_value>
+			<var>sv_minupdaterate</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>s</options>
+			<desc>Minimum updates per second that the server will allow.</desc>
+		</field>
+	</custom_fields>
+	<configuration_files>
+		<file description="Main Configuration File">brainbread2/cfg/server.cfg</file>
+	</configuration_files>
+</game_config>

+ 149 - 0
modules/config_games/server_configs/brainbread2_win32.xml

@@ -0,0 +1,149 @@
+<game_config>
+	<game_key>brainbread2_win32</game_key>
+	<protocol>lgsl</protocol>
+	<lgsl_query_name>source</lgsl_query_name>
+	<installer>steamcmd</installer>
+	<game_name>BrainBread 2</game_name>
+	<server_exec_name>srcds.exe</server_exec_name>
+	<cli_template>%GAME_TYPE% %PID_FILE% %MAP% %IP% %PORT% %PLAYERS%</cli_template>
+	<cli_params>
+		<cli_param id="GAME_TYPE" cli_string="-game" options="s" />
+		<cli_param id="PID_FILE" cli_string="-pid_file ../" />
+		<cli_param id="MAP" cli_string="+map" options="s" />
+		<cli_param id="IP" cli_string="+ip" options="s" />
+		<cli_param id="PORT" cli_string="-port" options="s" />
+		<cli_param id="PLAYERS" cli_string="+maxplayers" options="s" />
+	</cli_params>
+	<maps_location>brainbread2/maps/</maps_location>
+	<map_list>brainbread2/maplist.txt</map_list>
+	<max_user_amount>12</max_user_amount>
+	<control_protocol>rcon2</control_protocol>
+	<mods>
+		<mod key="brainbread2">
+			<name>none</name>
+			<installer_name>475370</installer_name>
+			<installer_login>anonymous</installer_login>
+		</mod>
+	</mods>
+	<replace_texts>
+		<text key="control_password">
+			<default>rcon_password.*</default>
+			<var>rcon_password</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>sq</options>
+		</text>
+		<text key="home_name">
+			<default>hostname.*</default>
+			<var>hostname</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>sq</options>
+		</text>
+	</replace_texts>
+	<server_params>
+		<param key="+sv_setsteamaccount" type="text">
+			<caption>Steam Account Login Token</caption>
+			<desc>Manage your steam tokens &lt;a href=https://steamcommunity.com/dev/managegameservers target=_blank&gt;here&lt;/a&gt;</desc>
+		</param>
+
+		<param key="-autoupdate -steam_dir {OGP_STEAM_CMD_DIR} -steamcmd_script {STEAMCMD_INSTALL_FILE}" type="checkbox_key_value">
+			<caption>Auto-Update</caption>
+			<desc>The server will automatically download official updates as they are released.</desc>
+		</param>
+		<param key="-sv_pure" type="select">
+			<option value="-1">Do not apply any rules or restrict which files the client may load. (Default)</option>
+			<option value="0">Apply rules in cfg/pure_server_minimal.txt only</option>
+			<option value="1">Apply rules in cfg/pure_server_full.txt and then cfg/pure_server_whitelist.txt</option>
+			<option value="2">Apply rules in cfg/pure_server_full.txt</option>
+			<caption>Pure Server</caption>
+			<desc>A pure server is one that forces all clients on the server to use content that matches what is on the server.</desc>
+		</param>
+		<param key="-dev" type="checkbox_key_value">
+			<caption>Developer Messages.</caption>
+			<desc>Show developer messages.</desc>
+		</param>
+		<param key="-debuglog custom_error.log" type="checkbox_key_value">
+			<caption>Error Logging</caption>
+			<desc>File Errors are Logged to.</desc>
+		</param>
+		<param key="-debug" type="checkbox_key_value">
+			<caption>Debugging</caption>
+			<desc>Turns on Debugging.</desc>
+		</param>
+		<param key="+motdfile custom_motd.txt" type="checkbox_key_value">
+			<caption>Custom MOTD</caption>
+			<desc>Custom MOTD file.</desc>
+		</param>
+		<param key="+mapcyclefile custom_mapcycle.txt" type="checkbox_key_value">
+			<caption>Custom Mapcycle</caption>
+			<desc>Custom Mapcycle file.</desc>
+		</param>
+		<param key="-nomaster" type="checkbox_key_value">
+			<caption>Disable master server communication</caption>
+		</param>
+		<param key="-insecure" type="checkbox_key_value">
+			<caption>Disable Valve Anti-Cheat</caption>
+			<desc>Will start the server without Valve Anti-Cheat technology.</desc>
+		</param>
+		<param key="-nohltv" type="checkbox_key_value">
+			<caption>No SourceTV</caption>
+			<desc>Disables SourceTV and closes its port.</desc>
+		</param>
+		<param key="-norestart" type="checkbox_key_value">
+			<caption>No Restart</caption>
+			<desc>Won't attempt to restart failed servers.</desc>
+		</param>
+	</server_params>
+	<custom_fields>
+		<field key="sv_maxrate" type="text">
+			<default>sv_maxrate.*</default>
+			<default_value>0</default_value>
+			<var>sv_maxrate</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>s</options>
+			<desc>Max bandwidth rate allowed on server ( bytes per second ), 0 == unlimited.</desc>
+		</field>
+		<field key="sv_minrate" type="text">
+			<default>sv_minrate.*</default>
+			<default_value>16000</default_value>
+			<var>sv_minrate</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>s</options>
+			<desc>Min bandwidth rate allowed on server ( bytes per second ), 0 == unlimited.</desc>
+		</field>
+		<field key="sv_maxcmdrate" type="text">
+			<default>sv_maxcmdrate.*</default>
+			<default_value>66</default_value>
+			<var>sv_maxcmdrate</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>s</options>
+			<desc>If sv_mincmdrate is > 0, this sets the maximum value for cl_cmdrate.</desc>
+		</field>
+		<field key="sv_mincmdrate" type="text">
+			<default>sv_mincmdrate.*</default>
+			<default_value>66</default_value>
+			<var>sv_mincmdrate</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>s</options>
+			<desc>This sets the minimum value for cl_cmdrate. 0 == unlimited.</desc>
+		</field>
+		<field key="sv_maxupdaterate" type="text">
+			<default>sv_maxupdaterate.*</default>
+			<default_value>66</default_value>
+			<var>sv_maxupdaterate</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>s</options>
+			<desc>Maximum updates per second that the server will allow.</desc>
+		</field>
+		<field key="sv_minupdaterate" type="text">
+			<default>sv_minupdaterate.*</default>
+			<default_value>66</default_value>
+			<var>sv_minupdaterate</var>
+			<filepath>brainbread2/cfg/server.cfg</filepath>
+			<options>s</options>
+			<desc>Minimum updates per second that the server will allow.</desc>
+		</field>
+	</custom_fields>
+	<configuration_files>
+		<file description="Main Configuration File">brainbread2/cfg/server.cfg</file>
+	</configuration_files>
+</game_config>

+ 0 - 73
modules/config_games/server_configs/egs_win64.xml

@@ -1,73 +0,0 @@
-<game_config>
-  <game_key>egs_win64</game_key>
-  <protocol>lgsl</protocol>
-  <lgsl_query_name>egs</lgsl_query_name>
-  <installer>steamcmd</installer>
-  <game_name>Empyrion – Galactic Survival</game_name>
-  <server_exec_name>EmpyrionLauncher.exe</server_exec_name>
-  <cli_template>-startDedi</cli_template>
-  <console_log>Logs/Dedicated.log</console_log>
-  <max_user_amount>12</max_user_amount>
-  <mods>
-    <mod key="egs1">
-      <name>Stable</name>
-      <installer_name>530870</installer_name>
-      <installer_login>anonymous</installer_login>
-    </mod>
-    <mod key="egs2">
-      <name>Experimental</name>
-      <installer_name>530870</installer_name>
-      <installer_login>anonymous</installer_login>
-      <betaname>experimental</betaname>
-    </mod>
-  </mods>
-  <replace_texts>
-    <text key="home_name">
-      <default>Srv_Name: .*</default>
-      <var>Srv_Name: </var>
-      <filepath>dedicated.yaml</filepath>
-    </text>
-    <text key="port">
-      <default>Srv_Port: .*</default>
-      <var>Srv_Port: </var>
-      <filepath>dedicated.yaml</filepath>
-    </text>
-    <text key="max_players">
-      <default>Srv_MaxPlayers: .*</default>
-      <var>Srv_MaxPlayers: </var>
-      <filepath>dedicated.yaml</filepath>
-    </text>
-    <text key="control_password">
-      <default>Tel_Pwd: .*</default>
-      <var>Tel_Pwd: </var>
-      <filepath>dedicated.yaml</filepath>
-    </text>
-  </replace_texts>
-  <custom_fields>
-    <field key="Enable Telnet" type="select">
-      <option value="true">True</option>
-      <option value="false">False</option>
-      <default>Tel_Enabled: .*</default>
-      <default_value>true</default_value>
-      <var>Tel_Enabled: </var>
-      <filepath>dedicated.yaml</filepath>
-      <desc>Activate Telnet server.</desc>
-    </field>
-    <field key="Telnet Port" type="text">
-      <default>Tel_Port: .*</default>
-      <default_value>30004</default_value>
-      <var>Tel_Port: </var>
-      <filepath>dedicated.yaml</filepath>
-      <desc>Port of Telnet.</desc>
-    </field>
-    <field key="Activate EAC" type="select">
-      <option value="true">True</option>
-      <option value="false">False</option>
-      <default>EACActive: .*</default>
-      <default_value>false</default_value>
-      <var>EACActive: </var>
-      <filepath>dedicated.yaml</filepath>
-      <desc>Activate Easy Anti Cheat.</desc>
-    </field>
-  </custom_fields>
-</game_config>

+ 114 - 0
modules/config_games/server_configs/empyriongs_win64.xml

@@ -0,0 +1,114 @@
+<game_config>
+  <game_key>empyriongs_win64</game_key>
+  <protocol>lgsl</protocol>
+  <lgsl_query_name>egs</lgsl_query_name>
+  <installer>steamcmd</installer>
+  <game_name>Empyrion – Galactic Survival</game_name>
+  <server_exec_name>EmpyrionLauncher.exe</server_exec_name>
+  <cli_template>-startDedi -dedicated dedicated.yaml</cli_template>
+  <console_log>Logs/Dedicated.log</console_log>
+  <max_user_amount>128</max_user_amount>
+  <mods>
+    <mod key="empyriongs1">
+      <name>Stable</name>
+      <installer_name>530870</installer_name>
+      <installer_login>anonymous</installer_login>
+    </mod>
+    <mod key="empyriongs2">
+      <name>Unstable Test Branch</name>
+      <installer_name>530870</installer_name>
+      <installer_login>anonymous</installer_login>
+      <betaname>experimental</betaname>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="home_name">
+      <default>Srv_Name: .*</default>
+      <var>Srv_Name: </var>
+      <filepath>dedicated.yaml</filepath>
+    </text>
+    <text key="port">
+      <default>Srv_Port: .*</default>
+      <var>Srv_Port: </var>
+      <filepath>dedicated.yaml</filepath>
+    </text>
+    <text key="max_players">
+      <default>(.*)(Srv_MaxPlayers:\s+)(.*)</default>
+      <var>    ${2}%key%</var>
+      <filepath>dedicated.yaml</filepath>
+      <options>key-regex</options>
+    </text>
+    <text key="control_password">
+      <default>(.*)(Tel_Pwd:\s+)(.*)</default>
+      <var>    ${2}%key%</var>
+      <filepath>dedicated.yaml</filepath>
+      <options>key-regex</options>
+    </text>
+  </replace_texts>
+  <custom_fields>
+    <field key="Enable Telnet" type="select">
+      <option value="True">True</option>
+      <option value="False">False</option>
+      <default>(.*)(Tel_Enabled:\s+)(.*)</default>
+      <default_value>True</default_value>
+      <var>    ${2}%key%</var>
+      <filepath>dedicated.yaml</filepath>
+      <options>key-regex</options>
+      <desc>Activate Telnet server.</desc>
+    </field>
+    <field key="Telnet Port" type="text">
+      <default>(.*)(Tel_Port:\s+)(.*)</default>
+      <default_value>30004</default_value>
+      <var>    ${2}%key%</var>
+      <filepath>dedicated.yaml</filepath>
+      <options>key-regex</options>
+      <desc>Port of Telnet.</desc>
+    </field>
+    <field key="Activate EAC" type="select">
+      <option value="True">True</option>
+      <option value="False">False</option>
+      <default>(.*)(EACActive:\s+)(.*)</default>
+      <default_value>False</default_value>
+      <var>    ${2}%key%</var>
+      <filepath>dedicated.yaml</filepath>
+      <options>key-regex</options>
+      <desc>Activate Easy Anti Cheat.</desc>
+    </field>
+    <field key="Reserve Playfields" type="text">
+      <default>(.*)(Srv_ReservePlayfields:\s+)(.*)(#\s+)(.*)</default>
+      <default_value>1</default_value>
+      <var>    ${2}%key%  ${4}${5}</var>
+      <filepath>dedicated.yaml</filepath>
+      <options>key-regex</options>
+      <desc>Idle playfield servers held in reserve. For busy public servers, we recommend at least 2.</desc>
+    </field>
+    <field key="Stop Period" type="text">
+      <default>(.*)(Srv_StopPeriod:\s+)(.*)</default>
+      <default_value>48</default_value>
+      <var>    ${2}%key%</var>
+      <filepath>dedicated.yaml</filepath>
+      <options>key-regex</options>
+      <desc>All playfield servers will be automatically stopped every (n) real time hours. Players will get some warning messages before.</desc>
+    </field>
+    <field key="Game Name" type="text">
+      <default>(.*)(GameName:\s+)(.*)(#\s+)(.*)</default>
+      <default_value>NewGame_0</default_value>
+      <var>    ${2}%key%                      ${4}${5}</var>
+      <filepath>dedicated.yaml</filepath>
+      <options>key-regex</options>
+      <desc>Determines name of the save game.</desc>
+    </field>
+    <field key="Seed" type="text">
+      <default>(.*)(Seed:\s+)(.*)(#\s+)(.*)</default>
+      <default_value>2309115</default_value>
+      <var>    ${2}%key%                            ${4}${5}</var>
+      <filepath>dedicated.yaml</filepath>
+      <options>key-regex</options>
+      <desc>The seed determines how the world is procedurally generated - the same seed means the same world. Can be any 7 digit or below number, but negative numbers and 0 (zero) cannot be used.</desc>
+    </field>
+  </custom_fields>
+  <configuration_files>
+    <file description="Server Configurations">dedicated.yaml</file>
+    <file description="Admin Configurations">Saves/adminconfig.example.yaml</file>
+  </configuration_files>
+</game_config>

+ 22 - 10
modules/config_games/server_configs/homefront_win32.xml

@@ -49,23 +49,35 @@
     </param>
   </server_params>
   <custom_fields>
-    <field key="VAC Secured" type="select">
-      <option value="True">True</option>
-      <option value="False">False</option>
-      <default>bVAC=.*</default>
-      <default_value>True</default_value>
-      <var>bVAC=</var>
-      <filepath>GCGame/Config/DedicatedProfile_DefaultProfile/DedicatedPlaylist</filepath>
-      <desc>Allow or disallow any VAC banned players from joining.</desc>
-    </field>
     <field key="Cheat Detection" type="select">
-      <option value="True">True</option>
       <option value="False">False</option>
+      <option value="True">True</option>
       <default>bEnableCheatDetection=.*</default>
       <default_value>False</default_value>
       <var>bEnableCheatDetection=</var>
       <filepath>GCGame/Config/DedicatedProfile_DefaultProfile/DedicatedPlaylist</filepath>
       <desc>Enable/Disable cheat detection.</desc>
     </field>
+    <field key="VAC Secured" type="select">
+      <option value="False">False</option>
+      <option value="True">True</option>
+      <default>bVAC=.*</default>
+      <default_value>True</default_value>
+      <var>bVAC=</var>
+      <filepath>GCGame/Config/DedicatedProfile_DefaultProfile/DedicatedPlaylist</filepath>
+      <desc>Allow or disallow any VAC banned players from joining.</desc>
+    </field>
   </custom_fields>
+  <post_install>
+    if [ -d "GCGame/Config/DedicatedProfile_DefaultProfile" ]
+      then
+        echo "DedicatedProfile_DefaultProfile found. OK!"
+      else
+        echo "DedicatedProfile_DefaultProfile not found."
+        echo "You need to run DedicatedServer.exe server tool first and create DedicatedProfile_DefaultProfile!"
+    fi
+</post_install>
+  <configuration_files>
+    <file description="Server Configurations">GCGame/Config/DedicatedProfile_DefaultProfile/DedicatedPlaylist</file>
+  </configuration_files>
 </game_config>

+ 18 - 2
modules/config_games/server_configs/hurtworld_linux32.xml

@@ -5,7 +5,7 @@
   <installer>steamcmd</installer>
   <game_name>Hurtworld</game_name>
   <server_exec_name>Hurtworld.x86</server_exec_name>
-  <cli_template>-batchmode -nographics -exec "%PORT% %MAP%;%QUERY_PORT%;%PLAYERS%;%HOSTNAME%" -logfile "output.txt"</cli_template>
+  <cli_template>-batchmode -nographics -exec "%PORT% %MAP%;%QUERY_PORT%;%PLAYERS%;%HOSTNAME%" -logfile "gamelog.txt"</cli_template>
   <cli_params>
     <cli_param id="PORT" cli_string="host" options="s" />
     <cli_param id="MAP" cli_string="" />
@@ -16,7 +16,7 @@
     <port type="add" id="QUERY_PORT" cli_string="queryport" options="s">10</port>
   </reserve_ports>
   <maps_location>Hurtworld_Data/maps</maps_location>
-  <console_log>output.txt</console_log>
+  <console_log>gamelog.txt</console_log>
   <max_user_amount>60</max_user_amount>
   <mods>
     <mod key="default">
@@ -25,4 +25,20 @@
       <installer_login>anonymous</installer_login>
     </mod>
   </mods>
+  <post_install>
+    if [ -f "Hurtworld_Data/Plugins/x86/steamclient.so" ]
+      then
+        echo "steamclient.so found. OK!"
+      else
+        echo "steamclient.so not found."
+        echo "Fixing steamclient.so!"
+        mv -f steamclient.so Hurtworld_Data/Plugins/x86
+    fi
+  </post_install>
+  <lock_files>
+    Hurtworld.x86_64
+  </lock_files>
+  <configuration_files>
+    <file description="Server Configurations">autoexec.cfg</file>
+  </configuration_files>
 </game_config>

+ 8 - 2
modules/config_games/server_configs/hurtworld_linux64.xml

@@ -5,7 +5,7 @@
   <installer>steamcmd</installer>
   <game_name>Hurtworld</game_name>
   <server_exec_name>Hurtworld.x86_64</server_exec_name>
-  <cli_template>-batchmode -nographics -exec "%PORT% %MAP%;%QUERY_PORT%;%PLAYERS%;%HOSTNAME%" -logfile "output.txt"</cli_template>
+  <cli_template>-batchmode -nographics -exec "%PORT% %MAP%;%QUERY_PORT%;%PLAYERS%;%HOSTNAME%" -logfile "gamelog.txt"</cli_template>
   <cli_params>
     <cli_param id="PORT" cli_string="host" options="s" />
     <cli_param id="MAP" cli_string="" />
@@ -16,7 +16,7 @@
     <port type="add" id="QUERY_PORT" cli_string="queryport" options="s">10</port>
   </reserve_ports>
   <maps_location>Hurtworld_Data/maps</maps_location>
-  <console_log>output.txt</console_log>
+  <console_log>gamelog.txt</console_log>
   <max_user_amount>60</max_user_amount>
   <mods>
     <mod key="default">
@@ -25,4 +25,10 @@
       <installer_login>anonymous</installer_login>
     </mod>
   </mods>
+  <lock_files>
+    Hurtworld.x86
+  </lock_files>
+  <configuration_files>
+    <file description="Server Configurations">autoexec.cfg</file>
+  </configuration_files>
 </game_config>

+ 5 - 2
modules/config_games/server_configs/hurtworld_win64.xml

@@ -5,7 +5,7 @@
   <installer>steamcmd</installer>
   <game_name>Hurtworld</game_name>
   <server_exec_name>Hurtworld.exe</server_exec_name>
-  <cli_template>-batchmode -nographics -exec "%PORT% %MAP%;%QUERY_PORT%;%PLAYERS%;%HOSTNAME%" -logfile "output.txt"</cli_template>
+  <cli_template>-batchmode -nographics -exec "%PORT% %MAP%;%QUERY_PORT%;%PLAYERS%;%HOSTNAME%" -logfile "gamelog.txt"</cli_template>
   <cli_params>
     <cli_param id="PORT" cli_string="host" options="s" />
     <cli_param id="MAP" cli_string="" />
@@ -16,7 +16,7 @@
     <port type="add" id="QUERY_PORT" cli_string="queryport" options="s">10</port>
   </reserve_ports>
   <maps_location>Hurtworld_Data/maps</maps_location>
-  <console_log>output.txt</console_log>
+  <console_log>gamelog.txt</console_log>
   <max_user_amount>60</max_user_amount>
   <mods>
     <mod key="default">
@@ -25,4 +25,7 @@
       <installer_login>anonymous</installer_login>
     </mod>
   </mods>
+  <configuration_files>
+    <file description="Server Configurations">autoexec.cfg</file>
+  </configuration_files>
 </game_config>

+ 5 - 3
modules/config_games/server_configs/left_4_dead.xml

@@ -14,15 +14,14 @@
     <cli_param id="PLAYERS" cli_string="-maxplayers" options="s" />
     <cli_param id="GAME_TYPE" cli_string="-game" options="s" />
   </cli_params>
-  <maps_location>l4d/left4dead/maps</maps_location>
-  <map_list>l4d/left4dead/maplist.txt</map_list>
-  <exe_location>l4d</exe_location>
+  <map_list>left4dead/maplist.txt</map_list>
   <max_user_amount>32</max_user_amount>
   <control_protocol>rcon2</control_protocol>
   <mods>
     <mod key="left4dead">
       <name>none</name>
 	  <installer_name>222840</installer_name>
+	  <installer_login>anonymous</installer_login>
     </mod>
   </mods>
   <server_params>
@@ -42,4 +41,7 @@
       <caption>Disable master server communication</caption>
     </param>
   </server_params>
+  <configuration_files>
+  <file description="The main config file">left4dead/cfg/server.cfg</file>
+  </configuration_files>
 </game_config>

+ 36 - 0
modules/config_games/server_configs/mafia2online_linux32.xml

@@ -0,0 +1,36 @@
+<game_config>
+  <game_key>mafia2online_linux32</game_key>
+  <game_name>Mafia 2 Online</game_name>
+  <server_exec_name>m2online-svr</server_exec_name>
+  <max_user_amount>1000</max_user_amount>
+  <mods>
+    <mod key="m2o">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="home_name">
+      <default>hostname</default>
+      <filepath>config.xml</filepath>
+      <options>tags</options>
+    </text>
+    <text key="ip">
+      <default>serverip</default>
+      <filepath>config.xml</filepath>
+      <options>tags</options>
+    </text>
+    <text key="port">
+      <default>port</default>
+      <filepath>config.xml</filepath>
+      <options>tags</options>
+    </text>
+    <text key="max_players">
+      <default>maxplayers</default>
+      <filepath>config.xml</filepath>
+      <options>tags</options>
+    </text>
+  </replace_texts>
+  <configuration_files>
+    <file description="Server Configurations">config.xml</file>
+  </configuration_files>
+</game_config>

+ 36 - 0
modules/config_games/server_configs/mafia2online_win32.xml

@@ -0,0 +1,36 @@
+<game_config>
+  <game_key>mafia2online_win32</game_key>
+  <game_name>Mafia 2 Online</game_name>
+  <server_exec_name>m2online-svr.exe</server_exec_name>
+  <max_user_amount>1000</max_user_amount>
+  <mods>
+    <mod key="m2o">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="home_name">
+      <default>hostname</default>
+      <filepath>config.xml</filepath>
+      <options>tags</options>
+    </text>
+    <text key="ip">
+      <default>serverip</default>
+      <filepath>config.xml</filepath>
+      <options>tags</options>
+    </text>
+    <text key="port">
+      <default>port</default>
+      <filepath>config.xml</filepath>
+      <options>tags</options>
+    </text>
+    <text key="max_players">
+      <default>maxplayers</default>
+      <filepath>config.xml</filepath>
+      <options>tags</options>
+    </text>
+  </replace_texts>
+  <configuration_files>
+    <file description="Server Configurations">config.xml</file>
+  </configuration_files>
+</game_config>

+ 7 - 0
modules/config_games/server_configs/squad_linux64.xml

@@ -71,4 +71,11 @@
   <post_install>
     sed -i '4s/IP/Ip/g' Squad/ServerConfig/Rcon.cfg
   </post_install>
+  <configuration_files>
+    <file description="Server Configurations">Squad/ServerConfig/Server.cfg</file>
+    <file description="RCON Configurations">Squad/ServerConfig/Rcon.cfg</file>
+    <file description="Admin Configurations">Squad/ServerConfig/Admins.cfg</file>
+    <file description="Map Rotation Configurations">Squad/ServerConfig/MapRotation.cfg</file>
+    <file description="Server Messages Configurations">Squad/ServerConfig/ServerMessages.cfg</file>
+  </configuration_files>
 </game_config>

+ 7 - 0
modules/config_games/server_configs/squad_win64.xml

@@ -71,4 +71,11 @@
   <post_install>
     sed -i '4s/IP/Ip/g' Squad/ServerConfig/Rcon.cfg
   </post_install>
+  <configuration_files>
+    <file description="Server Configurations">Squad/ServerConfig/Server.cfg</file>
+    <file description="RCON Configurations">Squad/ServerConfig/Rcon.cfg</file>
+    <file description="Admin Configurations">Squad/ServerConfig/Admins.cfg</file>
+    <file description="Map Rotation Configurations">Squad/ServerConfig/MapRotation.cfg</file>
+    <file description="Server Messages Configurations">Squad/ServerConfig/ServerMessages.cfg</file>
+  </configuration_files>
 </game_config>

+ 10 - 10
modules/gamemanager/rsync_install.php

@@ -208,16 +208,6 @@ function exec_ogp_module() {
 		
 		$exec_folder_path = clean_path($home_info['home_path'] . "/" . $server_xml->exe_location );
 		$exec_path = clean_path($exec_folder_path . "/" . $server_xml->server_exec_name );
-
-		$url_id = (isset($_POST['url_id']) && (int)$_POST['url_id'] > 0 ? (int)$_POST['url_id'] -1 : null);
-		if (!is_null($url_id) && array_key_exists($url_id, $rsync_sites)) {
-			$urlArr = explode('|', $rsync_sites[$url_id]);
-			$url = $urlArr[0] . "/ogp_game_installer/$lgslname/$os/";
-		} else {
-			print_failure(get_lang('unknown_rsync_mirror'));
-			$view->refresh('?m=gamemanager&p=game_monitor');
-			return;
-		}
 		
 		if( isset( $_REQUEST['master_server_home_id'] ) )
 		{
@@ -246,6 +236,16 @@ function exec_ogp_module() {
 		}
 		else
 		{
+			$url_id = (isset($_POST['url_id']) && (int)$_POST['url_id'] > 0 ? (int)$_POST['url_id'] -1 : null);
+			if (!is_null($url_id) && array_key_exists($url_id, $rsync_sites)) {
+				$urlArr = explode('|', $rsync_sites[$url_id]);
+				$url = $urlArr[0] . "/ogp_game_installer/$lgslname/$os/";
+			} else {
+				print_failure(get_lang('unknown_rsync_mirror'));
+				$view->refresh('?m=gamemanager&p=game_monitor');
+				return;
+			}
+
 			print_success(get_lang_f("starting_sync_with", $url));
 			
 			// Additional files to lock

+ 2 - 2
modules/gamemanager/server_monitor.php

@@ -327,7 +327,7 @@ function exec_ogp_module() {
 			if ( preg_match("/f/",$server_home['access_rights']) > 0 && $litefm_installed )
 			{
 				$lite_fm = "<a class='monitorbutton' href='?m=litefm&amp;home_id=".$server_home['home_id']."'>
-					<img src='" . check_theme_image("images/txt.png") . "' title='". file_manager ."'>
+					<img src='" . check_theme_image("images/filemanager.png") . "' title='". file_manager ."'>
 					<span>". file_manager ."</span>
 				</a>";
 			}
@@ -433,7 +433,7 @@ function exec_ogp_module() {
 
 				if ($db->isModuleInstalled("editconfigfiles") && !empty($server_xml->configuration_files)) {
 					$manager .= "<a href=\"?m=editconfigfiles&home_id=".(int)$server_home['home_id']."\" class=\"monitorbutton\">
-									<img src='" . check_theme_image("images/txt.png") . "' title='". edit_configuration_files ."'>
+									<img src='" . check_theme_image("images/editconfig.png") . "' title='". edit_configuration_files ."'>
 									<span>". edit_configuration_files ."</span>
 					</a>";
 				}

+ 4 - 4
modules/status/include/uptime.php

@@ -51,10 +51,10 @@ $uptime = $uptime - ($hours * (3600));
 $minutes = floor($uptime / (60));
 $uptime = $uptime - ($minutes * 60);
 $seconds = $uptime;
-$days = $days != 1 ? $days . ' Days' : $days . ' Day';
-$hours = $hours != 1 ? $hours . ' Hours' : $hours . ' Hour';
-$minutes = $minutes != 1 ? $minutes . ' Minutes' : $minutes . ' Minute';
-$seconds = $seconds != 1 ? $seconds . ' Seconds' : $seconds . ' Second';
+$days = $days != 1 ? $days . ' ' . get_lang('days_word') : $days . ' ' . get_lang('day_word');
+$hours = $hours != 1 ? $hours . ' ' . get_lang('hours_word') : $hours . ' ' . get_lang('hour_word');
+$minutes = $minutes != 1 ? $minutes . ' ' . get_lang('minutes_word') : $minutes . ' ' . get_lang('minute_word');
+$seconds = $seconds != 1 ? $seconds . ' ' . get_lang('seconds_word') : $seconds . ' ' . get_lang('second_word');
 if ($days == 0) {
 	$days = "";
 }

+ 2 - 2
protocol/TeamSpeak3/Node/Channel.php

@@ -57,7 +57,7 @@ class TeamSpeak3_Node_Channel extends TeamSpeak3_Node_Abstract
    * Returns an array filled with TeamSpeak3_Node_Channel objects.
    *
    * @param  array $filter
-   * @return array
+   * @return array|TeamSpeak3_Node_Channel[]
    */
   public function subChannelList(array $filter = array())
   {
@@ -112,7 +112,7 @@ class TeamSpeak3_Node_Channel extends TeamSpeak3_Node_Abstract
    * Returns an array filled with TeamSpeak3_Node_Client objects.
    *
    * @param  array $filter
-   * @return array
+   * @return array|TeamSpeak3_Node_Client[]
    */
   public function clientList(array $filter = array())
   {

+ 1 - 1
protocol/TeamSpeak3/Node/Channelgroup.php

@@ -148,7 +148,7 @@ class TeamSpeak3_Node_Channelgroup extends TeamSpeak3_Node_Abstract
   /**
    * Returns a list of clients assigned to the server group specified.
    *
-   * @return array
+   * @return array|TeamSpeak3_Node_Client[]
    */
   public function clientList()
   {

+ 5 - 5
protocol/TeamSpeak3/Node/Server.php

@@ -94,7 +94,7 @@ class TeamSpeak3_Node_Server extends TeamSpeak3_Node_Abstract
    * Returns an array filled with TeamSpeak3_Node_Channel objects.
    *
    * @param  array $filter
-   * @return array
+   * @return array|TeamSpeak3_Node_Channel[]
    */
   public function channelList(array $filter = array())
   {
@@ -625,7 +625,7 @@ class TeamSpeak3_Node_Server extends TeamSpeak3_Node_Abstract
    * Returns an array filled with TeamSpeak3_Node_Client objects.
    *
    * @param  array $filter
-   * @return array
+   * @return array|TeamSpeak3_Node_Client[]
    */
   public function clientList(array $filter = array())
   {
@@ -1023,7 +1023,7 @@ class TeamSpeak3_Node_Server extends TeamSpeak3_Node_Abstract
    * Returns a list of server groups available.
    *
    * @param  filter $filter
-   * @return array
+   * @return array|TeamSpeak3_Node_Servergroup[]
    */
   public function serverGroupList(array $filter = array())
   {
@@ -1353,7 +1353,7 @@ class TeamSpeak3_Node_Server extends TeamSpeak3_Node_Abstract
    * Returns a list of channel groups available.
    *
    * @param  array $filter
-   * @return array
+   * @return array|TeamSpeak3_Node_Channelgroup[]
    */
   public function channelGroupList(array $filter = array())
   {
@@ -2413,7 +2413,7 @@ class TeamSpeak3_Node_Server extends TeamSpeak3_Node_Abstract
    * @param  TeamSpeak3_Node_Abstract $b
    * @return integer
    */
-  protected static function sortGroupList(TeamSpeak3_Node_Abstract $a, TeamSpeak3_Node_Abstract $b)
+  public static function sortGroupList(TeamSpeak3_Node_Abstract $a, TeamSpeak3_Node_Abstract $b)
   {
     if(get_class($a) != get_class($b))
     {

+ 1 - 1
protocol/TeamSpeak3/Node/Servergroup.php

@@ -150,7 +150,7 @@ class TeamSpeak3_Node_Servergroup extends TeamSpeak3_Node_Abstract
   /**
    * Returns a list of clients assigned to the server group specified.
    *
-   * @return array
+   * @return array|TeamSpeak3_Node_Client[]
    */
   public function clientList()
   {

+ 19 - 1
protocol/TeamSpeak3/Viewer/Html.php

@@ -548,7 +548,25 @@ class TeamSpeak3_Viewer_Html implements TeamSpeak3_Viewer_Interface
       }
     }
 
-    foreach($this->currObj->memberOf() as $group)
+    // Get current groups the client is a member of.
+    // Shift off first group (channel group), leaving only server groups.
+    $groups = $this->currObj->memberOf();
+    $clientGroups = [$groups[0]];
+    unset($groups[0]);
+
+    // Create temp assoc array to use in custom uasort function.
+    $sgroups = [];
+    foreach($groups as $group) {
+      $sgroups[$group['sgid']] = $group;
+    }
+    // Use same server group sort function from TeamSpeak3_Node_Server class.
+    uasort($sgroups, array(get_class($this->currObj->getParent()), "sortGroupList"));
+
+    // Append first group (channel group), convert to non-assoc array.
+    $clientGroups = array_merge($clientGroups, array_values($sgroups));
+    unset($sgroups); // Clean-up temp sorting array.
+
+    foreach($clientGroups as $group)
     {
       if(!$group["iconid"]) continue;
 

+ 1 - 1
protocol/lgsl/lgsl_protocol.php

@@ -313,7 +313,7 @@ if (!function_exists('lgsl_version')) { // START OF DOUBLE LOAD PROTECTION
 	function lgsl_software_link($type, $ip, $c_port, $q_port, $s_port)
 	{
 		$lgsl_software_link = array(
-		"7dtd"			=> "steam://connect/{IP}:{S_PORT}",
+		"7dtd"			=> "steam://connect/{IP}:{Q_PORT}",
 		"aarmy"			=> "qtracker://{IP}:{S_PORT}?game=ArmyOperations&action=show",
 		"aarmy3"		=> "qtracker://{IP}:{S_PORT}?game=AmericasArmy3&action=show",
 		"aliensvspredator"	=> "steam://connect/{IP}:{Q_PORT}",