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

Author: myk002

Makefile.am

@@ -80,7 +80,7 @@ openxcom_CXXFLAGS = \
 	$(GL_CFLAGS) \
 	-DDATADIR=\"$(pkgdatadir)/\"
 openxcom_SOURCES = \
-	src/aresame.h \
+	src/fmath.h \
 	src/Basescape/BaseInfoState.cpp \
 	src/Basescape/BaseInfoState.h \
 	src/Basescape/BasescapeState.cpp \

bin/data/Language/en-GB.yml

@@ -1347,5 +1347,7 @@ en-GB:
   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"
-  STR_SELL_PRODUCTION: "SELL PRODUCTION"
+  STR_SELL_PRODUCTION: "SELL"
   STR_BOTH_HANDS_MUST_BE_EMPTY: "Both hands must be empty!"
+  STR_MOUSEWHEEL_SPEED: "Mouse wheel scroll speed"
+  STR_MOUSEWHEEL_SPEED_DESC: "Adjusts the number of lines scrolled in lists with each increment of the mouse wheel."

bin/data/Language/en-US.yml

@@ -1349,3 +1349,5 @@ en-US:
   STR_NO_AUDIO_HARDWARE_DETECTED: "No audio hardware detected"
   STR_SELL_PRODUCTION: "SELL"
   STR_BOTH_HANDS_MUST_BE_EMPTY: "Both hands must be empty!"
+  STR_MOUSEWHEEL_SPEED: "Mouse wheel scroll speed"
+  STR_MOUSEWHEEL_SPEED_DESC: "Adjusts the number of lines scrolled in lists with each increment of the mouse wheel."