- added new strings

glest · Jan 27, 2014 · 72f44c6 · 72f44c6
1 parent 3611cad
commit 72f44c6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 96 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,103 +5,22 @@ PROJECT( MegaGlest )
 
 # Requires an install prefix for the items below to work
 IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
-	#MESSAGE(STATUS "Looking for [${PROJECT_SOURCE_DIR}/../glest_game/]")
         MESSAGE(STATUS "**Data package INSTALL triggered.")
 
-	IF(NOT MEGAGLEST_DATA_INSTALL_PATH)
-		SET(MEGAGLEST_DATA_INSTALL_PATH "share/megaglest/" CACHE STRING "The installation path for data files (this is appended to the CMAKE_INSTALL_PREFIX)")
-	ENDIF()
+        IF(NOT MEGAGLEST_DATA_INSTALL_PATH)
+	        SET(MEGAGLEST_DATA_INSTALL_PATH "share/megaglest/" CACHE STRING "The installation path for data files (this is appended to the CMAKE_INSTALL_PREFIX)")
+        ENDIF()
+
+        # Installation of the data
+        install(
+          DIRECTORY "${PROJECT_SOURCE_DIR}/data" 
+	            "${PROJECT_SOURCE_DIR}/docs" 
+	            "${PROJECT_SOURCE_DIR}/maps"
+	            "${PROJECT_SOURCE_DIR}/scenarios"
+	            "${PROJECT_SOURCE_DIR}/techs"
+	            "${PROJECT_SOURCE_DIR}/tilesets"
+	            "${PROJECT_SOURCE_DIR}/tutorials"
+          DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}
+          OPTIONAL REGEX "/.git" EXCLUDE)
 
