combine both alien containment options into one

combine alienContainmentHasUpperLimit and alienResearchUsesContainment into one alienContainmentLimitEnforced option

bin/data/Language/Bulgarian.lng

@@ -2293,9 +2293,9 @@ STR_AGGRESSIVERETALIATION
 Aggressive retaliation
 STR_AGGRESSIVERETALIATION_DESC
 UFOs will attempt to detect your bases at all times, regardless of their mission parameters.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Alien containment limits
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Live alien containment limits will be imposed.
 STR_CANSELLLIVEALIENS
 Live alien sale
@@ -2395,10 +2395,6 @@ STR_WEAPONSELFDESTRUCTION
 XCom 2012 item recovery
 STR_WEAPONSELFDESTRUCTION_DESC
 Weapons carried by aliens will self destruct if their owner is killed.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Alien research requires containment
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Aliens use containment facility while in research, closing the "infinite live aliens" exploit.
 STR_ARROWS
 ARROWS
 STR_FULL

bin/data/Language/Czech.lng

@@ -2300,9 +2300,9 @@ STR_AGGRESSIVERETALIATION
 Agresivní odplata
 STR_AGGRESSIVERETALIATION_DESC
 UFA se vždy pokusí najít vaši základny bez ohledu na jejich primární misi.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Omezená velikost cizáckých cel
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Cizácké cely budou mít omezenou velikost.
 STR_CANSELLLIVEALIENS
 Prodej živých cizáků
@@ -2402,10 +2402,6 @@ STR_WEAPONSELFDESTRUCTION
 Sebedestrukce cizáckých zbraní (XCom 2012)
 STR_WEAPONSELFDESTRUCTION_DESC
 Zbraně cizáků se po jejich smrti automaticky zničí stejně jako v XCom 2012.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Alien research requires containment
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Aliens use containment facility while in research, closing the "infinite live aliens" exploit
 STR_ARROWS
 ARROWS
 STR_FULL

bin/data/Language/Danish.lng

@@ -2293,9 +2293,9 @@ STR_AGGRESSIVERETALIATION
 Aggressive retaliation
 STR_AGGRESSIVERETALIATION_DESC
 UFOs will attempt to detect your bases at all times, regardless of their mission parameters.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Alien containment limits
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Live alien containment limits will be imposed.
 STR_CANSELLLIVEALIENS
 Live alien sale
@@ -2391,10 +2391,6 @@ STR_WEAPONSELFDESTRUCTION
 XCom 2012 item recovery
 STR_WEAPONSELFDESTRUCTION_DESC
 Weapons carried by aliens will self destruct if their owner is killed.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Alien research requires containment
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Aliens use containment facility while in research, closing the "infinite live aliens" exploit.
 STR_ARROWS
 ARROWS
 STR_FULL

bin/data/Language/English.lng

@@ -2297,9 +2297,9 @@ STR_AGGRESSIVERETALIATION
 Aggressive retaliation
 STR_AGGRESSIVERETALIATION_DESC
 UFOs will attempt to detect your bases at all times, regardless of their mission parameters.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Alien containment limits
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Live alien containment limits will be imposed.
 STR_CANSELLLIVEALIENS
 Live alien sale
@@ -2399,10 +2399,6 @@ STR_WEAPONSELFDESTRUCTION
 XCom 2012 item recovery
 STR_WEAPONSELFDESTRUCTION_DESC
 Weapons carried by aliens will self destruct if their owner is killed.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Alien research requires containment
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Aliens use containment facility while in research, closing the "infinite live aliens" exploit.
 STR_ARROWS
 ARROWS
 STR_FULL

bin/data/Language/EnglishUk.lng

@@ -2297,9 +2297,9 @@ STR_AGGRESSIVERETALIATION
 Aggressive retaliation
 STR_AGGRESSIVERETALIATION_DESC
 UFOs will attempt to detect your bases at all times, regardless of their mission parameters.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Alien containment limits
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Live alien containment limits will be imposed.
 STR_CANSELLLIVEALIENS
 Live alien sale
@@ -2399,10 +2399,6 @@ STR_WEAPONSELFDESTRUCTION
 XCom 2012 item recovery
 STR_WEAPONSELFDESTRUCTION_DESC
 Weapons carried by aliens will self destruct if their owner is killed.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Alien research requires containment
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Aliens use containment facility while in research, closing the "infinite live aliens" exploit.
 STR_ARROWS
 ARROWS
 STR_FULL

