Skip to content

Commit e283ea5

Browse files
Shoes01Shoes01
committed
Merge branch 'master' of github.com:SupSuper/OpenXcom
2 parents 3396c47 + 9dc0998 commit e283ea5

15 files changed

Lines changed: 225 additions & 193 deletions

File tree

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,9 @@ en-GB:
8383
STR_CONSTRUCTION_TIME_UC: "CONSTRUCTION TIME>"
8484
STR_DAY:
8585
one: "{N} day"
86-
few: "{N} days"
87-
many: "{N} days"
8886
other: "{N} days"
8987
STR_HOUR:
9088
one: "{N} hour"
91-
few: "{N} hours"
92-
many: "{N} hours"
9389
other: "{N} hours"
9490
STR_MAINTENANCE_UC: "MAINTENANCE>"
9591
STR_OK: "OK"
@@ -222,7 +218,6 @@ en-GB:
222218
STR_CIVILIANS_KILLED_BY_XCOM_OPERATIVES: "CIVILIANS KILLED BY XCOM OPERATIVES"
223219
STR_CIVILIANS_SAVED: "CIVILIANS SAVED"
224220
STR_XCOM_OPERATIVES_KILLED: "XCOM OPERATIVES KILLED"
225-
STR_XCOM_OPERATIVES_RETIRED_THROUGH_INJURY: "XCOM OPERATIVES RETIRED THROUGH INJURY"
226221
STR_XCOM_OPERATIVES_MISSING_IN_ACTION: "XCOM OPERATIVES MISSING IN ACTION"
227222
STR_TANKS_DESTROYED: "TANKS DESTROYED"
228223
STR_XCOM_CRAFT_LOST: "XCOM CRAFT LOST"
@@ -305,10 +300,6 @@ en-GB:
305300
STR_NONE_UC: "NONE"
306301
STR_ROUNDS_: "ROUNDS>{ALT}{0}"
307302
STR_WEAPON_TWO: "WEAPON-2>{ALT}{0}"
308-
STR_HOSTILE: "HOSTILE"
309-
STR_NEUTRAL: "NEUTRAL"
310-
STR_FRIENDLY: "FRIENDLY"
311-
STR_COMMITTED: "COMMITTED"
312303
STR_GAME_OPTIONS: "GAME OPTIONS"
313304
STR_LOAD_GAME: "LOAD GAME"
314305
STR_SAVE_GAME: "SAVE GAME"
@@ -1039,16 +1030,10 @@ en-GB:
10391030
STR_TIME_UNITS_RESERVED_FOR_AUTO_SHOT: "Time Units reserved for Auto Shot"
10401031
STR_TIME_UNITS_RESERVED_FOR_AIMED_SHOT: "Time Units reserved for Aimed Shot"
10411032
STR_UNITS_IN_EXIT_AREA:
1042-
zero: "No Units in Exit Area"
10431033
one: "{N} Unit in Exit Area"
1044-
few: "{N} Units in Exit Area"
1045-
many: "{N} Units in Exit Area"
10461034
other: "{N} Units in Exit Area"
10471035
STR_UNITS_OUTSIDE_EXIT_AREA:
1048-
zero: "No Units outside Exit Area"
10491036
one: "{N} Unit outside Exit Area"
1050-
few: "{N} Units outside Exit Area"
1051-
many: "{N} Units outside Exit Area"
10521037
other: "{N} Units outside Exit Area"
10531038
STR_ABORT_MISSION_QUESTION: "Abort Mission?"
10541039
STR_CORPSE: "Corpse"
@@ -1213,7 +1198,6 @@ en-GB:
12131198
STR_SELECT_BASE_8: "Select Base 8"
12141199
STR_VIDEO: "VIDEO"
12151200
STR_AUDIO: "AUDIO"
1216-
STR_GEOSCAPE_UC: "GEOSCAPE"
12171201
STR_BATTLESCAPE_UC: "BATTLESCAPE"
12181202
STR_MODS: "MODS"
12191203
STR_DISPLAY_RESOLUTION: "Display Resolution"
@@ -1319,7 +1303,7 @@ en-GB:
13191303
STR_BATTLESCAPE_SCALE_DESC: "Battlescape viewport scaling mode, based on a fixed resolution (stretched to fit), or a fixed zoom level (expanded to fill)."
13201304
STR_GEOSCAPE_SCALE: "Geoscape Scale"
13211305
STR_GEOSCAPESCALE_SCALE_DESC: "Geoscape viewport scaling mode, based on a fixed resolution (stretched to fit), or a fixed zoom level (expanded to fill)."
1322-
STR_1.5X: "1.5x Original"
1306+
STR_1_5X: "1.5x Original"
13231307
STR_2X: "2x Original"
13241308
STR_THIRD_DISPLAY: "1/3 Display"
13251309
STR_HALF_DISPLAY: "1/2 Display"
@@ -1365,6 +1349,4 @@ en-GB:
13651349
STR_ALL_ITEMS: "All Items"
13661350
STR_NO_MORE_EQUIPMENT_ALLOWED:
13671351
one: "NO MORE EQUIPMENT ALLOWED ON BOARD!{SMALLLINE}You are only allowed to take a maximum of {N} item of equipment on this craft."
1368-
few: "NO MORE EQUIPMENT ALLOWED ON BOARD!{SMALLLINE}You are only allowed to take a maximum of {N} items of equipment on this craft."
1369-
many: "NO MORE EQUIPMENT ALLOWED ON BOARD!{SMALLLINE}You are only allowed to take a maximum of {N} items of equipment on this craft."
13701352
other: "NO MORE EQUIPMENT ALLOWED ON BOARD!{SMALLLINE}You are only allowed to take a maximum of {N} items of equipment on this craft."

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,9 @@ en-US:
8383
STR_CONSTRUCTION_TIME_UC: "CONSTRUCTION TIME>"
8484
STR_DAY:
8585
one: "{N} day"
86-
few: "{N} days"
87-
many: "{N} days"
8886
other: "{N} days"
8987
STR_HOUR:
9088
one: "{N} hour"
91-
few: "{N} hours"
92-
many: "{N} hours"
9389
other: "{N} hours"
9490
STR_MAINTENANCE_UC: "MAINTENANCE>"
9591
STR_OK: "OK"
@@ -222,7 +218,6 @@ en-US:
222218
STR_CIVILIANS_KILLED_BY_XCOM_OPERATIVES: "CIVILIANS KILLED BY XCOM OPERATIVES"
223219
STR_CIVILIANS_SAVED: "CIVILIANS SAVED"
224220
STR_XCOM_OPERATIVES_KILLED: "XCOM OPERATIVES KILLED"
225-
STR_XCOM_OPERATIVES_RETIRED_THROUGH_INJURY: "XCOM OPERATIVES RETIRED THROUGH INJURY"
226221
STR_XCOM_OPERATIVES_MISSING_IN_ACTION: "XCOM OPERATIVES MISSING IN ACTION"
227222
STR_TANKS_DESTROYED: "TANKS DESTROYED"
228223
STR_XCOM_CRAFT_LOST: "XCOM CRAFT LOST"
@@ -305,10 +300,6 @@ en-US:
305300
STR_NONE_UC: "NONE"
306301
STR_ROUNDS_: "ROUNDS>{ALT}{0}"
307302
STR_WEAPON_TWO: "WEAPON-2>{ALT}{0}"
308-
STR_HOSTILE: "HOSTILE"
309-
STR_NEUTRAL: "NEUTRAL"
310-
STR_FRIENDLY: "FRIENDLY"
311-
STR_COMMITTED: "COMMITTED"
312303
STR_GAME_OPTIONS: "GAME OPTIONS"
313304
STR_LOAD_GAME: "LOAD GAME"
314305
STR_SAVE_GAME: "SAVE GAME"
@@ -1039,16 +1030,10 @@ en-US:
10391030
STR_TIME_UNITS_RESERVED_FOR_AUTO_SHOT: "Time Units reserved for Auto Shot"
10401031
STR_TIME_UNITS_RESERVED_FOR_AIMED_SHOT: "Time Units reserved for Aimed Shot"
10411032
STR_UNITS_IN_EXIT_AREA:
1042-
zero: "No Units in Exit Area"
10431033
one: "{N} Unit in Exit Area"
1044-
few: "{N} Units in Exit Area"
1045-
many: "{N} Units in Exit Area"
10461034
other: "{N} Units in Exit Area"
10471035
STR_UNITS_OUTSIDE_EXIT_AREA:
1048-
zero: "No Units outside Exit Area"
10491036
one: "{N} Unit outside Exit Area"
1050-
few: "{N} Units outside Exit Area"
1051-
many: "{N} Units outside Exit Area"
10521037
other: "{N} Units outside Exit Area"
10531038
STR_ABORT_MISSION_QUESTION: "Abort Mission?"
10541039
STR_CORPSE: "Corpse"
@@ -1213,7 +1198,6 @@ en-US:
12131198
STR_SELECT_BASE_8: "Select Base 8"
12141199
STR_VIDEO: "VIDEO"
12151200
STR_AUDIO: "AUDIO"
1216-
STR_GEOSCAPE_UC: "GEOSCAPE"
12171201
STR_BATTLESCAPE_UC: "BATTLESCAPE"
12181202
STR_MODS: "MODS"
12191203
STR_DISPLAY_RESOLUTION: "Display Resolution"
@@ -1319,7 +1303,7 @@ en-US:
13191303
STR_BATTLESCAPE_SCALE_DESC: "Battlescape viewport scaling mode, based on a fixed resolution (stretched to fit), or a fixed zoom level (expanded to fill)."
13201304
STR_GEOSCAPE_SCALE: "Geoscape Scale"
13211305
STR_GEOSCAPESCALE_SCALE_DESC: "Geoscape viewport scaling mode, based on a fixed resolution (stretched to fit), or a fixed zoom level (expanded to fill)."
1322-
STR_1.5X: "1.5x Original"
1306+
STR_1_5X: "1.5x Original"
13231307
STR_2X: "2x Original"
13241308
STR_THIRD_DISPLAY: "1/3 Display"
13251309
STR_HALF_DISPLAY: "1/2 Display"
@@ -1365,6 +1349,4 @@ en-US:
13651349
STR_ALL_ITEMS: "All Items"
13661350
STR_NO_MORE_EQUIPMENT_ALLOWED:
13671351
one: "NO MORE EQUIPMENT ALLOWED ON BOARD!{SMALLLINE}You are only allowed to take a maximum of {N} item of equipment on this craft."
1368-
few: "NO MORE EQUIPMENT ALLOWED ON BOARD!{SMALLLINE}You are only allowed to take a maximum of {N} items of equipment on this craft."
1369-
many: "NO MORE EQUIPMENT ALLOWED ON BOARD!{SMALLLINE}You are only allowed to take a maximum of {N} items of equipment on this craft."
13701352
other: "NO MORE EQUIPMENT ALLOWED ON BOARD!{SMALLLINE}You are only allowed to take a maximum of {N} items of equipment on this craft."

0 commit comments

Comments
 (0)