-	# Check if we are running from a GIT folder structure or tarballs
-	#IF(EXISTS "${PROJECT_SOURCE_DIR}/../glest_game/")
-	#	MESSAGE(STATUS "**Data package detected GIT folder structure.")
-
-		# rename the ini for installation
-		#IF(WIN32)
-		#	INSTALL(FILES 
-		#	  "${PROJECT_SOURCE_DIR}/glest.ini"
-		#	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
-		#ELSE()
-		#	INSTALL(FILES 
-		#	  "${PROJECT_SOURCE_DIR}/../../mk/linux/glest.ini"
-		#	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
-		#ENDIF()
-
-		# Installation of the program config and image files
-		#INSTALL(FILES 
-		#  "${PROJECT_SOURCE_DIR}/../../mk/linux/glestkeys.ini"
-		#  "${PROJECT_SOURCE_DIR}/../../mk/linux/megaglest.bmp"
-		#  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
-
-		# Installation of data files from outside normal data folder
-		#INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/../../source/masterserver/flags" 
-		#  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}data/core/misc_textures
-		#  OPTIONAL REGEX "/.git" EXCLUDE)
-
-		# Installation of the data
-		install(
-		  DIRECTORY "${PROJECT_SOURCE_DIR}/data" 
-			    "${PROJECT_SOURCE_DIR}/docs" 
-			    "${PROJECT_SOURCE_DIR}/maps"
-			    "${PROJECT_SOURCE_DIR}/scenarios"
-			    "${PROJECT_SOURCE_DIR}/techs"
-			    "${PROJECT_SOURCE_DIR}/tilesets"
-			    "${PROJECT_SOURCE_DIR}/tutorials"
-		  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}
-		  OPTIONAL REGEX "/.git" EXCLUDE)
-
-	#ELSE()
-	#	MESSAGE(STATUS "**Data package detected stand alone data folder structure, prefix [${CMAKE_INSTALL_PREFIX}] bindir [${PROJECT_SOURCE_DIR}].")
-
-	#	IF(NOT MEGAGLEST_BIN_INSTALL_PATH)
-	#		SET(MEGAGLEST_BIN_INSTALL_PATH "bin/" CACHE STRING "The installation path for binaries (this is appended to the CMAKE_INSTALL_PREFIX)")
-	#	ENDIF()
-	#	IF(NOT MEGAGLEST_DATA_INSTALL_PATH)
-	#		SET(MEGAGLEST_DATA_INSTALL_PATH "share/megaglest/" CACHE STRING "The installation path for data files (this is appended to the CMAKE_INSTALL_PREFIX)")
-	#	ENDIF()
-#		IF(NOT MEGAGLEST_DESKTOP_INSTALL_PATH)
-#                	SET(MEGAGLEST_DESKTOP_INSTALL_PATH "share/applications/" CACHE STRING "The installation path for desktop files (this is appended to the CMAKE_INSTALL_PREFIX)")
-		#ENDIF()
-	#	IF(NOT MEGAGLEST_ICON_INSTALL_PATH)
-        #        	SET(MEGAGLEST_ICON_INSTALL_PATH "share/pixmaps/" CACHE STRING "The installation path for icon files (this is appended to the CMAKE_INSTALL_PREFIX)")
-	#	ENDIF()
-	#	IF(NOT CUSTOM_DATA_INSTALL_PATH)
-	#		SET(CUSTOM_DATA_INSTALL_PATH "'\\\"${CMAKE_INSTALL_PREFIX}/${MEGAGLEST_DATA_INSTALL_PATH}\\\"'" CACHE STRING "The FULL installation path for data files (this is build automatically by combining CMAKE_INSTALL_PREFIX and MEGAGLEST_DATA_INSTALL_PATH)")
-	#	ENDIF()
-
-	#	MESSAGE(STATUS "*NOTE: Custom Data Install Path is [${MEGAGLEST_DATA_INSTALL_PATH}]")
-
-		# rename the ini for installation
-	#	IF(WIN32)
-	#		INSTALL(FILES 
-	#		  "${PROJECT_SOURCE_DIR}/glest_windows.ini"
-	#		  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}
-	#		  RENAME "glest.ini")
-	#	ELSE()
-			#install(CODE "EXECUTE_PROCESS(COMMAND \"cmake\" \"-E\" \"copy\" \"${PROJECT_SOURCE_DIR}/glest_linux.ini\" \"${MEGAGLEST_DATA_INSTALL_PATH}/glest.ini\")")
-	#		INSTALL(FILES 
-	#		  "${PROJECT_SOURCE_DIR}/glest_linux.ini"
-	#		  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}
-	#		  RENAME "glest.ini")
-	#	ENDIF()
-
-		# Installation of the program config and image files
-	#	INSTALL(FILES 
-	#	  "${PROJECT_SOURCE_DIR}/glestkeys.ini"
-	#	  "${PROJECT_SOURCE_DIR}/megaglest.bmp"
-	#	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
-
-		# Installation of the data
-	#	install(
-	#	  DIRECTORY "${PROJECT_SOURCE_DIR}/data" 
-	#		    "${PROJECT_SOURCE_DIR}/docs" 
-	#		    "${PROJECT_SOURCE_DIR}/maps"
-	#		    "${PROJECT_SOURCE_DIR}/scenarios"
-	#		    "${PROJECT_SOURCE_DIR}/techs"
-	#		    "${PROJECT_SOURCE_DIR}/tilesets"
-	#		    "${PROJECT_SOURCE_DIR}/tutorials"
-	#	  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}
-	#	  OPTIONAL REGEX "/.git" EXCLUDE)
-
-	#ENDIF()
 ENDIF()
diff --git a/data/lang/english.lng b/data/lang/english.lng
@@ -25,6 +25,8 @@ AllowNativeLanguageTechtree=Allow Translated Techtrees
 AllowObservers=Allow Observers
 AllowPlayerJoinTeam=Allow player [%s] to join your team (changing from team# %d to team# %d)?
 AllowInGameJoinPlayer=Players can join in game
+AllowTeamUnitSharing=Shared Team Units
+AllowTeamResourceSharing=Shared Team Resources
 AmbientVolume=Ambient Volume:
 Amount=Amount
 AnimatedTilesetObjects=Animated tileset objects