bin/data/Language/French.lng

@@ -2293,9 +2293,9 @@ STR_AGGRESSIVERETALIATION
 Représaille agressive
 STR_AGGRESSIVERETALIATION_DESC
 Tous les OVNIs tente de détécter les bases X-Com quelque soit les paramètres de mission.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Limite pour la détention des E.T.
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Le nombre d'aliens détenu est limité par installation.
 STR_CANSELLLIVEALIENS
 Vente des E.T. vivants
@@ -2395,10 +2395,6 @@ STR_WEAPONSELFDESTRUCTION
 XCom 2012 item recovery
 STR_WEAPONSELFDESTRUCTION_DESC
 Weapons carried by aliens will self destruct if their owner is killed.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Alien research requires containment
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Aliens use containment facility while in research, closing the "infinite live aliens" exploit.
 STR_ARROWS
 ARROWS
 STR_FULL

bin/data/Language/German.lng

@@ -2293,9 +2293,9 @@ STR_AGGRESSIVERETALIATION
 Agressive Vergeltung
 STR_AGGRESSIVERETALIATION_DESC
 UFOs können jederzeit Ihre Basen aufspüren, unabhängig ihrer Missionsparameter.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Limit lebendig gefangener Aliens
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Die Anzahl der Aliens, die in den Ausserirdischen-Klimazellen gefangen gehalten werden können, ist beschränkt.
 STR_CANSELLLIVEALIENS
 Verkauf lebender Aliens
@@ -2395,10 +2395,6 @@ STR_WEAPONSELFDESTRUCTION
 XCom 2012 item recovery
 STR_WEAPONSELFDESTRUCTION_DESC
 Weapons carried by aliens will self destruct if their owner is killed.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Alien research requires containment
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Aliens use containment facility while in research, closing the "infinite live aliens" exploit.
 STR_ARROWS
 ARROWS
 STR_FULL

bin/data/Language/Hungarian.lng

@@ -2291,9 +2291,9 @@ STR_AGGRESSIVERETALIATION
 Aggresszív megtorlás
 STR_AGGRESSIVERETALIATION_DESC
 Az UFO-k - küldetésüktől függetlenül - minden alkalommal kíserletet tesznek a bázisod helyének kiderítésére.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Idegen Tároló felső korlátossága
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Az Idegen Tároló csak meghatározott számú élő idegent képes tárolni. (alap: 10)
 STR_CANSELLLIVEALIENS
 Élő idegen eladhatósága
@@ -2393,10 +2393,6 @@ STR_WEAPONSELFDESTRUCTION
 XCom 2012 item recovery
 STR_WEAPONSELFDESTRUCTION_DESC
 Weapons carried by aliens will self destruct if their owner is killed.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Alien research requires containment
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Aliens use containment facility while in research, closing the "infinite live aliens" exploit.
 STR_ARROWS
 ARROWS
 STR_FULL

bin/data/Language/Italian.lng

@@ -2297,9 +2297,9 @@ STR_AGGRESSIVERETALIATION
 Rappresaglia aggressiva
 STR_AGGRESSIVERETALIATION_DESC
 Gli UFO cercheranno di individuare le tue basi in ogni momento, a prescindere dai loro parametri di missione.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Limiti di contenimento alieni
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Saranno imposti limiti di contenimento alieni vivi.
 STR_CANSELLLIVEALIENS
 Vendita alieni vivi
@@ -2399,10 +2399,6 @@ STR_WEAPONSELFDESTRUCTION
 XCom 2012 item recovery
 STR_WEAPONSELFDESTRUCTION_DESC
 Weapons carried by aliens will self destruct if their owner is killed.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Alien research requires containment
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Aliens use containment facility while in research, closing the "infinite live aliens" exploit.
 STR_ARROWS
 ARROWS
 STR_FULL

bin/data/Language/Polish.lng

@@ -2303,9 +2303,9 @@ STR_AGGRESSIVERETALIATION
 Agresywne akcje odwetowe
 STR_AGGRESSIVERETALIATION_DESC
 UFO zawsze będzie próbowało wykryć Twoje bazy, bez względu na cel swojej misji.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Limity cel dla obcych
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Limit ilości miejsca w celach dla żywych obcych.
 STR_CANSELLLIVEALIENS
 Sprzedaż żywych obcych
