Cosmetics

[CI skip]
2015-06-10 12:02:45 +02:00 · 2015-06-10 12:02:45 +02:00 · fecf89f295
parent 22e02cbf95
commit fecf89f295
15 changed files with 17 additions and 17 deletions
--- a/data/glest_game
+++ b/data/glest_game
@ -1 +1 @@
-Subproject commit 38a8f392a49f1d3f2cfe6cec4076db2c6d39fb3b
+Subproject commit 3e9ecd1452f232ead06b7b157c6fa3afc6ded3a4
--- 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"] = {
--- a/mk/linux/start_megaglest_gameserver
+++ b/mk/linux/start_megaglest_gameserver
@ -25,7 +25,7 @@
 #
 # ----------------------------------------------------------------------------
 # Written by Tom Reynolds <tomreyn[at]megaglest.org>
-# 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

--- a/mk/macosx/start_headless_gameserver.sh
+++ b/mk/macosx/start_headless_gameserver.sh
@ -25,7 +25,7 @@
 #
 # ----------------------------------------------------------------------------
 # Written by Tom Reynolds <tomreyn[at]megaglest.org>
-# 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

--- 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")

--- 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)

--- 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")

--- a/source/masterserver
+++ b/source/masterserver
@ -1 +1 @@
-Subproject commit 615d10c32e53dda1b4a1bb4ac0fcdcc125641226
+Subproject commit f6e36bb1821041254bf3d8d887e8ef6eb5391192
--- 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
--- 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_
--- 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"
--- 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"
--- 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);
                                //}
--- 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()

--- a/source/tools/support/linux/system_report
+++ b/source/tools/support/linux/system_report
@ -8,7 +8,7 @@
 # -----------------------------------------------------------------------------
 #
 # Written by Tom Reynolds <tomreyn[at]megaglest.org>
-# 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
 #
 # -----------------------------------------------------------------------------
 #