Skip to content

Commit c7ead5b

Browse files
committed
Merge branch 'master' into typofixes
Conflicts: bin/data/Language/en-GB.yml bin/data/Language/en-US.yml
2 parents c4f4b9b + 7b4f60f commit c7ead5b

272 files changed

Lines changed: 3085 additions & 1989 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile.am‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,8 @@ openxcom_SOURCES = \
426426
src/lodepng.cpp \
427427
src/lodepng.h \
428428
src/main.cpp \
429+
src/Menu/ConfirmLoadState.cpp \
430+
src/Menu/ConfirmLoadState.h \
429431
src/Menu/DeleteGameState.cpp \
430432
src/Menu/DeleteGameState.h \
431433
src/Menu/ErrorMessageState.cpp \

‎bin/data/Language/en-GB.yml‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ en-GB:
241241
STR_SELL_SACK: "Sell/Sack"
242242
STR_VALUE: "Value"
243243
STR_CRAFT_: "CRAFT> {ALT}{0}"
244+
STR_CRAFTNAME: "{0}-{1}"
244245
STR_UFO_CRASH_RECOVERY: "UFO CRASH RECOVERY"
245246
STR_UFO_CRASH_RECOVERY_BRIEFING: "Exercise caution - There may be operatives in the UFO or around the crash site. Mission will be successful when all enemy units have been eliminated or neutralised. Recovery of UFO remains, artefacts and alien corpses can then be initiated. To abort the mission return XCom operatives to transport vehicle and click on the 'Abort Mission' icon."
246247
STR_UFO_GROUND_ASSAULT: "UFO GROUND ASSAULT"
@@ -660,7 +661,7 @@ en-GB:
660661
STR_PSI_AMP_UFOPEDIA: "The Psi-amp can only be used by soldiers with psionic skill. During combat, click on the Psi-amp, select the type of attack, and select a target unit with the cursor. There are two types of psionic attack:{NEWLINE}PANIC UNIT> If the attack is successful it will reduce the target's morale and may cause it to panic.{NEWLINE}MIND CONTROL> If this is successful then you will gain immediate control of the enemy unit as if it was one of your own. It is more difficult to be successful with this type of attack."
661662
STR_STUN_ROD_UFOPEDIA: "This device can only be used in close combat, but will stun a living organism without killing it by using electric shocks."
662663
STR_MIND_PROBE_UFOPEDIA: "The mind probe is an alien communication device which is used to take information directly from brain waves. XCom units can use this device in combat to display an alien's characteristics. Click on the mind probe and the 'use' option. Then click on an alien with the cursor."
663-
STR_PLASMA_PISTOL_UFOPEDIA: "Plasma pistols are a lethal alien weapon based on accelerating particles from within a minute anti-gravity field."
664+
STR_PLASMA_PISTOL_UFOPEDIA: "Plasma Pistols are a lethal alien weapon based on accelerating particles from within a minute anti-gravity field."
664665
STR_PLASMA_RIFLE_UFOPEDIA: "This is a devastatingly powerful weapon based on accelerating particles from within a minute anti-gravity field."
665666
STR_BLASTER_LAUNCHER_UFOPEDIA: "This is an alien guided missile launcher which fires powerful 'blaster bombs'. When you click to fire the weapon it will generate 'way points' for the blaster bomb to follow. When you have positioned enough way points click on the special launch icon."
666667
STR_SMALL_LAUNCHER_UFOPEDIA: "A small launcher which fires stun bombs. Very useful for capturing live aliens."
@@ -804,7 +805,7 @@ en-GB:
804805
STR_HOVERTANK_PLASMA_UFOPEDIA: "Alien technology has given the HWP a new lease of life. The added manoeuvrability of air travel and the power of plasma beams is a lethal combination."
805806
STR_HOVERTANK_LAUNCHER_UFOPEDIA: "This hovertank has a fusion ball launcher that is capable of immense devastation. Use it with great care. You will have to manufacture the fusion balls to keep these HWPs fully armed. A fusion ball is an intelligent guided weapon. In order to fire it you select a number of 'way points' with the cursor and then click on the launch icon to fire the fusion ball."
806807
STR_HEAVY_PLASMA_CLIP_UFOPEDIA: "This compact device is used as ammunition for a Heavy Plasma Gun. It contains a small quantity of Elerium."
807-
STR_PLASMA_RIFLE_CLIP_UFOPEDIA: "This small object is used as a power source for the Plasma Rifle - a medium powered alien weapon. Contains a small quantity of Elerium."
808+
STR_PLASMA_RIFLE_CLIP_UFOPEDIA: "This small object is used as a power source for a Plasma Rifle - a medium powered alien weapon. Contains a small quantity of Elerium."
808809
STR_PLASMA_PISTOL_CLIP_UFOPEDIA: "Power source for the small alien Plasma Pistol. Contains Elerium - the source of all alien power."
809810
STR_STUN_BOMB_UFOPEDIA: "The Stun Bomb is used for capturing live human specimens, but it can also be used against most alien races. It is fired from a Small Launcher."
810811
STR_ALIEN_RESEARCH_UFOPEDIA: "The alien research mission is used for collecting basic data on earth and its inhabitants. Small vehicles are predominantly used, with occasional landings in deserted areas. This type of alien activity poses the least threat to XCom, with little concern from governments or the public."
@@ -1137,8 +1138,6 @@ en-GB:
11371138
STR_CRAFTLAUNCHALWAYS_DESC: "You may force your aircraft into flight, overriding the need to completely refuel and rearm."
11381139
STR_CUSTOMINITIALBASE: "Custom initial base"
11391140
STR_CUSTOMINITIALBASE_DESC: "When starting a new game, you can manually place your starting facilities instead of using the default layout."
1140-
STR_GLOBESEASONS: "Globe tilted lighting"
1141-
STR_GLOBESEASONS_DESC: "Enable realistic projection of sunlight on the Geoscape according to the earth's axial tilt."
11421141
STR_PLAYINTRO: "Play intro"
11431142
STR_PLAYINTRO_DESC: "Show the intro cinematic on startup."
11441143
STR_SHOWMORESTATSININVENTORYVIEW: "Inventory stats"
@@ -1147,8 +1146,8 @@ en-GB:
11471146
STR_SNEAKYAI_DESC: "AI avoids exposing themselves to the player whenever possible."
11481147
STR_STRAFE: "Strafe setting"
11491148
STR_STRAFE_DESC: "Enable strafing, running, and independent tank turret movement. Hold CTRL to use alternate movement methods."
1150-
STR_BATTLESCROLLDRAGINVERT: "Inverted drag-scrolling"
1151-
STR_BATTLESCROLLDRAGINVERT_DESC: "Inverts drag-scrolling on the battlescape."
1149+
STR_DRAGSCROLLINVERT: "Invert drag-scrolling"
1150+
STR_DRAGSCROLLINVERT_DESC: "Inverts the direction of drag-scrolling. When enabled you drag towards the target, when disabled you drag away instead."
11521151
STR_BATTLEEXPLOSIONHEIGHT: "Explosion height"
11531152
STR_BATTLEEXPLOSIONHEIGHT_DESC: "Change how far height-wise explosions may spread.{NEWLINE}(Flat: 0, Round: 3)"
11541153
STR_AUTOSAVE: "Autosave mode"
@@ -1162,19 +1161,23 @@ en-GB:
11621161
STR_NOT_ENOUGH_SPACE: "Not Enough Space!"
11631162
STR_WEAPONSELFDESTRUCTION: "Alien weapon self destruction"
11641163
STR_WEAPONSELFDESTRUCTION_DESC: "Weapons carried by aliens will self destruct if their owner is killed, like in XCOM 2012."
1165-
STR_SPENDRESEARCHEDITEMS: "Researched items will be spent"
1164+
STR_SPENDRESEARCHEDITEMS: "Spend Researched items"
11661165
STR_SPENDRESEARCHEDITEMS_DESC: "Researched items are removed from your stores and will be disassembled, like in XCOM 2012. After \"researching\" living aliens, the body will be returned to the base stores."
1166+
STR_NEWSEEDONLOAD: "Save scumming"
1167+
STR_NEWSEEDONLOAD_DESC: "Loading a game will reset the random number seed, so taking the same action can yield different results."
1168+
STR_CHANGEVALUEBYMOUSEWHEEL: "Change values with mouse wheel"
1169+
STR_CHANGEVALUEBYMOUSEWHEEL_DESC: "Allows you to use the mouse wheel to increase/decrease values by this amount."
1170+
STR_BATTLEHAIRBLEACH: "Enhanced soldier sprites"
1171+
STR_BATTLEHAIRBLEACH_DESC: "Changes soldier Battlescape sprites to match their inventory look."
11671172
STR_SAVE_VOXEL_VIEW: "Save First-Person Screenshot"
11681173
STR_TIME_UNITS_RESERVED_FOR_KNEELING: "Time Units reserved for Kneeling"
11691174
STR_TIME_UNITS_RESERVED_FOR_KNEELING_AND_FIRING: "TUs reserved for Kneeling and Firing"
11701175
STR_RESERVE_TIME_UNITS_FOR_KNEEL: "Reserve TUs for kneeling"
11711176
STR_EXPEND_ALL_TIME_UNITS: "Expend all remaining Time Units"
1172-
STR_PERSONAL_ARMOR_UFOPEDIA: "Using the newly discovered Alien Alloys, this new armor gives our men a fighting chance against the alien threat."
1173-
STR_POWER_SUIT_UFOPEDIA: "A powerful new protection for soldiers, this armor is powered by an Elerium energy source and greatly amplifies the speed and strength of the wearer, it offers the best protection yet for combat troops."
1177+
STR_PERSONAL_ARMOR_UFOPEDIA: "Using the newly discovered Alien Alloys, this new armour gives our men a fighting chance against the alien threat."
1178+
STR_POWER_SUIT_UFOPEDIA: "A powerful new protection for soldiers, this armour is powered by an Elerium energy source and greatly amplifies the speed and strength of the wearer, it offers the best protection yet for combat troops."
11741179
STR_FLYING_SUIT_UFOPEDIA: "An enhanced version of the Power Suit, incorporating alien anti-gravity navigation technology to allow full freedom of movement across the battlefield."
11751180
STR_ALL_ALIENS_KILLED_IN_CRASH: "All Aliens killed in crash,{NEWLINE}Auto recovery initiated"
1176-
STR_MAXFRAMESKIP: "Maximum frames skipped"
1177-
STR_MAXFRAMESKIP_DESC: "This is the maximum number of frames that may be skipped by the draw code during gameplay."
11781181
STR_RESET: "Reset"
11791182
STR_MEMORIAL: "Memorial"
11801183
STR_DATE_UC: "DATE"
@@ -1194,7 +1197,7 @@ en-GB:
11941197
STR_TFTDDAMAGE: "TFTD Damage Formula"
11951198
STR_TFTDDAMAGE_DESC: "Weapons will do between 50% and 150% of their rated damage as opposed to UFO: Enemy Unknown's 0% to 200%"
11961199
STR_BATTLESMOOTHCAMERA: "Smooth Bullet Camera"
1197-
STR_BATTLESMOOTHCAMERA_DESC: "The battlescape camera will remain centered on projectiles while in flight."
1200+
STR_BATTLESMOOTHCAMERA_DESC: "The Battlescape camera will remain centred on projectiles while in flight."
11981201
STR_BATTLECONFIRMFIREMODE: "Confirm Fire mode"
11991202
STR_BATTLECONFIRMFIREMODE_DESC: "Require a second click on the same tile to confirm fire orders."
12001203
STR_SELECT_BASE_1: "Select Base 1"
@@ -1237,6 +1240,8 @@ en-GB:
12371240
STR_MUSIC_VOLUME_DESC: "Changes the volume of the background music."
12381241
STR_SFX_VOLUME: "SFX Volume"
12391242
STR_SFX_VOLUME_DESC: "Changes the volume of the sound effects."
1243+
STR_UI_VOLUME: "UI Volume"
1244+
STR_UI_VOLUME_DESC: "Changes the volume of the interface beeps."
12401245
STR_AUDIO_BIT_DEPTH: "Audio Bit Depth"
12411246
STR_AUDIO_BIT_DEPTH_DESC: "Changes the bit depth of the audio output. Smaller values are closer to the original sounds, but may not work on every system."
12421247
STR_AUDIO_SAMPLE_RATE: "Audio Sample Rate"
@@ -1274,7 +1279,7 @@ en-GB:
12741279
STR_COMPUTER_MOVEMENT_SPEED_DESC: "Changes the movement speed of computer-controlled units."
12751280
STR_PATH_PREVIEW: "Path Preview"
12761281
STR_PATH_ARROWS: "Arrows"
1277-
STR_PATH_ARROWS_DESC: "Clicking shows the path your unit will take to the destination. Color indicates available actions: Green - can move and fire; Yellow - can move; Red - can't move."
1282+
STR_PATH_ARROWS_DESC: "Clicking shows the path your unit will take to the destination. Colour indicates available actions: Green - can move and fire; Yellow - can move; Red - can't move."
12781283
STR_PATH_TIME_UNIT_COST: "Time Units"
12791284
STR_PATH_TIME_UNIT_COST_DESC: "Clicking shows the TUs your unit will have remaining after moving to the destination."
12801285
STR_USER_INTERFACE_OPTIONS: "UI Options"
@@ -1304,4 +1309,4 @@ en-GB:
13041309
STR_RESTORE_DEFAULTS_QUESTION: "Are you sure you want to restore the default options?"
13051310
STR_DISPLAY_OPTIONS_CONFIRM: "Do you want to keep the current display options?"
13061311
STR_DISPLAY_OPTIONS_REVERT: "Reverting in 0:{0}"
1307-
1312+
STR_MISSING_CONTENT_PROMPT: "WARNING:{SMALLLINE}This save relies on mods that are unavailable. Missing content will be removed, and it may fail to load.{NEWLINE}Continue?"

0 commit comments

Comments
 (0)