@@ -2405,10 +2405,6 @@ STR_WEAPONSELFDESTRUCTION
 Odzyskiwanie wyposażenia jak w XCom 2012
 STR_WEAPONSELFDESTRUCTION_DESC
 Broń używana przez kosmitów ulegnie samozniszczeniu, jeśli jej właściciel zostanie zabity.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Badania nad obcym wymagają cel
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Podczas przeprowadzania badań nad obcymi, zajmują oni przestrzeń w celach. Wyklucza to możliwość przetrzymywania nieskończonej ilości żywych obcych.
 STR_ARROWS
 STRZAŁKI
 STR_FULL

bin/data/Language/Portuguese.lng

@@ -2297,9 +2297,9 @@ STR_AGGRESSIVERETALIATION
 Retaliação Agressiva
 STR_AGGRESSIVERETALIATION_DESC
 Todos os OVNIs tentarão detetar bases XCom, independentemente das suas diretivas.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Contenção Alienígena limitada
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Limita o número de alienígenas em contenção. Recomenda-se o uso da opção "Vender alienígenas vivos".
 STR_CANSELLLIVEALIENS
 Vender alienígenas vivos
@@ -2399,10 +2399,6 @@ STR_WEAPONSELFDESTRUCTION
 XCom 2012 item recovery
 STR_WEAPONSELFDESTRUCTION_DESC
 Weapons carried by aliens will self destruct if their owner is killed.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Alien research requires containment
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Aliens use containment facility while in research, closing the "infinite live aliens" exploit.
 STR_ARROWS
 ARROWS
 STR_FULL

bin/data/Language/Romanian.lng

@@ -2297,9 +2297,9 @@ STR_AGGRESSIVERETALIATION
 Represalii agresive
 STR_AGGRESSIVERETALIATION_DESC
 OZNurile vor încerca să îți detecteze bazele întotdeauna, indiferent de parametrii misiunii lor.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Limite carantină extratereștrii
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Vor fi impuse limite pentru numărul de extratereștrii vii din carantină.
 STR_CANSELLLIVEALIENS
 Vânzarea extratereștrilor vii
@@ -2399,10 +2399,6 @@ STR_WEAPONSELFDESTRUCTION
 Recuperare articole tip XCom 2012
 STR_WEAPONSELFDESTRUCTION_DESC
 Armele cărate de extratereștrii se autodistrug dacă posesorul este omorât.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Alien research requires containment
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Aliens use containment facility while in research, closing the "infinite live aliens" exploit.
 STR_ARROWS
 SĂGEȚI
 STR_FULL

bin/data/Language/Russian.lng

@@ -2299,9 +2299,9 @@ STR_AGGRESSIVERETALIATION
 Агрессивное возмездие
 STR_AGGRESSIVERETALIATION_DESC
 НЛО будут постоянно пытаться обнаружить вашу базу, вне зависимости от их типов миссий.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Ограничение содержания пришельцев
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Количество живых пришельцев в тюрьмах ограничено.
 STR_CANSELLLIVEALIENS
 Продажа живых пришельцев
@@ -2401,10 +2401,6 @@ STR_WEAPONSELFDESTRUCTION
 XCom 2012 item recovery
 STR_WEAPONSELFDESTRUCTION_DESC
 Weapons carried by aliens will self destruct if their owner is killed.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Alien research requires containment
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Aliens use containment facility while in research, closing the "infinite live aliens" exploit.
 STR_ARROWS
 ARROWS
 STR_FULL

bin/data/Language/Spanish.lng

@@ -2297,9 +2297,9 @@ STR_AGGRESSIVERETALIATION
 Represalia Agresiva
 STR_AGGRESSIVERETALIATION_DESC
 Los OVNIs intentarán detectar tus bases siempre, independientemente de sus parametros de misión.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Límites de contención alienígena
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Se impondrán límites a la contención de alienígenas.
 STR_CANSELLLIVEALIENS
 Venta de alienígenas vivos
@@ -2399,10 +2399,6 @@ STR_WEAPONSELFDESTRUCTION
 XCom 2012 item recovery
 STR_WEAPONSELFDESTRUCTION_DESC
 Weapons carried by aliens will self destruct if their owner is killed.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Alien research requires containment
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Aliens use containment facility while in research, closing the "infinite live aliens" exploit.
 STR_ARROWS
 ARROWS
 STR_FULL

