Merge remote-tracking branch 'upstream/develop' into develop

CMakeLists.txt

@@ -847,10 +847,10 @@ if(WIN32)
 	endif()
 	# set the install/unistall icon used for the installer itself
 	# There is a bug in NSI that does not handle full unix paths properly.
-	set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/client\\\\vcmi.ico")
-	set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/client\\\\vcmi.ico")
+	set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/clientapp/icons\\\\vcmi.ico")
+	set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/clientapp/icons\\\\vcmi.ico")
 	# set the package header icon for MUI
-	set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/client\\\\vcmi.ico")
+	set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/clientapp/icons\\\\vcmi.ico")
 
 	set(CPACK_NSIS_MENU_LINKS "http://vcmi.eu/" "VCMI Web Site")
 

clientapp/CMakeLists.txt

@@ -119,7 +119,6 @@ endif()
 
 #install icons and desktop file on Linux
 if(NOT WIN32 AND NOT APPLE AND NOT ANDROID)
-	#FIXME: move to client makefile?
 	foreach(iconSize 16 22 32 48 64 128 256 512 1024 2048)
 		install(FILES "icons/vcmiclient.${iconSize}x${iconSize}.png"
 			DESTINATION "share/icons/hicolor/${iconSize}x${iconSize}/apps"

clientapp/VCMI_client.rc

@@ -1 +1 @@
-IDI_ICON1   ICON  "vcmi.ico"
+IDI_ICON1   ICON  "icons/vcmi.ico"

docs/modders/Translations.md

@@ -82,6 +82,7 @@ VCMI Launcher and Map Editor use translation system provided by Qt framework so
 
 - Install Qt Linguist. You can find find standalone version here: https://download.qt.io/linguist_releases/
 - Open `<VCMI Sources>/launcher/translation/` directory, copy `english.ts` file and rename it to your language
+- Open `<VCMI Sources>/launcher/CMakeLists.txt` file with a text editor. In there you need to find list of existing translation files and add new file to the list.
 - Launch Qt Linguist, select Open and navigate to your copied file
 - Select any untranslated string, enter translation in field below, and click "Done and Next" (Ctrl+Return) to navigate to next untranslated string
 - Once translation has been finished, save resulting file.

launcher/CMakeLists.txt

@@ -83,6 +83,7 @@ set(launcher_TS
 	"${translationsDir}/portuguese.ts"
 	"${translationsDir}/russian.ts"
 	"${translationsDir}/spanish.ts"
+	"${translationsDir}/swedish.ts"
 	"${translationsDir}/ukrainian.ts"
 	"${translationsDir}/vietnamese.ts"
 )