Merge remote-tracking branch 'upstream/master' into loadout_copy_paste

Author: myk002

Makefile.am

@@ -26,6 +26,14 @@ desktop_DATA = res/linux/openxcom.desktop
 
 pkgdata_DATA = bin/data/README.txt
 
+mapsdir = $(pkgdatadir)/data/MAPS/
+maps_DATA = \
+	bin/data/MAPS/*
+
+routesdir = $(pkgdatadir)/data/ROUTES/
+routes_DATA = \
+	bin/data/ROUTES/*
+
 weaponsdir = $(pkgdatadir)/data/Resources/Weapons/
 weapons_DATA = \
 	bin/data/Resources/Weapons/*
@@ -460,6 +468,8 @@ openxcom_SOURCES = \
 	src/Menu/OptionsVideoState.h \
 	src/Menu/OptionsAudioState.cpp \
 	src/Menu/OptionsAudioState.h \
+	src/Menu/OptionsNoAudioState.cpp \
+	src/Menu/OptionsNoAudioState.h \
 	src/Menu/OptionsGeoscapeState.cpp \
 	src/Menu/OptionsGeoscapeState.h \
 	src/Menu/OptionsModsState.cpp \
@@ -670,6 +680,8 @@ EXTRA_DIST = \
 	res/windows/openxcom.ico \
 	$(doc_DATA) \
 	$(pkgdata_DATA) \
+	$(maps_DATA) \
+	$(routes_DATA) \
 	$(language_DATA) \
 	$(name_DATA) \
 	$(weapons_DATA) \

bin/data/Language/Font.dat

@@ -1,5 +1,5 @@
 chars: >
-  !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖŐŰÙÚÛÜÝÞŸßàáâãäåæçèéêëìíîïðñòóôõöőűùúûüýþÿФИСВУАПРШОЛДЬТЩЗЙКЫЕГМЦЧНЯфисвуапршолдьтщзйкыегмцчнябБжЖхХъЪэЭюЮĆĘ깣泥ŚśźżŻŹŃńĂăȘȚșțČĎĚŇŘŠŤŮŽčďěňřšťůžЄєŒœіІїЇøØĞŞİğşıΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωΆΈΉΊΌΎΏάέήίόύώςΐϊ
+  !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖŐŰÙÚÛÜÝÞŸßàáâãäåæçèéêëìíîïðñòóôõöőűùúûüýþÿФИСВУАПРШОЛДЬТЩЗЙКЫЕГМЦЧНЯфисвуапршолдьтщзйкыегмцчнябБжЖхХъЪэЭюЮĆĘ깣泥ŚśźżŻŹŃńĂăȘȚșțČĎĚŇŘŠŤŮŽčďěňřšťůžЄєŒœіІїЇøØĞŞİğşıΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωΆΈΉΊΌΎΏάέήίόύώςΐϊĹĽŔĺľŕ
 fonts:
   - id: FONT_BIG
     image: FontBig.png

bin/data/Language/FontBig.png

@@ -30,7 +30,7 @@ en-GB:
   STR_SILACOID_AUTOPSY_UFOPEDIA: "The core of the creature is extremely hot, and seems to be the basis for a digestive system.  Its unique muscle system has tremendous power and speed. Its rock-like skin is not harmed by fire or incendiary ammunition."
   STR_CHRYSSALID_UFOPEDIA: "The crab-like claws of this creature are a powerful weapon in close combat. The high metabolism and strength of this creature give it speed and dexterity. Instead of killing its victim it impregnates it with an egg and injects a venom which turns it into a walking zombie.  A new Chryssalid will burst from the victim shortly after impregnation.  Chryssalids are associated with the Snakeman race."
   STR_CHRYSSALID_AUTOPSY: "Chryssalid autopsy"
-  STR_CHRYSSALID_AUTOPSY_UFOPEDIA: "The exo-skeleton of this creature is extremely tough, but surprisingly vulnerable to explosive ammunition.  The brain is well developed, and its cell growth rate very fast.  The creature carries twenty eggs which are laid inside other organisms.  This creature is a very effective terror weapon."
+  STR_CHRYSSALID_AUTOPSY_UFOPEDIA: "The exoskeleton of this creature is extremely tough, but surprisingly vulnerable to explosive ammunition.  The brain is well developed, and its cell growth rate very fast.  The creature carries twenty eggs which are laid inside other organisms.  This creature is a very effective terror weapon."
   STR_FLOATER_UFOPEDIA: "The Floaters are primarily soldiers and terror agents. They are naturally predatory beasts, genetically engineered and cybernetically enhanced to make formidable warriors. The lower half of the body and most internal organs are surgically removed, and a life support system is installed. This implant contains an anti-gravity unit which enables the creature to float, albeit unsteadily, through the air."
   STR_FLOATER_AUTOPSY: "Floater autopsy"
   STR_FLOATER_AUTOPSY_UFOPEDIA: "The creature has been drastically altered by surgery.  The device which seems to form the core of the body is a life support system, taking over the function of heart, lungs and digestive system.  This would enable the creature to survive in extremely hostile environments.  The brain is smaller than ours, but the sensory organs are well developed."
@@ -1164,8 +1164,8 @@ en-GB:
   STR_SKIPNEXTTURNSCREEN: "Skip \"Next Turn\" screen"
   STR_SKIPNEXTTURNSCREEN_DESC: "\"Next Turn\" screens during battle are advanced automatically after a short delay."
   STR_NOT_ENOUGH_SPACE: "Not Enough Space!"
-  STR_WEAPONSELFDESTRUCTION: "Alien weapon self destruction"
-  STR_WEAPONSELFDESTRUCTION_DESC: "Weapons carried by aliens will self destruct if their owner is killed, like in XCOM 2012."
+  STR_WEAPONSELFDESTRUCTION: "Alien weapon self-destruction"
+  STR_WEAPONSELFDESTRUCTION_DESC: "Weapons carried by aliens will self-destruct if their owner is killed, like in XCOM 2012."
   STR_SPENDRESEARCHEDITEMS: "Spend researched items"
   STR_SPENDRESEARCHEDITEMS_DESC: "Researched items are disassembled and removed from your stores, like in XCOM 2012. After \"researching\" living aliens, the body will be returned to the base stores."
   STR_SAVE_VOXEL_VIEW: "Save First-Person Screenshot"
@@ -1228,7 +1228,6 @@ en-GB:
   STR_LETTERBOXED: "Letterboxed"
   STR_LETTERBOXED_DESC: "Letterboxes the display to maintain the original aspect ratio."
   STR_RESIZABLE: "Resizable"
-  STR_RESIZABLE_DESC: "Makes the game window resizable."
   STR_LOCK_MOUSE: "Lock Mouse"
   STR_LOCK_MOUSE_DESC: "Keeps the mouse cursor from leaving the game window. Not recommended for multitasking."
   STR_MUSIC_VOLUME: "Music Volume"
@@ -1281,7 +1280,7 @@ en-GB:
   STR_TOOLTIPS: "Tooltips"
   STR_TOOLTIPS_DESC: "Displays tooltips for the Battlescape buttons."
   STR_DEATH_NOTIFICATIONS: "Death Notifications"
-  STR_DEATH_NOTIFICATIONS_DESC: "Display a notification every time one of your soldiers dies."
+  STR_DEATH_NOTIFICATIONS_DESC: "Pop up a notification detailing who was killed whenever a soldier dies."
   STR_SHOW_FUNDS: "Show Funds"
   STR_SHOW_FUNDS_DESC: "Shows your current funds next to the Geoscape clock."
   STR_MISSION_GENERATOR: "MISSION GENERATOR"
@@ -1326,7 +1325,7 @@ en-GB:
   STR_FULL_DISPLAY: "Full Display"
   STR_FPS_LIMIT: "FPS limit"
   STR_FPS_LIMIT_DESC: "Limits the number of screen updates per second, 0 for no limit. If OpenGL rendering is enabled, the game uses Vsync instead."
-  STR_NOALIENPANICMESSAGES: "Supress panic messages for aliens"
+  STR_NOALIENPANICMESSAGES: "Suppress panic messages for aliens"
   STR_NOALIENPANICMESSAGES_DESC: "Don't show panic messages for aliens unless they are visible to the player."
   STR_ALIENBLEEDING: "Alien bleeding"
   STR_ALIENBLEEDING_DESC: "Allows fatal wounds to be inflicted on most aliens."
@@ -1347,3 +1346,7 @@ en-GB:
   STR_PREFERRED_SFX_FORMAT_DESC: "Chooses the preferred sound effects format to use when multiple ones are available."
   STR_PREFERRED_FORMAT_AUTO: "Auto"
   STR_CURRENT_FORMAT: "Current: {0}"
+  STR_MELEE_ACCURACY: "MELEE ACCURACY"
+  STR_FORCE_FIRE: "Override Line of Fire"
+  STR_FORCE_FIRE_DESC: "Enables forcing your soldiers to take a shot when holding CTRL, regardless of line of fire rules."
+  STR_NO_AUDIO_HARDWARE_DETECTED: "No audio hardware detected"

bin/data/Language/FontSmall.png

@@ -30,7 +30,7 @@ en-US:
   STR_SILACOID_AUTOPSY_UFOPEDIA: "The core of the creature is extremely hot, and seems to be the basis for a digestive system.  Its unique muscle system has tremendous power and speed.  Its rock-like skin is not harmed by fire or incendiary ammunition."
   STR_CHRYSSALID_UFOPEDIA: "The crab-like claws of this creature are a powerful weapon in close combat.  The high metabolism and strength of this creature give it speed and dexterity.  Instead of killing its victim it impregnates it with an egg and injects a venom which turns it into a walking zombie.  A new Chryssalid will burst from the victim shortly after impregnation.  Chryssalids are associated with the Snakeman race."
   STR_CHRYSSALID_AUTOPSY: "Chryssalid autopsy"
-  STR_CHRYSSALID_AUTOPSY_UFOPEDIA: "The exo-skeleton of this creature is extremely tough, but surprisingly vulnerable to explosive ammunition.  The brain is well developed, and its cell growth rate very fast.  The creature carries twenty eggs which are laid inside other organisms.  This creature is a very effective terror weapon."
+  STR_CHRYSSALID_AUTOPSY_UFOPEDIA: "The exoskeleton of this creature is extremely tough, but surprisingly vulnerable to explosive ammunition.  The brain is well developed, and its cell growth rate very fast.  The creature carries twenty eggs which are laid inside other organisms.  This creature is a very effective terror weapon."
   STR_FLOATER_UFOPEDIA: "The Floaters are primarily soldiers and terror agents. They are naturally predatory beasts, genetically engineered and cybernetically enhanced to make formidable warriors.  The lower half of the body and most internal organs are surgically removed, and a life support system is installed.  This implant contains an anti-gravity unit which enables the creature to float, albeit unsteadily, through the air."
   STR_FLOATER_AUTOPSY: "Floater autopsy"
   STR_FLOATER_AUTOPSY_UFOPEDIA: "The creature has been drastically altered by surgery.  The device which seems to form the core of the body is a life support system, taking over the function of heart, lungs and digestive system.  This would enable the creature to survive in extremely hostile environments.  The brain is smaller than ours, but the sensory organs are well developed."
@@ -1164,8 +1164,8 @@ en-US:
   STR_SKIPNEXTTURNSCREEN: "Skip \"Next Turn\" screen"
   STR_SKIPNEXTTURNSCREEN_DESC: "\"Next Turn\" screens during battle are advanced automatically after a short delay."
   STR_NOT_ENOUGH_SPACE: "Not Enough Space!"
-  STR_WEAPONSELFDESTRUCTION: "Alien weapon self destruction"
-  STR_WEAPONSELFDESTRUCTION_DESC: "Weapons carried by aliens will self destruct if their owner is killed, like in XCOM 2012."
+  STR_WEAPONSELFDESTRUCTION: "Alien weapon self-destruction"
+  STR_WEAPONSELFDESTRUCTION_DESC: "Weapons carried by aliens will self-destruct if their owner is killed, like in XCOM 2012."
   STR_SPENDRESEARCHEDITEMS: "Spend researched items"
   STR_SPENDRESEARCHEDITEMS_DESC: "Researched items are disassembled and removed from your stores, like in XCOM 2012. After \"researching\" living aliens, the body will be returned to the base stores."
   STR_SAVE_VOXEL_VIEW: "Save First-Person Screenshot"
@@ -1228,7 +1228,6 @@ en-US:
   STR_LETTERBOXED: "Letterboxed"
   STR_LETTERBOXED_DESC: "Letterboxes the display to maintain the original aspect ratio."
   STR_RESIZABLE: "Resizable"
-  STR_RESIZABLE_DESC: "Makes the game window resizable."
   STR_LOCK_MOUSE: "Lock Mouse"
   STR_LOCK_MOUSE_DESC: "Keeps the mouse cursor from leaving the game window. Not recommended for multitasking."
   STR_MUSIC_VOLUME: "Music Volume"
@@ -1281,7 +1280,7 @@ en-US:
   STR_TOOLTIPS: "Tooltips"
   STR_TOOLTIPS_DESC: "Displays tooltips for the Battlescape buttons."
   STR_DEATH_NOTIFICATIONS: "Death Notifications"
-  STR_DEATH_NOTIFICATIONS_DESC: "Display a notification every time one of your soldiers dies."
+  STR_DEATH_NOTIFICATIONS_DESC: "Pop up a notification detailing who was killed whenever a soldier dies."
   STR_SHOW_FUNDS: "Show Funds"
   STR_SHOW_FUNDS_DESC: "Shows your current funds next to the Geoscape clock."
   STR_MISSION_GENERATOR: "MISSION GENERATOR"
@@ -1326,7 +1325,7 @@ en-US:
   STR_FULL_DISPLAY: "Full Display"
   STR_FPS_LIMIT: "FPS limit"
   STR_FPS_LIMIT_DESC: "Limits the number of screen updates per second, 0 for no limit. If OpenGL rendering is enabled, the game uses Vsync instead."
-  STR_NOALIENPANICMESSAGES: "Supress panic messages for aliens"
+  STR_NOALIENPANICMESSAGES: "Suppress panic messages for aliens"
   STR_NOALIENPANICMESSAGES_DESC: "Don't show panic messages for aliens unless they are visible to the player."
   STR_ALIENBLEEDING: "Alien bleeding"
   STR_ALIENBLEEDING_DESC: "Allows fatal wounds to be inflicted on most aliens."
@@ -1347,3 +1346,7 @@ en-US:
   STR_PREFERRED_SFX_FORMAT_DESC: "Chooses the preferred sound effects format to use when multiple ones are available."
   STR_PREFERRED_FORMAT_AUTO: "Auto"
   STR_CURRENT_FORMAT: "Current: {0}"
+  STR_MELEE_ACCURACY: "MELEE ACCURACY"
+  STR_FORCE_FIRE: "Override Line of Fire"
+  STR_FORCE_FIRE_DESC: "Enables forcing your soldiers to take a shot when holding CTRL, regardless of line of fire rules."
+  STR_NO_AUDIO_HARDWARE_DETECTED: "No audio hardware detected"

bin/data/Language/en-GB.yml

@@ -92,6 +92,7 @@
 ;Languages
 
 	!insertmacro MUI_LANGUAGE "English" ;first language is the default language
+	!insertmacro MUI_LANGUAGE "French"
 	!insertmacro MUI_LANGUAGE "German"
 	!insertmacro MUI_LANGUAGE "Russian"
 	!insertmacro MUI_LANGUAGE "PortugueseBR"