bin/data/Language/SpanishAL.lng

@@ -2293,9 +2293,9 @@ STR_AGGRESSIVERETALIATION
 Represalias agresivas
 STR_AGGRESSIVERETALIATION_DESC
 Esta opción permite que los OVNIs intenten detectar sus bases en todo momento, independiente de los parámetros de la misión alienígena.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Limite del confinamiento alienígena
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Esta opción permite imponer límites en la cantidad de alienígenas vivos permitidos en el confinamiento.
 STR_CANSELLLIVEALIENS
 Venta de alienígenas vivos
@@ -2395,10 +2395,6 @@ STR_WEAPONSELFDESTRUCTION
 XCom 2012 item recovery
 STR_WEAPONSELFDESTRUCTION_DESC
 Weapons carried by aliens will self destruct if their owner is killed.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Alien research requires containment
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Aliens use containment facility while in research, closing the "infinite live aliens" exploit.
 STR_ARROWS
 ARROWS
 STR_FULL

bin/data/Language/Ukrainian.lng

@@ -2297,9 +2297,9 @@ STR_AGGRESSIVERETALIATION
 Агресивна відплата
 STR_AGGRESSIVERETALIATION_DESC
 НЛО завжди будуть намагатись знайти Вашу базу, незалежно від виконуваного завдання.
-STR_ALIENCONTAINMENTHASUPPERLIMIT
+STR_ALIENCONTAINMENTLIMITENFORCED
 Ліміт тюрми для прибульців
-STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC
+STR_ALIENCONTAINMENTLIMITENFORCED_DESC
 Буде введено ліміт на кількість живих прибульців в тюрмах.
 STR_CANSELLLIVEALIENS
 Продаж живих прибульців
@@ -2399,10 +2399,6 @@ STR_WEAPONSELFDESTRUCTION
 Захоплення зброї як в XCOM 2012
 STR_WEAPONSELFDESTRUCTION_DESC
 Зброя прибульців буде самознищуватись, якщо її власник буде вбитий.
-STR_ALIENRESEARCHUSESCONTAINMENT
-Alien research requires containment
-STR_ALIENRESEARCHUSESCONTAINMENT_DESC
-Aliens use containment facility while in research, closing the "infinite live aliens" exploit.
 STR_ARROWS
 СТРІЛКИ
 STR_FULL

docs/language_id.html

@@ -43,10 +43,8 @@
 <tr><td>STR_AIMED</td><td>Aimed</td></tr>
 <tr><td>STR_AIMED_SHOT</td><td>Aimed Shot</td></tr>
 <tr><td>STR_ALIEN</td><td>Alien</td></tr>
-<tr><td>STR_ALIENCONTAINMENTHASUPPERLIMIT</td><td>Alien containment limits</td></tr>
-<tr><td>STR_ALIENCONTAINMENTHASUPPERLIMIT_DESC</td><td>Live alien containment limits will be imposed.</td></tr>
-<tr><td>STR_ALIENRESEARCHUSESCONTAINMENT</td><td>Alien research requires containment</td></tr>
-<tr><td>STR_ALIENRESEARCHUSESCONTAINMENT_DESC</td><td>Aliens use containment facility while in research, closing the "infinite live aliens" exploit.</td></tr>
+<tr><td>STR_ALIENCONTAINMENTLIMITENFORCED</td><td>Alien containment limits are enforced</td></tr>
+<tr><td>STR_ALIENCONTAINMENTLIMITENFORCED_DESC</td><td>Live alien containment limits will be imposed.</td></tr>
 <tr><td>STR_ALIENS</td><td>Aliens</td></tr>
 <tr><td>STR_ALIENS_DEFEATED</td><td>Aliens defeated</td></tr>
 <tr><td>STR_ALIENS_KILLED</td><td>ALIENS KILLED</td></tr>

src/Basescape/BaseInfoState.cpp

@@ -48,7 +48,7 @@ namespace OpenXcom
  */
 BaseInfoState::BaseInfoState(Game *game, Base *base, BasescapeState *state) : State(game), _base(base), _state(state)
 {
-	_containmentLimit = Options::getBool("alienContainmentHasUpperLimit");
+	_containmentLimit = Options::getBool("alienContainmentLimitEnforced");
 	// Create objects
 	_bg = new Surface(320, 200, 0, 0);
 	_mini = new MiniBaseView(128, 16, 182, 8);