From fecf89f2950926d9ce6c0d5ef07bacbed3e361d0 Mon Sep 17 00:00:00 2001 From: Tom Reynolds Date: Wed, 10 Jun 2015 12:02:45 +0200 Subject: [PATCH] Cosmetics [CI skip] --- data/glest_game | 2 +- .../megaglest-installer/scripts/app_localization.lua | 2 +- mk/linux/start_megaglest_gameserver | 2 +- mk/macosx/start_headless_gameserver.sh | 2 +- source/g3d_viewer/CMakeLists.txt | 2 +- source/glest_game/CMakeLists.txt | 2 +- source/glest_map_editor/CMakeLists.txt | 2 +- source/masterserver | 2 +- source/shared_lib/include/graphics/FileReader.h | 2 +- source/shared_lib/include/graphics/buffer.h | 2 +- source/shared_lib/sources/graphics/FileReader.cpp | 2 +- source/shared_lib/sources/graphics/buffer.cpp | 2 +- source/shared_lib/sources/platform/posix/ircclient.cpp | 2 +- source/tests/CMakeLists.txt | 6 +++--- source/tools/support/linux/system_report | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data/glest_game b/data/glest_game index 38a8f392..3e9ecd14 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 38a8f392a49f1d3f2cfe6cec4076db2c6d39fb3b +Subproject commit 3e9ecd1452f232ead06b7b157c6fa3afc6ded3a4 diff --git a/mk/linux/mojosetup/megaglest-installer/scripts/app_localization.lua b/mk/linux/mojosetup/megaglest-installer/scripts/app_localization.lua index 835f9673..666462f5 100644 --- a/mk/linux/mojosetup/megaglest-installer/scripts/app_localization.lua +++ b/mk/linux/mojosetup/megaglest-installer/scripts/app_localization.lua @@ -51,7 +51,7 @@ MojoSetup.applocalization = { de = "Es wurde eine frühere Installation von MegaGlest erkannt. Möchtest Du sie entfernen?", es = "We have detected a previous installation of MegaGlest, should we remove it?", pl = "Wykryto poprzednią instalację MegaGlest, usunąć ją?", - it = "E' stata trovata una versione meno recente di Megaglest, vuoi rimuoverla?", + it = "E' stata trovata una versione meno recente di MegaGlest, vuoi rimuoverla?", }; ["MegaGlest Visit Website Title"] = { diff --git a/mk/linux/start_megaglest_gameserver b/mk/linux/start_megaglest_gameserver index fb04d6f5..5305b34d 100755 --- a/mk/linux/start_megaglest_gameserver +++ b/mk/linux/start_megaglest_gameserver @@ -25,7 +25,7 @@ # # ---------------------------------------------------------------------------- # Written by Tom Reynolds -# Copyright (c) 2013 Tom Reynolds, The Megaglest Team, under GNU GPL v3.0+ +# Copyright (c) 2013 Tom Reynolds, The MegaGlest Team, under GNU GPL v3.0+ # ---------------------------------------------------------------------------- LANG=C diff --git a/mk/macosx/start_headless_gameserver.sh b/mk/macosx/start_headless_gameserver.sh index a101effa..01b5d5b3 100755 --- a/mk/macosx/start_headless_gameserver.sh +++ b/mk/macosx/start_headless_gameserver.sh @@ -25,7 +25,7 @@ # # ---------------------------------------------------------------------------- # Written by Tom Reynolds -# Copyright (c) 2013 Tom Reynolds, The Megaglest Team, under GNU GPL v3.0+ +# Copyright (c) 2013 Tom Reynolds, The MegaGlest Team, under GNU GPL v3.0+ # ---------------------------------------------------------------------------- LANG=C diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index 9e3cd5c1..cd8cb7cd 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -147,7 +147,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) SET(HELP2MAN_OUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/") ENDIF() - MESSAGE(STATUS "***Note: The final output path for Megaglest G3d Viewer will be [${HELP2MAN_OUT_PATH}]") + MESSAGE(STATUS "***Note: The final output path for MegaGlest G3d Viewer will be [${HELP2MAN_OUT_PATH}]") FIND_PROGRAM(HELP2MAN "help2man") diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index e9c526de..0682fd34 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -227,7 +227,7 @@ IF(BUILD_MEGAGLEST) ENDIF() ENDIF() - MESSAGE(STATUS "***Note: The final output path for Megaglest Game will be [${EXECUTABLE_OUTPUT_PATH}]") + MESSAGE(STATUS "***Note: The final output path for the MegaGlest engine will be [${EXECUTABLE_OUTPUT_PATH}]") SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt index 0afc54b9..8a5687e8 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/glest_map_editor/CMakeLists.txt @@ -131,7 +131,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) SET(HELP2MAN_OUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/") ENDIF() - MESSAGE(STATUS "***Note: The final output path for Megaglest Map Editor will be [${HELP2MAN_OUT_PATH}]") + MESSAGE(STATUS "***Note: The final output path for MegaGlest Map Editor will be [${HELP2MAN_OUT_PATH}]") FIND_PROGRAM(HELP2MAN "help2man") diff --git a/source/masterserver b/source/masterserver index 615d10c3..f6e36bb1 160000 --- a/source/masterserver +++ b/source/masterserver @@ -1 +1 @@ -Subproject commit 615d10c32e53dda1b4a1bb4ac0fcdcc125641226 +Subproject commit f6e36bb1821041254bf3d8d887e8ef6eb5391192 diff --git a/source/shared_lib/include/graphics/FileReader.h b/source/shared_lib/include/graphics/FileReader.h index 2b06d7ec..d2cd208f 100644 --- a/source/shared_lib/include/graphics/FileReader.h +++ b/source/shared_lib/include/graphics/FileReader.h @@ -2,7 +2,7 @@ // This file is part of MegaGlest Shared Library (www.megaglest.org) // // Copyright (C) 2012 Mark Vejvoda, Titus Tscharntke -// The Megaglest Team, under GNU GPL v3.0 +// The MegaGlest Team, under GNU GPL v3.0 // ============================================================== #ifndef FILE_READER_H diff --git a/source/shared_lib/include/graphics/buffer.h b/source/shared_lib/include/graphics/buffer.h index 519631c6..ee840785 100644 --- a/source/shared_lib/include/graphics/buffer.h +++ b/source/shared_lib/include/graphics/buffer.h @@ -2,7 +2,7 @@ // This file is part of MegaGlest Shared Library (www.megaglest.org) // // Copyright (C) 2012 Mark Vejvoda, Titus Tscharntke -// The Megaglest Team, under GNU GPL v3.0 +// The MegaGlest Team, under GNU GPL v3.0 // ============================================================== #ifndef _SHARED_GRAPHICS_BUFFER_H_ diff --git a/source/shared_lib/sources/graphics/FileReader.cpp b/source/shared_lib/sources/graphics/FileReader.cpp index a138578a..40d07351 100644 --- a/source/shared_lib/sources/graphics/FileReader.cpp +++ b/source/shared_lib/sources/graphics/FileReader.cpp @@ -2,7 +2,7 @@ // This file is part of MegaGlest Shared Library (www.megaglest.org) // // Copyright (C) 2012 Mark Vejvoda, Titus Tscharntke -// The Megaglest Team, under GNU GPL v3.0 +// The MegaGlest Team, under GNU GPL v3.0 // ============================================================== #include "FileReader.h" diff --git a/source/shared_lib/sources/graphics/buffer.cpp b/source/shared_lib/sources/graphics/buffer.cpp index 0f7623d7..632a8756 100644 --- a/source/shared_lib/sources/graphics/buffer.cpp +++ b/source/shared_lib/sources/graphics/buffer.cpp @@ -2,7 +2,7 @@ // This file is part of MegaGlest Shared Library (www.megaglest.org) // // Copyright (C) 2012 Mark Vejvoda, Titus Tscharntke -// The Megaglest Team, under GNU GPL v3.0 +// The MegaGlest Team, under GNU GPL v3.0 // ============================================================== #include "buffer.h" diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp index c3d3fc34..5a57167a 100644 --- a/source/shared_lib/sources/platform/posix/ircclient.cpp +++ b/source/shared_lib/sources/platform/posix/ircclient.cpp @@ -472,7 +472,7 @@ void event_numeric(irc_session_t * session, unsigned int event, const char * ori get_nickname(tokens[j].c_str(),realNick,127); if(SystemFlags::VERBOSE_MODE_ENABLED || IRCThread::debugEnabled) printf ("===> IRC: LIBIRC_RFC_RPL_NAMREPLY user joined channel realNick [%s] tokens[j] [%s]\n", realNick,tokens[j].c_str()); - // Only show Megaglest users in the user list + // Only show MegaGlest users in the user list //if(strncmp(&realNick[0],"MG_",3) == 0) { nickList.push_back(realNick); //} diff --git a/source/tests/CMakeLists.txt b/source/tests/CMakeLists.txt index 1cd843dd..e515c27a 100644 --- a/source/tests/CMakeLists.txt +++ b/source/tests/CMakeLists.txt @@ -152,7 +152,7 @@ IF(BUILD_MEGAGLEST_TESTS) MESSAGE(STATUS "EXTERNAL_LIBS = [${EXTERNAL_LIBS}]") - MESSAGE(STATUS "***Note: The final output path for Megaglest Game will be [${EXECUTABLE_OUTPUT_PATH}]") + MESSAGE(STATUS "***Note: The final output path for the MegaGlest engine will be [${EXECUTABLE_OUTPUT_PATH}]") SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) @@ -173,11 +173,11 @@ IF(BUILD_MEGAGLEST_TESTS) add_custom_command(TARGET ${TARGET_NAME} POST_BUILD COMMAND ${XVFB_EXEC} --auto-servernum --server-num=770 ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME} - COMMENT "***-- Found megaglest test runner: ${TARGET_NAME} about to run unit tests via xvfb...") + COMMENT "***-- Found MegaGlest test runner: ${TARGET_NAME} about to run unit tests via xvfb...") ELSE() add_custom_command(TARGET ${TARGET_NAME} POST_BUILD COMMAND ${EXECUTABLE_OUTPUT_PATH}${TARGET_NAME} - COMMENT "***-- Found megaglest test runner: ${TARGET_NAME} about to run unit tests...") + COMMENT "***-- Found MegaGlest test runner: ${TARGET_NAME} about to run unit tests...") ENDIF() ENDIF() diff --git a/source/tools/support/linux/system_report b/source/tools/support/linux/system_report index b8308297..78082387 100755 --- a/source/tools/support/linux/system_report +++ b/source/tools/support/linux/system_report @@ -8,7 +8,7 @@ # ----------------------------------------------------------------------------- # # Written by Tom Reynolds -# Copyright (c) 2012 Tom Reynolds, The Megaglest Team, under GNU GPL v3.0 +# Copyright (c) 2012 Tom Reynolds, The MegaGlest Team, under GNU GPL v3.0 # # ----------------------------------------------------------------------------- #