diff --git a/CAMEO.verbpatterns.txt b/CAMEO.verbpatterns.txt old mode 100644 new mode 100755 index e68383e..381b149 --- a/CAMEO.verbpatterns.txt +++ b/CAMEO.verbpatterns.txt @@ -276,6 +276,13 @@ +NAVY +SPECIAL_FORCES +SOLDIERS ++SERVICEMEN ++PARATROOPERS ++INFANTRYMEN ++SERVICEMEMBERS ++COMBAT_BRIGADES ++BATTALIONS ++BRIGADES &SECURITY +SECURITY_ @@ -420,6 +427,63 @@ +TURBOJET +DRONE +RPV ++DRONE_AIRCRAFT ++UNMANNED_DRONE ++PREDATOR_DRONE ++UNMANNED_AIRCRAFT ++UNMANNED_PREDATOR ++REAPER_DRONE ++UNMANNED_AERIAL_DRONE ++UNMANNED_AERIAL_VEHICLE ++REMOTELY_PILOTED_DRONES ++REMOTELY_PILOTED_AIRCRAFT ++UNMANNED_AERIAL_SYSTEM ++PREDATOR_UAV ++PILOTLESS_PLANE ++APACHE_ATTACK_HELICOPTER ++APACHE_GUNSHIP ++FIGHTER_JET ++FIGHTER_BOMBERS ++FIGHTER_AIRCRAFT ++JETFIGHTER ++FIGHTER_PLANE ++F/A-18_FIGHTER_JET ++SUPER_HORNET ++TOMCAT_FIGHTER ++F/A-18E/F_SUPER_HORNET ++F-22A_RAPTOR ++F-22_RAPTOR ++F/A-22_RAPTOR ++F/A-18_FIGHTER ++F/A-22_FIGHTER ++RF_4C ++F/A-18 ++F-16 ++F-22 ++F-33 ++F-14 ++BOMBER ++B-52 ++STEALTH_BOMBER ++MQ-9_REAPER ++EUROFIGHTER_TYPHOON ++MIG ++HARRIER_JET ++SU-24 ++A-37B_DRAGONFLY ++F-7MG ++MIRAGE-2000 ++MIG-21PFM ++SU-30MK ++MI-24VM/HIND ++P-3A_ORION ++CH-47F_CHINOOK ++P-8A_POSEIDON ++AH-64D_APACHE ++AH-64_APACHE ++V-22_OSPREY ++STEALTH_FIGHTER ++FIGHTING_FALCON &INFORMATION +INFORMATION @@ -466,6 +530,16 @@ +ROCKET_PROPELLED_GRENADE +AMMUNITION_ +BOMB ++ROCKET ++MISSILE ++UNGUIDED_ROCKET ++GUIDED_MISSILE ++CRUISE_MISSILES ++ANTISHIP_MISSILE ++ANTIAIRCRAFT_MISSILE ++TOW_MISSILE ++SIDEWINDER_MISSILE ++BALLISTIC_MISSILE +MACHETE +MACHINE_GUN +REVOLVER @@ -485,6 +559,8 @@ +HUNTING_KNIFE +ARMAMENT +ARTILLERY_ ++HOWITZER ++RECOILLESS_RIFLE +ATTACK_HELICOPTERS +APACHE_ATTACK_HELICOPTER +FIGHTER_JET @@ -534,6 +610,16 @@ +AH-64D_APACHE +AH-64_APACHE +V-22_OSPREY ++HELLFIRE_MISSILE ++PRECISION_GUIDED_MUNITION ++IED ++IMPROVISED_EXPLOSIVE_DEVICE ++VBIED ++IMPROVISED_EXPLOSIVE_DEVISE ++IMPROVISED_EXPLOSIVE ++IMPROVISED_BOMB ++ARMOR_PIERCING_ROADSIDE_BOMB ++BORNE_IED &WMD @@ -543,10 +629,25 @@ +NUCLEAR_BOMB +NUCLEAR_WEAPON +NUCLEAR_DEVICE ++NUCLEAR_WEAPONS ++ATOM_BOMB ++TACTICAL_NUKE ++ATOMIC_WEAPONS +NERVE_GAS +SARIN_ +SARIN_GAS_ - ++SARIN_NERVE_GAS ++SARIN_NERVE_AGENT ++VX_NERVE_AGENT ++MUSTARD_GAS ++MUSTARD_BLISTER_AGENT ++CYCLOSARIN ++VX_NERVE_GAS ++VX_STOCKPILE ++BLISTER_AGENT ++CHEMICAL_WEAPON ++NONCONVENTIONAL_WEAPONS ++CHEMICAL_WARFARE &FOOD +FOOD @@ -567,6 +668,10 @@ +PEACEKEEPER +PEACE-KEEPING +PEACE-KEEPER ++UN_PEACEKEEPERS ++PEACEKEEPING_FORCE ++BLUE_HELMETS ++PEACEKEEPING_CONTINGENT &DEFENSE diff --git a/Phoenix.Countries.actors.txt b/Phoenix.Countries.actors.txt index b30ec39..f0b5e13 100644 --- a/Phoenix.Countries.actors.txt +++ b/Phoenix.Countries.actors.txt @@ -5795,7 +5795,11 @@ ZULMA_YUGAR_PARRAGA_ ; CountryInfo.txt BOSNIA_AND_HERZEGOVINA [BIH] +BIH_ +BOSNIA_ ++BOSNIAN ++BOSNIANS +BOSNIA_AND_HERCEGOVINA_ ++BOSNIA-HERZEGOVINA ++BOSNIA-HERCEGOVINA +BOSNIAN_ +SARAJEVO_ +HERZEGOVIN_ @@ -5969,7 +5973,7 @@ BRAZIL_ [BRA] +BRASSIL_ +BRASILIA_ +SAO_PAULO_ -+RIO_DE_JANEIRO_ ++RIO_DE_JANEIRO +BELO_HORIZONTE_ +PORTO_ALEGRE_ +RECIFE_ @@ -9812,10 +9816,18 @@ JIANG_ZEMIN_ ; CountryInfo.txt [CHNGOV 930327-030315] [CHNGOVMIL 030501-041231] [CHNELI] -HU_JINTAO_ ; CountryInfo.txt +DENG_XIAOPING ++DENG_XIAO_PING ++REFORMER_DENG_XIAOPING + [CHNELI] +HU_JINTAO_ ++PRESIDENT_HU_JINTAO [CHNELI 600101-000101] - [CHNGOV >021115] + [CHNGOV 20021115-20130314] [CHNELI] +XI_JINPING ++PRESIDENT_XI_JINPING + [CHNGOV >20121115] DONG_BIWU_ ; CountryInfo.txt [CHNGOV 681031-720224] [CHNGOV 720224-750117] @@ -9852,8 +9864,10 @@ ZHU_RONGJI_ ; CountryInfo.txt [CHNGOV 980317-030316] [CHNELI] WEN_JIABAO_ ; CountryInfo.txt ++PREMIER_WEN_JIABAO ++PRIME_MINISTER_WEN_JIABAO [CHNELI 600101-000101] - [CHNGOV >030316] + [CHNGOV 20030316-20130305] [CHNELI] AMBROSE_LEE_ ; CountryInfo.txt [CHNGOV 030101-030430] @@ -12102,7 +12116,8 @@ CZECHOSLOVAKIA CZECH_REPUBLIC_ [CZE] -+CZECH_ ++CZECH ++CZECHS +CZECHIA_ +CZECK_REPUBLIC_ +CZEC_REPUBLIC_ @@ -14075,6 +14090,12 @@ SUFI_ABU_TALEB_ ; CountryInfo.txt HOSNI_MUBARAK_ ; CountryInfo.txt +MUBARAK_ +PRESIDENT_MUBARAK_ ++PRESIDENT_HOSNI_MUBARAK ++HOSNY_MUBARAK ++HUSNI_MUBARAK ++HOSNI_MUBAREK ++PRESIDENT_HUSNI_MUBARAK ++PRESIDENT_HOSNY_MUBARAK [EGYELI 460101-811007] [EGYGOV 811007-820102] [EGYGOV 811014-110211] @@ -14086,6 +14107,7 @@ MOHAMED_MORSI_ ; http://www.saudigazette.com.sa/index.cfm?method=home.regcon&con +MORSY_ +MOHAMMAD_MORSI_ +MOHAMMED_MORSI ++MOHAMED_MURSI +PRESIDENT_MOHAMMED_MORSI_ +PRESIDENT_MOHAMED_MORSI_ +PRESIDENT_MOHAMMED_MURSI_ @@ -14112,6 +14134,7 @@ ABDEL_FATTAH_EL_SISI MOHAMED_ELBARADEI_ ; First one is IAEA-debatable +MOHAMED_MUSTAFA_ELBARADEI_ +ELBARADEI_ ++MOHAMMED_ELBARADEI [IGOUNOIAE 971201-091130] [EGYGOV 130714-130814] [EGYELI] @@ -20476,7 +20499,7 @@ WILLIAM_CHONG_WONG_ ; CountryInfo.txt YANI_ROSENTHAL_ ; CountryInfo.txt [HNDGOV 060301-080228] -HONG_KONG_ [HKG] +HONG_KONG [HKG] +HONG_KONGER_ +HONGKONG_ +HKSAR_ @@ -22012,6 +22035,7 @@ IRAN_ [IRN] +DASHT-E-KAVIR_ +KAVIR_DESERT_ +DEMAVEND_ ++SAQQEZ ISLAMIC_CONSULTATIVE_ASSEMBLY +GUARDIAN_COUNCIL +COUNCIL_OF_GUARDIANS @@ -22074,6 +22098,11 @@ MOHAMMAD_KHATAMI [IRNELI] MAHMOUD_AHMADINEJAD_ ; CountryInfo.txt +PRESIDENT_AHMADINEJAD ++AHMADINEJAD ++AHMADENIJAD ++PRESIDENT_MAHMUD_AHMADINEJAD ++PRESIDENT_MAHMOUD_AHMADINEJAD ++MAHMOUD_AHMEDINEJAD [IRNELI 740101-000101] [IRNGOV 20050803-20130803] [IRNELI] @@ -22252,6 +22281,8 @@ HOSEIN_MARASHI_ ; CountryInfo.txt [IRNGOVBUS 040901-051031] HOSEIN_SAMSAMI_ ; CountryInfo.txt [IRNGOV 080501-080831] +HOSSEIN_SHARIATMADARI + [IRNELI] JAFAR_TOWFIQI_DARIAN_ ; CountryInfo.txt [IRNGOV 031101-050831] JAMAL_KARIMI_RAD_ ; CountryInfo.txt @@ -22439,19 +22470,22 @@ IRAQ_ +SAMARRA +SALAH_AD_DIN_GOVERNORATE +DIYALA ++DIYALA_PROVINCE +TIKRIT +ASSUR_ +ASUR_ +FALLUJAH ++FALLUJA +ASHUR_ +NINEVEH_ +MESOPOTAMIA_ +CHALDEA_ +CHALDAEA_ +ASSYRIA_ -+SYRIAN_DESERT_ +#+SYRIAN_DESERT_ +ANBAR +ANBAR_PROVINCE ++AL_ANBAR +RAMADI +AL_RAMADI +AL_ANBAR_GOVERNORATE @@ -22459,9 +22493,17 @@ IRAQ_ +WESTERN_ANBAR_PROVINCE +SINJAR +NINEVEH_PROVINCE ++NINEWA_PROVINCE +MUTHANNA +AL_MUTHANNA +SAFWAN ++BAIJI ++BAYJI ++TAL_AFAR ++TAL'AFAR ++TALL_AFAR ++TELL_AFAR ++TEL_AFAR [IRQ <20030320] [IRQOCC 1920030320-20060520] [IRQ >20060520] @@ -22469,11 +22511,22 @@ IRAQI_KURDISTAN # Make new Kurdistan code? +ERBIL +IRBIL +SULAYMANIYAH ++SULAYMANIYA ++SULEIMANIYA ++SULAIMANIYA ++SULEIMANIYAH [IRQ <20030320] [IRQOCC 1920030320-20060520] [IRQ >20060520] KURDISTAN_REGIONAL_GOVERNMENT # Make new Kurdistan code? +KRG ++IRAQI_KURDISTAN ++SEMI_AUTONOMOUS_KURDISTAN ++AUTONOMOUS_KURDISH_REGION ++KURDISTAN_PUK ++AUTONOMOUS_KURDISTAN_REGION ++MASOUD_BARZANI ++MESÛD_BARZANÎ [IRQGOV] PESHMERGA # Kurdistan stuff +PESH_MERGA @@ -23408,7 +23461,7 @@ BENJAMIN_NETANYAHU_ ; CountryInfo.txt +PRIME_MINISTER_BINYAMIN_NETANYAHU +PRIME_MINISTER_BIBI_NETANYAHU +PRIME_MINISTER_NETANYAHU -+PRIME_MINISTER_BENJAMIN_NENTAYAHU ++PRIME_MINISTER_BENJAMIN_NETANYAHU +ISRAELI_PRIME_MINISTER_BENJAMIN_NETANYAHU +ISRAELI_PRIME_MINISTER_BINYAMIN_NETANYAHU +ISRAELI_PRIME_MINISTER_BIBI_NETANYAHU @@ -23428,11 +23481,14 @@ EHUD_BARAK_ ; CountryInfo.txt [ISRGOVMIL 20070701-20130318] [ISRELI] ARIEL_SHARON_ ; CountryInfo.txt ++PRIME_MINISTER_ARIEL_SHARON ++ARIAL_SHARON [ISRELI 460101-010307] [ISRGOV 030101-060430] [ISRGOV 010307-060414] [ISRELI] EHUD_OLMERT_ ; CountryInfo.txt ++PRIME_MINISTER_EHUD_OLMERT [ISRELI 630101-030301] [ISRGOV 030301-090331] [ISRGOV 20060104-20090331] @@ -24693,6 +24749,8 @@ HASSAN_ ; CountryInfo.txt [JORELI] ABDULLAH_II_ ; CountryInfo.txt +ABDALLAH_II_ ++KING_ABDULLAH ++KING_ABDULLAH_II [JORELI 800101-000101] [JORGOV >990207] [JORELI] @@ -38809,7 +38867,7 @@ REPUBLIC_OF_SOUTH_AFRICA_ [ZAF] +MZANSI_ +PRETORIA_ +BLOEMFONTEIN_ -+CAPE_TOWN_ ++CAPE_TOWN +JOHANNESBURG_ +KIMBERLEY_ +DURBAN_ @@ -41369,9 +41427,9 @@ YOUSSOUPHA_NDIAYE_ ; CountryInfo.txt [SENGOV 030101-031031] [SENGOV 031201-061231] -SERBIA_ [SRB] -+BELGRADE_ -+SERBIAN_ +SERBIA [SRB] ++BELGRADE ++SERBIAN +REPUBLIC_OF_SERBIA_ +REPUBLIKA_SRBIJA [YUGSRB <920427] @@ -42888,8 +42946,12 @@ ZAKARIYA_MAHMUD_HAJI_ABDI_ ; CountryInfo.txt SOUTH_KOREA_ [KOR] +SOUTH_KOREAN_ ++S.KOREA ++S.KOREAN ++S.KOREANS +HAN_GUK_ -+S._KOREA_ ++S._KOREA ++S._KOREAN +KOREA,_REPUBLIC_OF_ +KOREA_(SOUTH)_ +DAEHAN_ @@ -45347,6 +45409,7 @@ SYRIA_ [SYR] +QARA +RIF_DIMASHQ +MAARRAT_AL-NU'MAN ++MAARET_AL_NUMAN +HRITAN +TAFTANAZ +RAS_AL-AIN @@ -45855,6 +45918,7 @@ ISLAMIC_STATE_OF_IRAQ_AND_THE_LEVANT_; kkl mod +AL-QAEDA_IN_IRAQ_ +AQI_ +ABU_BAKR_AL_BAGHDADI_ ++AL-BAGHDADI +ABU_BAKR_AL-BAGHDADI_ +ABU_OMAR_AL_BAGHDADI_ +ABU_OMAR_AL-BAGHDADI_ @@ -48393,6 +48457,8 @@ AHMET_NECDET_SEZER_ ; CountryInfo.txt [TURGOV 000516-070828] [TURELI] ABDULLAH_GUL_ ; CountryInfo.txt ++PRESIDENT_ABDULLAH_GÜL ++PRESIDENT_ABDULLAH_GUL [TURELI 680101-000101] [TURGOV >070828] [TURELI] @@ -48425,6 +48491,12 @@ RECEP_TAYYIP_ERDOGAN_ ; CountryInfo.txt +RECEP_ERDOGAN_ +ERDOGAN_ +TAYYIP_ERDOGAN ++PRIME_MINISTER_RECEP_ERDOGAN ++RECEP_TAYYIP_ERDOGAN ++ERDOĞAN ++PRIME_MINISTER_TAYYIP_ERDOĞAN ++PRIME_MINISTER_RECEP_TAYYIP ++RECEP_TAYYIP_ERDOĞAN [TURELI 720101-021118] [TURGOV 021118-030314] [TURGOV >030314] @@ -48437,6 +48509,7 @@ ABDULKADIR_AKSU_ ; CountryInfo.txt ABDULLATIF_SENER_ ; CountryInfo.txt [TURGOV 030101-070831] AHMET_DAVUTOGLU_ ; CountryInfo.txt ++DAVUTOĞLU [TURGOV >090601] ALI_BABACAN_ ; CountryInfo.txt [TURGOV >030101] @@ -49540,12 +49613,16 @@ LEONID_KRAVCHUK_ ; CountryInfo.txt [UKRELI 520101-911205] [UKRGOV 911205-940719] [UKRELI] -LEONID_KUCHMA_ ; CountryInfo.txt +LEONID_KUCHMA_ ; COUNTRYINFO.TXT ++PRESIDENT_LEONID_KUCHMA [UKRELI 560101-921013] [UKRGOV 940719-050123] [UKRGOV 921013-930922] [UKRELI] VIKTOR_YUSHCHENKO_ ; CountryInfo.txt ++YUSHCHENKO ++PRESIDENT_VIKTOR_YUSHCHENKO ++VICTOR_YUSHCHENKO [UKRELI 720101-991222] [UKRGOV 991222-010529] [UKRGOV >050123] @@ -49592,6 +49669,9 @@ ANATOLIY_KINAKH_ ; CountryInfo.txt [UKRELI] VIKTOR_YANUKOVYCH_ ; CountryInfo.txt +YANUKOVYCH ++PRIME_MINISTER_VIKTOR_YANUKOVYCH ++PRIME_MINISTER_VIKTOR_YANUKOVICH ++VICTOR_YANUKOVICH [UKRELI 680101-060804] [UKRGOV 030101-050131] [UKRGOV 060804-071218] @@ -49606,7 +49686,12 @@ MYKOLA_AZAROV_ ; CountryInfo.txt [UKRGOV 060901-071231] [UKRGOV >100401] [UKRELI] -YULIYA_TYMOSHENKO_ ; CountryInfo.txt +YULIYA_TYMOSHENKO_ ; COUNTRYINFO.TXT ++YULIA_TIMOSHENKO ++PRIME_MINISTER_YULIA_TIMOSHENKO ++PRIME_MINISTER_YULIA_TYMOSHENKO ++TYMOSHENKO ++TIMOSHENKO [UKRELI 780101-050124] [UKRGOV 050124-050908] [UKRGOV 050201-050930] @@ -50595,8 +50680,10 @@ UNITED_STATES_MILITARY_ +DEPARTMENT_OF_DEFENSE_ +US_MILITARY +U.S._MILITARY ++U.S._ARMY +THE_UNITED_STATES_MILITARY +DEFENSE_DEPARTMENT_ ++SECDEF +DOD_ +PENTAGON_ +WEST_POINT_ @@ -50606,6 +50693,8 @@ UNITED_STATES_MILITARY_ +DARPA_ +UNITED_STATES_CENTRAL_COMMAND +US_CENTRAL_COMMAND ++U.S._CENTRAL_COMMAND ++CENTRAL_COMMAND +CENTCOM +PACIFIC_COMMAND +PACOM @@ -50989,6 +51078,10 @@ AMERICAN_VICE_PRESIDENT +US_VICE_PRESIDENT +U.S._VICE_PRESIDENT +VICE_PRESIDENT_OF_THE_UNITED_STATES +AMERICAN_VICE-PRESIDENT ++US_VICE-PRESIDENT ++U.S.-VICE_PRESIDENT ++VICE-PRESIDENT_OF_THE_UNITED_STATES [USAGOV] HENRY_A._WALLACE_ ; CountryInfo.txt @@ -50998,6 +51091,8 @@ HENRY_A._WALLACE_ ; CountryInfo.txt ALBEN_W._BARKLEY_ ; CountryInfo.txt +VICE_PRESIDENT_BARKLEY +VICE_PRESIDENT_ALBEN_BARKLEY_ ++VICE-PRESIDENT_BARKLEY ++VICE-PRESIDENT_ALBEN_BARKLEY_ +SENATOR_BARKLEY +SENATOR_ALBEN_BARKLEY [USAELI 18950101-370722] @@ -51007,12 +51102,16 @@ ALBEN_W._BARKLEY_ ; CountryInfo.txt HUBERT_H._HUMPHREY_ ; CountryInfo.txt +VICE_PRESIDENT_HUBERT_HUMPHREY +VICE_PRESIDENT_HUMPHREY ++VICE-PRESIDENT_HUBERT_HUMPHREY ++VICE-PRESIDENT_HUMPHREY [USAELI 19290101-650120] [USAGOV 650120-690120] [USAELI 690120-780101] SPIRO_T._AGNEW_ ; CountryInfo.txt +VICE_PRESIDENT_SPIRO_AGNEW +VICE_PRESIDENT_AGNEW ++VICE-PRESIDENT_SPIRO_AGNEW ++VICE-PRESIDENT_AGNEW [USAELI 360101-690120] [USAGOV 690120-731010] [USAELI 731010-960101] @@ -51020,24 +51119,33 @@ NELSON_A._ROCKEFELLER_ ; CountryInfo.txt +VICE_PRESIDENT_NELSON_A_ROCKEFELLER +VICE_PRESIDENT_NELSON_ROCKAFELLER +VICE_PRESIDENT_ROCKAFELLER ++VICE-PRESIDENT_NELSON_A_ROCKEFELLER ++VICE-PRESIDENT_NELSON_ROCKAFELLER ++VICE-PRESIDENT_ROCKAFELLER [USAELI 19260101-741219] [USAGOV 741219-770120] [USAELI 770120-790101] WALTER_F._MONDALE_ ; CountryInfo.txt +VICE_PRESIDENT_WALTER_MONDALE +VICE_PRESIDENT_MONDALE ++VICE-PRESIDENT_WALTER_MONDALE ++VICE-PRESIDENT_MONDALE [USAELI 460101-770120] [USAGOV 770120-810120] [USAELI] DAN_QUAYLE_ ; CountryInfo.txt +VICE_PRESIDENT_DAN_QUAYLE +VICE_PRESIDENT_QUAYLE ++VICE-PRESIDENT_DAN_QUAYLE ++VICE-PRESIDENT_QUAYLE [USAELI 650101-890120] [USAGOV 890120-930120] [USAELI] AL_GORE_ ; CountryInfo.txt +VICE_PRESIDENT_GORE +VICE_PRESIDENT_AL_GORE ++VICE-PRESIDENT_GORE ++VICE-PRESIDENT_AL_GORE [USAELI 660101-930120] [USAGOV 930120-010120] [USAELI] @@ -51045,6 +51153,8 @@ RICHARD_CHENEY_ ; CountryInfo.txt +DICK_CHENEY_ +VICE_PRESIDENT_CHENEY_ +VICE_PRESIDENT_DICK_CHENEY_ ++VICE-PRESIDENT_CHENEY_ ++VICE-PRESIDENT_DICK_CHENEY_ [USAELI 590101-751101] [USAGOV 010120-090120] [USAGOVMIL 890321-930120] @@ -51053,6 +51163,7 @@ RICHARD_CHENEY_ ; CountryInfo.txt JOE_BIDEN_ ; CountryInfo.txt +VICE_PRESIDENT_BIDEN_ +VICE_PRESIDENT_JOE_BIDEN_ ++VICE-PRESIDENT_JOE_BIDEN [USAELI 600101-000101] [USAGOV >090120] [USAELI] @@ -51449,6 +51560,16 @@ CHUCK_HAGEL +SENATOR_HAGEL [USAGOVLEG 19970103-20090103] # Senator from Nebraska [USAGOVMIL >20130227] # Sec Def +ASHTON_CARTER ++ASH_CARTER ++SECRETARY_ASH_CARTER ++DEFENSE_SECRETARY_ASH_CARTER ++SECRETARY_OF_DEFENSE_ASH_CARTER ++SECRETARY_ASH_CARTER ++DEFENSE_SECRETARY_ASH_CARTER ++SECRETARY_OF_DEFENSE_ASH_CARTER + [USAGOVMIL 20111006-20131203] + [USAGOVMIL >20150217] JOHN_BRENNAN +JOHN_O._BRENNAN +CIA_DIRECTOR_JOHN_BRENNAN @@ -52146,8 +52267,11 @@ THOMAS_S._FOLEY_ ; CountryInfo.txt [USAELI 470101-890606] [USAGOVLEG 890606-950103] NEWT_GINGRICH_ ; CountryInfo.txt ++HOUSE_MINORITY_LEADER_NEWT_GINGRICH ++CONGRESSMAN_GINGRICH [USAELI 610101-950104] [USAGOVLEG 950104-990103] + [USAELI] DENNIS_HASTERT_ ; CountryInfo.txt [USAELI 600101-990106] [USAGOVLEG 990106-070103] @@ -52155,9 +52279,13 @@ NANCY_PELOSI_ ; CountryInfo.txt [USAELI 580101-070104] [USAGOVLEG 070104-110103] JOHN_BOEHNER_ ; CountryInfo.txt ++HOUSE_SPEAKER_JOHN_BOEHNER [USAELI 670101-000101] [USAGOVLEG >110105] # US news organizations ?? +EDWARD_SNOWDEN ++SNOWDEN + [USAOPP] UNITED_REPUBLIC_OF_TANZANIA_ [TZA] +TANZANIAN_ diff --git a/Phoenix.International.actors.txt b/Phoenix.International.actors.txt index b9bc937..2a90ba2 100644 --- a/Phoenix.International.actors.txt +++ b/Phoenix.International.actors.txt @@ -25,11 +25,16 @@ U.N._ UN_SECRETARY_GENERAL +SECRETARY_GENERAL_OF_THE_UNITED_NATIONS_ +SECRETARY_GENERAL_OF_THE_UN ++UN_Secy_Gen ++U.N._SECRETARY_GENERAL ++UN_SEC._GEN ++UNITED_NATIONS_CHIEF ++UNSG [IGOUNO] SECRETARY-GENERAL_BAN_KI-MOON +UN_SECRETARY-GENERAL_BAN_KI-MOON -+UNITED_NATIONS_CHIEF +UNITED_NATIONS_SECRETARY_GENERAL_BAN_KI-MOON ++UNITED_NATIONS_SECRETARY-GENERAL_BAN_KI-MOON +BAN_KI-MOON [IGOUNO >20070101] [KORGOVBUS 2004017-20061201] @@ -1941,6 +1946,9 @@ AL_MEZAN_ [NGOPALHRI]; NGO_Actors AMAZON_WATCH_ [NGOSAMENV]; NGO_Actors AMERICAN_ASSOCIATION_OF_FAMILY_AND_CONSUMER_SCIENCES_ [NGOUSAEDU]; NGO_Actors AMERICAN_ASSOCIATION_OF_JURISTS_ [NGO]; covers all the Americas, all about sovereignty, self-determination, etc.; NGO_Actors +AMERICAN CIVIL LIBERTIES UNION ++ACLU + [NGOUSAHRI] AMERICAN_EDUCATIONAL_RESEARCH_ASSOCIATION_ [NGOUSAEDU]; NGO_Actors AMERICAN_FRIENDS_SERVICE_COMMITTEE_ [NGOCHRHRI]; NGO_Actors AMERICAN_GEOPHYSICAL_UNION_ [NGOEDU]; NGO_Actors @@ -2206,6 +2214,7 @@ HUMAN_RIGHTS_CENTER_OF_AZERBAIJAN_ [NGOAZEHRI]; NGO_Actors HUMAN_RIGHTS_CONGRESS_FOR_BANGLADESH_MINORITIES_ [NGOBGDHRI]; NGO_Actors HUMAN_RIGHTS_FIRST_ [NGOUSAHRI]; NGO_Actors HUMAN_RIGHTS_FOUNDATION_OF_TURKEY_ [NGOTURHRI]; NGO_Actors +HUMAN_RIGHTS_WATCH [NGOHRI] HUMAN_SCIENCES_RESEARCH_COUNCIL_ [NGOZAFDEV]; NGO_Actors HUMAN_STRATEGIES_FOR_HUMAN_RIGHTS_ [NGOHRI]; NGO_Actors ICRC_ [NGOHLHIRC]; part of Intl Red Cross & Red Crescent Movement; NGO_Actors diff --git a/Phoenix.IssueCoding.txt b/Phoenix.IssueCoding.txt index ceae62b..8662efa 100755 --- a/Phoenix.IssueCoding.txt +++ b/Phoenix.IssueCoding.txt @@ -129,6 +129,11 @@ geothermal energy [RENEWABLE_ENERGY] geothermal power [RENEWABLE_ENERGY] + +south to south [SOUTH-TO-SOUTH] +south-to-south [SOUTH-TO-SOUTH] +knowledge exchange [SOUTH-TO-SOUTH] + eu [EUROPEAN_UNION] diff --git a/Phoenix.MilNonState.actors.txt b/Phoenix.MilNonState.actors.txt index bcaa1ff..ca48f37 100644 --- a/Phoenix.MilNonState.actors.txt +++ b/Phoenix.MilNonState.actors.txt @@ -33,12 +33,6 @@ ADEN_ABYAN_ISLAMIC_ARMY_(AAIA)_ [YEMREB] # kkl 21 Mar 13 +JAYSH_ADAN_ +MUHAMMEDS_ARMY_ -AL-QAEDA_ [IMGMUSALQ] # kkl 21 Mar 13 -+AL_QAIDA_ -+QIDAT_AL-JIHAD_ -+AL-QAIDA -+AL_QAIDA-AFFILIATED - AL-INTIQAMI_AL-PAKISTANI_ [KKLREB] # kkl 21 Mar 13 +REVENGE_OF_JEHADI_ +REVENGE_OF_THE_PAKISTANIS_ @@ -160,6 +154,8 @@ HAMAS_ # kkl 21 Mar 13 SHEIKH_AHMED_YASSIN +AHMED_YASSIN +SHEIKH_AHMED_ISMAIL_HASSAN_YASSIN ++ABU_ZUHRI ++SAMI_ABU_ZUHRI [PSEREBHMS 19870101-20040322] IZZ_AD-DIN_AL_QASSAM @@ -531,6 +527,7 @@ PEOPLE'S_REVOLUTIONARY_ARMY_(ARGENTINA)_ [KKLREB] # kkl 21 Mar 13 SANDINISTAS_ [NICREB] # kkl 21 Mar 13 +SANDINISTA_NATIONAL_LIBERATION_FRONT_ ++SANDINISTA_FRONT CONTRAS_ [NICREB] # kkl 21 Mar 13 +COUNTER_REVOLUTIONARIES_ @@ -595,6 +592,11 @@ ANDRES_CASTRO_UNITED_FRONT_ [NICREB] # kkl 21 Mar 13 HEZBOLLAH_ [LBNREB] # kkl 21 Mar 13 +HIZBULLAH +HIZBALLAH ++HIZBALLAH ++HIZBULLAH ++HEZBALLAH ++HIZBOLLAH ++HIZB_ALLAH +ISLAMIC_JIHAD_ +ISLAMIC_JIHAD_FOR_THE_LIBERATION_OF_PALESTINE_ +ORGANIZATION_OF_THE_OPPRESSED_ON_EARTH_ @@ -604,7 +606,16 @@ HEZBOLLAH_ [LBNREB] # kkl 21 Mar 13 +HASAN_NASRALLAH +HASSAN_NASRALLAH +SAYYID_HASSAN_NASRALLAH ++SHEIK_NASRALLAH +NASRALLAH ++SHEIKH_HASSAN_NASRALLAH ++SHEIK_HASSAN_NASRALLAH ++SAYYED_HASSAN_NASRALLAH ++SHEIKH_NASRALLAH ++SEYYED_HASSAN_NASRALLAH ++SAYYED_NASRALLAH ++SAYYID_HASSAN_NASRALLAH ++HASAN_NASRALLAH +IMAD_MUGHNIYEH +IMAD_FAYEZ_MUGHNIYEH +IMAD_MUGHNIYAH @@ -1115,19 +1126,36 @@ AL-QAEDA_ORGANIZATION_IN_THE_ISLAMIC_MAGHREB_ [AFRREB] # kkl 21 Mar 13 AL-AQSA_MARTYRS_BRIGADES_ [MEAREB] # kkl 21 Mar 13 +AL-AQSA_ ++AL_AKSA ++AL_AQSA_MARTYRS_BRIGADES ++AL_AQSA_BRIGADES AL_QA'IDA +AL_QAEDA -+AL_QAEDA_IN_IRAQ +#+AL_QAEDA_IN_IRAQ +AL_QAEDA_LINKED_ABU_SAYYAF +AL_QAIDA ++AL_QA'EDA +QAEDA_GROUP ++AL-QA'IDA ++AL-QAEDA ++AL-QAEDA_IN_IRAQ ++AL-QAEDA_LINKED_ABU_SAYYAF ++AL-QAIDA ++AL-QA'EDA ++AL_QAIDA_ ++QIDAT_AL-JIHAD_ ++AL_QAIDA-AFFILIATED ++AL_QAIDA_OFFSHOOT ++AL_QAEDA_OPERATIVES [IMGMUSALQ] OSAMA_BIN_LADEN_ +USAMA_BIN_LADEN +BIN_LADEN +OSAMA_BIN_MOHAMMED_BIN_AWAD_BIN_LADEN ++USAMA_BIN_LADIN ++OSAMA_BIN_LADIN [IMGMUSALQ] # Date range to limit historical articles? AYMAN_AL_ZAWAHIRI +AL_ZAWAHIRI @@ -2037,8 +2065,19 @@ FREE_PEOPLE_OF_GALILLEE_ [ISRREB] # kkl 21 Mar 13 AL-QAEDA_IN_THE_ARABIAN_PENINSULA [IMG] # kkl 21 Mar 13 +AQAP ++NASIR_AL-WUHAYSHI ++NASSER_AL_WAHAYSHI ++NASIR_ABDEL_KARIM_AL-WUHAYSHI ++NASER_AL-WAHISHI ++NASSER_AL-WUHAYSHI ++ABU_BASIR +AL-AWLAKI ++AL_AWLAKI +ANWAR_AL-AWLAKI ++ANWAR_AL_AWLAKI ++AWLAQI ++AULAQI ++ANWAR_AWLAKI COMMUNIST_LIBERATION_FACTION_ [GRCREB] # kkl 21 Mar 13 diff --git a/Phoenix.agents.txt b/Phoenix.agents.txt index 1d146e1..7eb707c 100644 --- a/Phoenix.agents.txt +++ b/Phoenix.agents.txt @@ -58,25 +58,30 @@ AGRICULTURALIST [~AGR] AGRICULTURIST [~AGR] +CATTLE!PERSON! [~AGR] +CATTLE_RANCHER [~AGR] CROPPER [~AGR] CULTIVATOR [~AGR] +DAIRY!PERSON! [~AGR] +DAIRY_FARMER [~AGR] FARMER [~AGR] FARM_LABOURER [~AGR] FARM_WORKER [~AGR] -FISHER!PERSON! [~AGR] FISHER [~AGR] +FISHER!PERSON! [~AGR] GRANGER [~AGR] HERDS!PERSON! [~AGR] HUSBAND!PERSON![~AGR] INDIGENOUS_FARMER [~AGR] MILLS_ASSOCIATION [~AGR] +ORCHARDIST [~AGR] +PEASANT [~AGR] RANCHER [~AGR] SHARECROPPER [~AGR] SHARECROP_FARMER [~AGR] SODBUSTER [~AGR] SUBSISTENCE_FARMER [~AGR] TENANT_FARMER [~AGR] -PEASANT [~AGR] BUDDHIST [~BUD] BUDDHIST_CLERGY!PERSON! [~BUD] @@ -92,7 +97,8 @@ AEROSPACE [~BUS] AIRLINE [~BUS] AIRLINE_BUSINESS [~BUS] AIRWAY [~BUS] -ARMS_INDUSTRY [~BUS] +AGROBUSINESS [~BUSAGR] +ARMS_INDUSTRY [~BUSMIL] AUTOMAKER [~BUS] AUTO_MAKER [~BUS] AUTO_MANUFACTURER [~BUS] @@ -197,7 +203,7 @@ CHRISTIAN_MISSIONARY [~CHR] CHRISTIAN_MONASTARY [~CHR] CHRISTIAN_MONK [~CHR] CHRISTIAN_PRIEST [~CHR] -# CHRISTIAN_SAINT [~CHR] # pas 14.01.27: generally is going to be an historical reference +# CHRISTIAN_SAINT [~CHR] # PAS 14.01.27: GENERALLY IS GOING TO BE AN HISTORICAL REFERENCE DIOCESE [~CHR] HIERARCH [~CHRCTH] HIGH_PRIEST [~CHRCTH] @@ -207,6 +213,7 @@ PRELATE [~CHRCTH] PROTESTANT_MISSIONARY [~CHRPRO] UNITARIAN [~RELCHR] +# POSSE [~COP] # PAS 14.01.27: OFTEN AS NOT VIGILANTES ANTI-DRUG_AGENT [~COP] ANTI_RIOT_POLICE {} [~COP] ARMED_BORDER_PATROL [~COP] @@ -231,19 +238,23 @@ DRUG_ENFORCEMENT [~COP] FEDERAL_POLICE {} [~COP] GENDARMERY {GENDARMERIE} [~COP] HEAD_OF_NATIONAL_POLICE {HEADS_OF_NATIONAL_POLICE } [~COP] +HOMICIDE_DETECTIVE [~COP] INVESTIGATIVE_AGENCY [~COP] JAIL_GUARD [~COP] +LAWMAN {LAWMEN} [~COP] +LAW_ENFORCEMENT [~COP] LAW_ENFORCEMENT_AGENCY [~COP] LAW_ENFORCEMENT_AGENTS [~COP] LAW_ENFORCEMENT_AUTHORITY [~COP] LAW_ENFORCEMENT_OFFICER [~COP] LAW_ENFORCEMENT_OFFICIAL [~COP] -LAWMAN {LAWMEN} [~COP] +LOCAL_LAW_ENFORCEMENT [~COP] NARCOTICS_OFFICER [~COP] NATIONAL_POLICE {} [~COP] NATIONAL_POLICE_CHIEF [~COP] -POLICE!PERSON! [~COP] +NATIONAL_SECURITY_FORCE [~MIL] # HACKISH FIX FOR ANSF POLICE {} [~COP] +POLICE!PERSON! [~COP] POLICE_CAPTAIN [~COP] POLICE_CHIEF [~COP] POLICE_COMMISSIONER [~COP] @@ -255,22 +266,22 @@ POLICE_OFFICER [~COP] POLICE_OFFICIAL [~COP] POLICE_PERSONNEL [~COP] POLICE_POST [~COP] -# POSSE [~COP] # pas 14.01.27: often as not vigilantes -PRISONS_DEPARTMENT [~COP] PRISON [~COP] +PRISONS_DEPARTMENT [~COP] PRISON_HOUSE [~COP] PUBLIC_SECURITY_AUTHORITY [~COP] PUBLIC_SECURITY_BUREAU [~COP] RIOT_POLICE {} [~COP] SECURITY_CHECK [~COP] SECURITY_FORCE [~COP] -NATIONAL_SECURITY_FORCE [~MIL] # hackish fix for ANSF SECURITY_OFFICER [~COP] SECURITY_OFFICIAL [~COP] SHERIFF [~COP] +SHERIFF_DEPUTY [~COP] STATE_PRISON [~COP] -TROOPER [~COP] +STATE_TROOPER [~COP] +# DEALER [~CRM] ABDUCTOR [~CRM] ARMED_BANDIT [~CRM] ARMS-RUNNER [~CRM] @@ -282,6 +293,7 @@ BLACKMAILER [~CRM] BRANOKKER [~CRM] BRIGAND [~CRM] BURGLAR [~CRM] +CARJACKER [~CRM] CARTEL [~CRM] CATTLE_THIEF {CATTLE_THIEVES} [~CRM] CONMAN {CONMEN} [~CRM] @@ -293,7 +305,6 @@ CRIMINAL [~CRM] CROOK [~CRM] CULPRIT [~CRM] CUTPURSE [~CRM] -DEALER [~CRM] DRUG_DEALER [~CRM] DRUG_GANG [~CRM] DRUG_KINGPIN [~CRM] @@ -309,13 +320,14 @@ EXTORTIONER [~CRM] EXTORTIONIST [~CRM] FELON [~CRM] FORGER [~CRM] +GANG [~CRM] GANGDOM {} [~CRM] GANGLAND [~CRM] GANGSTER [~CRM] -GANG [~CRM] GAOLBIRD [~CRM] GUNRUNNER [~CRM] HOLDUP_MAN {} [~CRM] +HOUSEBREAKER [~CRM] HUMAN_TRAFFICKER [~CRM] ILLEGAL_IMMIGRANT [~CRM] ILLEGAL_MIGRANT [~CRM] @@ -347,13 +359,15 @@ PERPETRATOR [~CRM] PICKPOCKET [~CRM] PILFERER [~CRM] PIRATE [~CRM] +RAPIST [~CRM] +RAPIST_MURDERER [~CRM] ROBBER [~CRM] RUMRUNNER [~CRM] RUSTLER [~CRM] SAFEBREAKER [~CRM] SAFECRACKER [~CRM] SEA_ROBBER [~CRM] -SEA_ROVER [~CRM] # arggghhhhh +SEA_ROVER [~CRM] # ARGGGHHHHH SERIAL_KILLER [~CRM] SERIAL_MURDERER [~CRM] SHOPLIFTER [~CRM] @@ -404,7 +418,7 @@ MIGRANT_WORKER [~CVL] MOB [~CVL] MOTHER [~CVL] MOURNER [~CVL] -# NATIONAL [~CVL] # terrible idea. +# NATIONAL [~CVL] # TERRIBLE IDEA. NATIVE [~CVL] NATIVE_PEOPLE [~CVL] NATURALIZED [~CVL] @@ -417,7 +431,7 @@ NON-RESIDENT [~CVL] ONLOOKER [~CVL] PASSENGER [~CVL] PASSENGER_AIRLINER [~CVL] -PASSENGER_JET [~CVL] # pas 14.01.27: original context was terrorist attacks but this is too general ALH: given Malayia stuff, I think it's worth keeping +PASSENGER_JET [~CVL] # PAS 14.01.27: ORIGINAL CONTEXT WAS TERRORIST ATTACKS BUT THIS IS TOO GENERAL ALH: GIVEN MALAYIA STUFF, I THINK IT'S WORTH KEEPING POPULATION [~CVL] PRIVATE_CITIZEN [~CVL] PROPERTY_OWNER [~CVL] @@ -431,7 +445,7 @@ SHOPKEEPER [~CVL] SIGHTSEER [~CVL] SLUM_DWELLER [~CVL] SMALL_TOWN [~CVL] -# SOLDIERS_FAMILIES [~CVL] # figure out possessive +# SOLDIERS_FAMILIES [~CVL] # FIGURE OUT POSSESSIVE TAXPAYERS [~CVL] TENANT [~CVL] THE_POOR {} [~CVL] @@ -446,37 +460,61 @@ VICTIMS [~CVL] VILLAGER [~CVL] VILLAGE [~CVL] VOTER [~CVL] -WOMAN [~CVL] # possibility for mis-coding. This is provisional +WOMAN [~CVL] # POSSIBILITY FOR MIS-CODING. THIS IS PROVISIONAL WOMEN [~CVL] -ACADEMICIAN [~EDU] ACADEMIC [~EDU] +ACADEMICIAN [~EDU] COLLEGE [~EDU] COLLEGIAN [~EDU] CONSERVATORY [~EDU] +DEAN [~EDU] +DOCTORAL_CANDIDATE [~EDU] DOCTORAL_STUDENT [~EDU] ECONOMIC_EXPERT [~EDU] ECONOMIST [~EDU] EDUCATEE [~EDU] EDUCATIONAL_INSTITUTION [~EDU] +EDUCATOR [~EDU] +HEADMASTER [~EDU] +HIGH_SCHOOL [~EDU] +HIGH_SCHOOLER [~EDU] +HISTORIAN [~EDU] INTELLECTUAL [~EDU] KINDERGARDEN [~EDU] KINDERGARTEN [~EDU] +KINDERGARTNER [~EDU] LECTURER [~EDU] -PROFESSOR [~EDU] +MIDDLE_SCHOOL [~EDU] +MIDDLE_SCHOOLER [~EDU] PRESCHOOL [~EDU] +PROFESSOR [~EDU] +PROFESSOR_EMERITUS [~EDU] PUPIL [~EDU] RESEARCH_INSTITUTION [~EDU] SCHOLAR [~EDU] -SCHOOLHOUSE [~EDU] SCHOOL [~EDU] +SCHOOLHOUSE [~EDU] +SCHOOLTEACHER [~EDU] SCIENCE_CONGRESS [~EDU] +SOCIOLOGIST [~EDU] +STUDENT [~EDU] STUDENTS_AND_PROFESSOR [~EDU] STUDENTS_AND_TEACHER [~EDU] -STUDENT [~EDU] -TEACHER [~EDU] TEACHER [~EDU] UNIVERSITY [~EDU] +FIRST_GRADER [~EDU] +SECOND_GRADER [~EDU] +THIRD_GRADER [~EDU] +FOURTH_GRADER [~EDU] +FIFTH_GRADER [~EDU] +SIXTH_GRADER [~EDU] +SEVENTH_GRADER [~EDU] +EIGHTH_GRADER [~EDU] +NINTH_GRADER [~EDU] +TENTH_GRADER [~EDU] +ELEVENTH_GRADER [~EDU] +TWELFTH_GRADER [~EDU] ACTOR [~ELI] FIRST_FAMILY [~ELI] @@ -484,7 +522,7 @@ FIRST_LADY [~ELI] FORMER_PRIME_MINISTER [~ELI] FORMER_PRESIDENT [~ELI] HONORARY_CONSUL [~ELI] -# PRESIDENT'S_CHILD [~ELI] # figure out possessives +# PRESIDENT'S_CHILD [~ELI] # FIGURE OUT POSSESSIVES # PRESIDENT'S_HUSBAND [~ELI] # PRESIDENT'S_SPOUSE [~ELI] # PRESIDENT'S_WIFE [~ELI] @@ -494,9 +532,11 @@ VIP [~ELI] CONSERVATIONIST [~ENV] DEPARMENT_OF_ENVIRONMENT [~ENV} ECOLOGIST [~ENV] +ECO_WARRIOR [~ENV] ENVIRONMENTALIST [~ENV] -GREEN_PARTY [~ENV] # should sort out the PTY thing, but not yet +GREEN_PARTY [~ENV] # SHOULD SORT OUT THE PTY THING, BUT NOT YET TREE_HUGGER [~ENV] +WILDLIFE_CONSERVATIONIST [~ENV] ADMINISTRATION [~GOV] ADMINISTRATIVE_BODY [~GOV] @@ -638,7 +678,7 @@ EMPRESS [~GOV] ENERGY_MINIST [~GOV] ENERGY_SECRETARY [~GOV] ENT_AFFAIRS_MINIST [~GOV] -ENVIRONMENTAL_PROTECTION_AGENCY [~ENV] # there are state ones, not just the US EPA +ENVIRONMENTAL_PROTECTION_AGENCY [~ENV] # THERE ARE STATE ONES, NOT JUST THE US EPA ENVIRONMENT_MINIST [~GOVENV] ENVOY [~GOV] ENVOY_EXTRAORDINARY [~GOV] @@ -759,9 +799,9 @@ MILITARY_RULE [~GOVMIL] MINES_!MINST! [~GOV] MINES_OFFICIAL [~GOV] !MINST! [~GOV] -# Note: some of these are really esoteric: they were extracted from CIA World Leaders lists -# ALH: Also, a bunch (all?) of these should also be OF, rather than just FOR -!MINST! DE_OBRAS_PÚBLICAS_SERVICIOS_Y_VIVIENDA [~GOV] +# NOTE: SOME OF THESE ARE REALLY ESOTERIC: THEY WERE EXTRACTED FROM CIA WORLD LEADERS LISTS +# ALH: ALSO, A BUNCH (ALL?) OF THESE SHOULD ALSO BE OF, RATHER THAN JUST FOR +!MINST! DE_OBRAS_PÊBLICAS_SERVICIOS_Y_VIVIENDA [~GOV] !MINST! FOR_ YOUTH_AND_SPORTS [~GOV] !MINST! FOR_AGRICULTURE,_FISHERIES_AND_FOOD [~GOVAGR] !MINST! FOR_AGRICULTURE [~GOVAGR] @@ -891,7 +931,7 @@ MINES_OFFICIAL [~GOV] !MINST! FOR_WORKS [~GOV] !MINST! FOR_YOUTH,_SPORTS_AND_RECREATION [~GOV] !MINST! FOR_YOUTH_AND_SPORT [~GOV] -# Note that the FOR/OF can be further generalized using a substitution set +# NOTE THAT THE FOR/OF CAN BE FURTHER GENERALIZED USING A SUBSTITUTION SET !MINST! GENERAL_SECRETARIAT_OF_THE_PRESIDENCY [~GOV] !MINST! OF_YOUTH_AND_SPORTS [~GOV] !MINST! OF_AGRICULTURE [~GOVAGR] @@ -1235,34 +1275,47 @@ HINDU_MONASTARY [~HIN] HINDU_MONK [~HIN] HINDU_PILGRIM [~HIN] HINDU_PRIEST [~HIN] -# HINDU_SAINT [~HIN] # pas 14.01.27: generally is going to be an historical reference +# HINDU_SAINT [~HIN] # PAS 14.01.27: GENERALLY IS GOING TO BE AN HISTORICAL REFERENCE KANIDURGU [~HIN] SADHU [~HIN] -CAREGIVER [~HLH] -CASEWORKER [~HLH] + CENTER_FOR_HUMAN_RIGHTS {CENTERS_FOR_HUMAN_RIGHTS} [~HRI] CENTRE_FOR_HUMAN_RIGHTS {CENTRES_FOR_HUMAN_RIGHTS} [~HRI] +RIGHTS_ACTIVIST [~HRI] +RIGHTS_GROUP [~HRI] +HUMAN_RIGHTS_GROUP [~HRI] +HUMAN_RIGHTS_LEADER [~HRI] +HUMAN_RIGHTS_SOCIETY [~HRI] +MEDIA_RIGHTS_GROUP [~HRI] -DOCTOR [~HLH] + +ANAESTHESIOLOGIST [~HLH] +ANESTHETIST [~HLH] +CARDIOLOGIST [~HLH] +CAREGIVER [~HLH] +CASEWORKER [~HLH] +DENTIST [~HLH] DOC {} [~HLH] +DOCTOR [~HLH] FOSTER-NURSE [~HLH] +GASTROENTEROLOGIST [~HLH] GENERAL_PRACTITIONER [~HLH] GRADUATE_NURSE [~HLH] +GYNECOLOGIST [~HLH] HEALTHCARE_FACILITIY [~HLH] HEALTH_CARE_PROVIDER [~HLH] HEALTH_FACILITY [~HLH] HEALTH_PROFESSIONAL [~HLH] HOSPITAL [~HLH] HOUSE_PHYSICIAN [~HLH] -HUMAN_RIGHTS_LEADER [~HRI] -HUMAN_RIGHTS_SOCIETY [~HRI] INFIRMARY [~HLH] -MEDIA_RIGHTS_GROUP [~HRI] +INTERNIST [~HLH] +MEDIC [~HLH] +MEDICAL_!PERSON! [~HLH] MEDICAL_ASSOCIATION [~HLH] MEDICAL_BUILDING [~HLH] MEDICAL_INSTITUTION [~HLH] -MEDICAL_!PERSON! [~HLH] MEDICAL_PERSONNEL [~HLH] MEDICAL_PRACTITIONER [~HLH] MEDICAL_SOCIAL_WORKER [~HLH] @@ -1271,12 +1324,23 @@ MEDICO [~HLH] MENTAL_INSTITUTION [~HLH] MIDWIFE {MIDWIVE} [~HLH] NANNY [~HLH] -NURSEMAID [~HLH] +NEUROLOGIST [~HLH] +NEUROSURGEON [~HLH] NURSE [~HLH] +NURSEMAID [~HLH] +NURSE_ANESTHETIST [~HLH] +NURSE_PRACTITIONER [~HLH] +ONCOLOGIST [~HLH] OPERATING_SURGEON [~HLH] +OPTHAMOLOGIST [~HLH] +ORTHOPEDIC_SURGEON [~HLH] +ORTHOPEDIST [~HLH] +PEDIATRICIAN [~HLH] PHARMACEUTICAL_FIRM [~HLH] PHYSICIAN [~HLH] +PODIATRIST [~HLH] PRIMARY_HEALTH_PROVIDER [~HLH] +PSYCHIATRIST [~HLH] REGISTERED_NURSE [~HLH] RESIDENT_PHYSICIAN [~HLH] SANATARIUM [~HLH] @@ -1286,14 +1350,10 @@ SOCIAL_WORKER [~HLH] SURGEON [~HLH] TINGINIST [~HLH] TRAINED_NURSE [~HLH] +UROLOGIST [~HLH] WELFARE_WORKER [~HLH] - -RIGHTS_ACTIVIST [~HRI] -RIGHTS_GROUP [~HRI] -HUMAN_RIGHTS_GROUP [~HRI] - -# Need Jay or someone else to look these over. -# MIL if they're mil, and REB if not mentioned? +# NEED JAY OR SOMEONE ELSE TO LOOK THESE OVER. +# MIL IF THEY'RE MIL, AND REB IF NOT MENTIONED? COMMUNIST_REBEL [~REB] COUP_D'ETAT_LEADER [~REB] COUP_LEADER [~REB] @@ -1305,9 +1365,15 @@ MILITARY_COUP_D'ETAT_LEADER [~MIL] MILITARY_COUP_LEADER [~MIL] CANTOR [~JEW] +HASID [~JEW] +HASIDIM [~JEW] HEBREW [~JEW] JEW [~JEW] +JEWISH [~JEW] +ORTHODOX_JEW [~JEW] RABBI [~JEW] +TORAH_SCHOLAR [~JEW] + ADJUDICATION_COURT [~JUD] ADVOCATE [~JUD] @@ -1387,8 +1453,10 @@ TRIAL_ATTORNEY [~JUD] TRIAL_LAWYER [~JUD] TRIBUNAL [~JUD] +# UNION [~LAB] ALL EU WAS GETTING LAB COMPANY_UNION [~LAB] EMPLOYEE [~LAB] +LABORER [~LAB] LABOR_UNION [~LAB] LABOUR_ACTIVIST [~LAB] ORGANIZED_LABOR [~LAB] @@ -1398,14 +1466,13 @@ TRADES_UNION [~LAB] TRADE_UNION [~LAB] TRANSPORTATION_WORKER [~LAB] TRANSPORT_WORKER [~LAB] -# UNION [~LAB] All EU was getting LAB UNION_REPRESENTATIVE [~LAB] +WORKER [~LAB] WORKERS'_ACTION_COUNCIL [~LAB] WORKERS'_FEDERATION [~LAB] WORKERS_ACTION_COUNCIL [~LAB] WORKERS_FEDERATION [~LAB] WORKERS_ORGANIZATION [~LAB] -WORKER [~LAB] WORKER_ORGANIZATION [~LAB] ASSEMBLAGE [~LEG] @@ -1535,8 +1602,13 @@ WEB_SITE [~MED] WIRE_SERVICE [~MED] WRITER [~MED] +#DEFENCE_FORCE [~MIL] +1ST_LT. [~MIL] +A-37B_DRAGONFLY [~MIL] ADM. {} [~MIL] ADMIRAL [~MIL] +AH-64D_APACHE [~MIL] +AH-64_APACHE [~MIL] AIDE_DE_CAMP [~MIL] AIRCRAFT_CARRIER [~MIL] AIRMAN {} [~MIL] @@ -1545,6 +1617,10 @@ AIR_FORCE_CHIEF [~MIL] AIR_FORCE_COMMANDER_IN_CHIEF [~MIL] AIR_MARSHAL [~MIL] AIR_UNIT [~MIL] +ANTIAIRCRAFT_MISSILE [~MIL] +ANTISHIP_MISSILE [~MIL] +APACHE_ATTACK_HELICOPTER [~MIL] +APACHE_GUNSHIP [~MIL] ARMED_FORCES [~MIL] ARMED_PATROLS [~MIL] ARMED_TROOPS [~MIL] @@ -1564,24 +1640,31 @@ ARMY_STAFF [~MIL] ARMY_UNIT [~MIL] ARMY_VICE_CHIEF_OF_STAFF [~MIL] ARTILLERY [~MIL] +ARTILLERY_SYSTEM [~MIL] ATTACK_CRAFT [~MIL] -ATTACK_HELICOPTERS [~MIL] ATTACK_HELICOPTER [~MIL] +ATTACK_HELICOPTERS [~MIL] +B-52 [~MIL] +BARRACKS [~MIL] BATTALION [~MIL] +BATTALION_COMMANDER [~MIL] BATTLESHIP [~MIL] BATTLEWAGON [~MIL] BATTLE_GROUP [~MIL] BATTLE_TANK [~MIL] +BOMBER [~MIL] BORDER_GUARD [~MIL] BORDER_SECURITY [~MIL] BRIG._GEN. [~MIL] BRIG._GENERAL [~MIL] +BRIGADE_COMMANDER [~MIL] BRIGADIER_GENERAL [~MIL] BRIGAIDER [~MIL] CAPITAL_SHIP [~MIL] CAPT. [~MIL] CAPTAIN [~MIL] CARRIER [~MIL] +CH-47F_CHINOOK [~MIL] CHIEF'S_OFFICE [~MIL] CHIEF_OF_STAFF_OF_THE_ARMY [~MILGOV] CHIEF_OF_THE_AIR_FORCE [~MILGOV] @@ -1607,22 +1690,40 @@ COMMANDING_GENERAL [~MIL] COMMANDING_OFFICER [~MIL] COMMANDO [~MIL] CONTROL_FORCES [~MIL] +CORPORAL [~MIL] CORVETTE [~MIL] CRUISER [~MIL] +CRUISE_MISSILE [~MIL] C_IN_COF [~MIL] C_IN_C_OF [~MIL] -#DEFENCE_FORCE [~MIL] DEFENSE_FORCE [~MIL] -DEFENSE_SERVICES_INTELLIGENCE [~MILSPY] DEFENSE_SERVICE [~MIL] +DEFENSE_SERVICES_INTELLIGENCE [~MILSPY] DESTROYER [~MIL] +DRONE_AIRCRAFT [~MIL] ECHELON [~MIL] ENS. [~MIL] ENSIGN [~MIL] +EUROFIGHTER_TYPHOON [~MIL] +F-16 [~MIL] +F-16_JET [~MIL] +F-22A_RAPTOR [~MIL] +F-22_RAPTOR [~MIL] +F-7MG [~MIL] +F/A-18 [~MIL] +F/A-18E/F_SUPER_HORNET [~MIL] +F/A-18_FIGHTER [~MIL] +F/A-18_FIGHTER_JET [~MIL] +F/A-22_FIGHTER [~MIL] +F/A-22_RAPTOR [~MIL] FIELD_MARSHAL [~MIL] +FIGHTER_AIRCRAFT [~MIL] FIGHTER_BOMBER [~MIL] +FIGHTER_BOMBERS [~MIL] FIGHTER_JET [~MIL] FIGHTER_PLANE [~MIL] +FIGHTING_FALCON [~MIL] +FIGHTING_POSITION [~MIL] FIRST_LIEUTENANT [~MIL] FIRST_LT. [~MIL] FLAG_OFFICER [~MIL] @@ -1646,8 +1747,14 @@ GROUND_FORCES [~MIL] GROUND_TROOP [~MIL] GUARD_COMMAND [~MIL] GUARD_SHIP [~MIL] +HARRIER_JET [~MIL] +HEAVY_MACHINE_GUN [~MIL] +HELICOPTER_GUNSHIP [~MIL] +HMMWV [~MIL] HOME_RESERVE [~MIL] +HUMVEE [~MIL] INFANTRY [~MIL] +JETFIGHTER [~MIL] JET_FIGHTER [~MIL] JOINT_CHIEFS [~MIL] JOINT_CHIEFS_OF_STAFF [~MIL] @@ -1655,8 +1762,8 @@ JOINT_STRIKE_FIGHTER [~MIL] JUNIOR_OFFICER [~MIL] JUNTA_FORCES [~MIL] JUNTA_SOLDIER [~MIL] -JUNTA_TROOPS [~MIL] JUNTA_TROOP [~MIL] +JUNTA_TROOPS [~MIL] KFIR [~MIL] LANDING_SHIP [~MIL] LAND_FORCE [~MIL] @@ -1673,6 +1780,11 @@ MAJ. [~MIL] MAJOR_GENERAL [~MIL] MARINES [~MIL] MARINE_CORP [~MIL] +MARINE_CORPS_GUNNERY_SERGEANT [~MIL] +MASTER_SERGEANT [~MIL] +MI-24VM/HIND [~MIL] +MIG [~MIL] +MIG-21PFM [~MIL] MILITARY [~MIL] MILITARY_ADVISER [~MIL] MILITARY_ADVISOR [~MIL] @@ -1706,6 +1818,9 @@ MILITARY_SPOKES!PERSON! [~MIL] MILITARY_SUPPORT_PERSONNEL [~MIL] MILITARY_TRANSPORT_PLANE [~MIL] MILITARY_TRIBUNAL [~MILJUD] +MIRAGE-2000 [~MIL] +MORTAR_POSITION [~MIL] +MQ-9_REAPER [~MIL] NATIONAL_ARMY_DETACHMENT [~MIL] NATIONAL_ARMY_TASK_FORCE [~MIL] NATIONAL_GENDARMERIE [~MIL] @@ -1717,8 +1832,11 @@ NAVAL_OFFICER [~MIL] NAVAL_SHIP [~MIL] NAVAL_UNIT [~MIL] NAVY [~MIL] +NIGHTHAWK_STEALTH_FIGHTER [~MIL] OFFICER_IN_COMMAND {OFFICERS_IN_COMMAND} [~MIL] OFFICE_OF_THE_AIR_FORCE_COMMANDER_IN_CHIEF [~MIL] +P-3A_ORION [~MIL] +P-8A_POSEIDON [~MIL] PARAMILITARY [~MIL] PARAMILITARY_FORCE [~MIL] PARAMILITARY_ORGANISATION [~MIL] @@ -1727,11 +1845,19 @@ PARAMILITARY_POLICE {} [~MILGOV] PARAMILITARY_UNIT [~MIL] PARATROOPS [~MIL] PHALANX [~MIL] -PRIVATEER [~MIL] +PILOTLESS_PLANE [~MIL] +PREDATOR_DRONE [~MIL] +PREDATOR_UAV [~MIL] PRISONER_OF_WAR {PRISONERS_OF_WAR} [~MIL] +PRIVATEER [~MIL] +REAPER_DRONE [~MIL] REGIMENT [~MIL] +REMOTELY_PILOTED_AIRCRAFT [~MIL] +REMOTELY_PILOTED_DRONES [~MIL] RESERVE_OFFICER [~MIL] RESERVIST [~MIL] +RF_4C [~MIL] +SCUD_MISSILE [~MIL] SEAMAN {SEAMEN} [~MIL] SECOND_LIEUTENANT [~MIL] SECURITY_FORCE [~MIL] @@ -1747,28 +1873,53 @@ SOLDIERY [~MIL] SPECIAL_BATTALION [~MIL] SPECIAL_FORCE [~MIL] SPECIAL_OPERATIONS [~MIL] -SPY_PLANE [~MIL] +SPY_PLANE [~MILSPY] STANDING_ARMY [~MIL] +STEALTH_BOMBER [~MIL] +STEALTH_FIGHTER [~MIL] STRATEGIC_SERVICE [~MIL] +SU-24 [~MIL] +SU-30MK [~MIL] SUBLIEUTENANT [~MIL] SUBMERSIBLE_WARSHIP [~MIL] +SUKHOI_PAK_FA [~MIL] +SUPER_HORNET [~MIL] +TACTICAL_UNIT [~MIL] +TACTICAL_VEHICLE [~MIL] +TOMAHAWK_CRUISE_MISSILE [~MIL] +TOMAHAWK_MISSILE [~MIL] +TOMCAT_FIGHTER [~MIL] TORPEDO_BOAT [~MIL] TROOP [~MIL] +UNMANNED_AERIAL_DRONE [~MIL] +UNMANNED_AERIAL_SYSTEM [~MIL] +UNMANNED_AERIAL_VEHICLE [~MIL] +UNMANNED_AIRCRAFT [~MIL] +UNMANNED_DRONE [~MIL] +UNMANNED_PREDATOR [~MIL] +V-22_OSPREY [~MIL] WARPLANE [~MIL] WARSHIP [~MIL] WAR_MACHINE [~MIL] WAR_VESSEL [~MIL] +WEAPONS_STORAGE_FACILITY [~MIL] WEEKEND_WARRIOR [~MIL] +EXTREMIST_WAHHABI [~MUSRAD] +FUNDAMENTALIST_MUSLIMS [~MUSRAD] +HARDLINE_ISLAMIC [~MUS] IMAM [~MUS] ISLAMIC [~MUS] ISLAMIC_CLERIC [~MUS] ISLAMIC_COUNCIL [~MUS] +ISLAMIC_EXTREMIST ISLAMIC_EXTREMIST_GROUP [~MUSRAD] ISLAMIC_FRONT_ [~MUSREB] +ISLAMIC_FUNDAMENTALIST [~MUS] ISLAMIC_MILITANT [~MUSUAF] ISLAMIC_MISSIONARY [~MUS] ISLAMIC_PREACHER [~MUS] +ISLAMIST [~MUS] ISLAMIST_CLERIC [~MUS] ISLAMIST_GROUP [~MUS] ISLAMIST_MISSIONARY [~MUS] @@ -1786,10 +1937,15 @@ MUSLIM_MILITANT [~MUSUAF] MUSLIM_MISSIONARY [~MUS] MUSLIM_PILGRIM [~MUS] MUSLIM_RADICAL [~MUSRAD] -# MUSLIM_SAINT [~MOS] # pas 14.01.27: generally is going to be an historical reference +# MUSLIM_SAINT [~MUS] # PAS 14.01.27: GENERALLY IS GOING TO BE AN HISTORICAL REFERENCE +RADICAL_ISLAMISTS [~MUSRAD] +RADICAL_SALAFI [~MUSRAD] +SALAFI_JIHADIST [~MUSRAD] + AID_GROUP [~NGODEV] -NGO [~NGO] # Might cause problems with people's names +CIVIL_SOCIETY [~NGO] +NGO [~NGO] # MIGHT CAUSE PROBLEMS WITH PEOPLE'S NAMES NONGOVERNMENAL_ORGANIZATION [~NGO] NON_GOVERNMENTAL_ORGANIZATION [~NGO] NON-GOVERNMENTAL_ORGANIZATION [~NGO] @@ -1807,9 +1963,11 @@ ANTI_GOVERNMENT_UNDERGROUND_GROUP [~OPP] ANTI_GOVERNMENT_YOUTH [~OPPEDU] ANTI_MILITARY_ACTIVIST [~OPP] ARMY_DESERTER [~OPP] +CAMPAIGNER [~OPP] COALITION_OF_MINORITY_PARTIES [~OPP] COALITION_OF_OPPOSITION_PARTIES [~OPP] CRUSADER [~OPP] +CYBERDISSIDENTS [~OPP] DEFECTOR [~OPP] DEMOCRACY_ACTIVIST [~OPP] DEMOCRATIC_OPPOSITION_LEADER [~OPP] @@ -1821,6 +1979,7 @@ DISSIDENT [~OPP] DISSIDENT_STUDENT [~OPPEDU] ELECTORAL_ALLIANCE [~OPP] ETHNIC_MINORITY_PARTIES [~OPP] +EXILE [~OPP] EXILED_GOVERNMENT [~OPP] EXILED_LEADER [~OPP] EXILED_OPPOSITION [~OPP] @@ -1828,7 +1987,6 @@ EXILED_OPPOSITION_POLITICIAN [~OPP] EXILED_POLITICIAN [~OPP] EXILED_PRIME_MINISTER [~OPP] EXILED_REGIME [~OPP] -EXILE [~OPP] GOVERNMENT_DEFECTOR [~OPP] GOVERNMENT_IN_EXILE [~OPP] HUMAN_RIGHTS_ACTIVIST [~OPP] @@ -1854,8 +2012,8 @@ OPPOSITION_FACTION [~OPP] OPPOSITION_FORCES [~OPPUAF] OPPOSITION_JOURNALIST [~OPPMED] OPPOSITION_LEADER [~OPP] -OPPOSITION_MPS [~OPP] OPPOSITION_MP [~OPP] +OPPOSITION_MPS [~OPP] OPPOSITION_NEWSPAPER [~OPPMED] OPPOSITION_PARLIAMENT [~OPP] OPPOSITION_PARTIES [~OPP] @@ -1868,6 +2026,7 @@ OPPOSITION_SENATOR [~OPP] OPPOSITION_STUDENT_LEADER [~OPPEDU] OPPOSITION_SUPPORTER [~OPP] OUSTED_FOREIGN_MINISTER [~OPP] +OUSTED_LEADER [~OPP] OUSTED_PREMIER [~OPP] OUSTED_PRIME_MINISTER [~OPP] OUTLAWED_PARTIES [~OPP] @@ -1880,12 +2039,16 @@ POLITICAL_PARTY_IN_EXILE [~OPP] POLITICAL_PRISONER [~OPP] POLITICAL_WING [~OPP] PRIME_MINISTER_IN_EXILE [~OPP] +PRO-DEMOCRACY_GROUP [~OPPDEV] +PRO-DEMOCRACY_LEADER [~OPP] +PRO-DEMOCRACY_MOVEMENT [~OPP] +PRO-DEMOCRACY_POLITICAL_ACTIVIST [~OPP] +PRO-DEMOCRATIC_LEADER [~OPP] PROTESTER [~OPP] PROTESTING_STUDENT [~OPPEDU] PROTESTING_WORKER [~OPPLAB] PROTEST_GROUP [~OPP] PROTEST_LEADER [~OPP] -# need hyphenated versions of these PRO_DEMOCRACY_GROUP [~OPPDEV] PRO_DEMOCRACY_LEADER [~OPP] PRO_DEMOCRACY_MOVEMENT [~OPP] @@ -1910,11 +2073,14 @@ UNSPECIFIED_OPPOSITION [~OPP] YOUTH_PROTESTER [~OPPEDU] ALLEGED_MILITANTS [~REB] -# need hyphenated versions of these ANTI_GOVERNMENT_ARMED_GROUP [~REB] ANTI_GOVERNMENT_FORCE [~REB] ANTI_GOVERNMENT_INSURGENT [~REB] ANTI_JUNTA_TERRORIST_GROUP [~REB] +ANTI-GOVERNMENT_ARMED_GROUP [~REB] +ANTI-GOVERNMENT_FORCE [~REB] +ANTI-GOVERNMENT_INSURGENT [~REB] +ANTI-JUNTA_TERRORIST_GROUP [~REB] ARMED_DISSIDENT [~REB] ARMED_INSURGENCY [~REB] ARMED_INSURGENT [~REB] @@ -1923,7 +2089,7 @@ ARMED_OPPOSITION_GROUP [~REB] ARMED_REBEL [~REB] ARMED_REBEL_GROUP [~REB] ARMED_TRIBAL_REBEL [~REB] -# move these to the religion sections? +# MOVE THESE TO THE RELIGION SECTIONS? BUDDHIST_REBEL [~REBBUD] BUDDHIST_REBEL_GROUP [~REBBUD] BUDDHIST_REBEL_LEADER [~REBBUD] @@ -2015,6 +2181,11 @@ RESISTANCE_LEADER [~REB] REVOLT [~REB] REVOLUTIONARY_FRONT_ [~REB] REVOLUTIONARY_MOVEMENT_ [~REB] +SHIA_MILITIA [~REBMUS] +SHI'A_MILITIA [~REBMUS] +SHIITE_MILITIA [~REBMUS] +SHI'ITE_MILITIA [~REBMUS] +SUNNI_INSURGENT [~REBMUS] STUDENT_ARMY [~REB] SUICIDE_BOMBER [~REB] TERRORIST_INSURGENT [~REB] @@ -2069,7 +2240,7 @@ RELIGIOUS_LEADER [~REL] WORSHIPER [~REL] WORSHIPPER [~REL] -# SEP is depreciated. Some SEPs are OPP instead of REB, though +# SEP IS DEPRECIATED. SOME SEPS ARE OPP INSTEAD OF REB, THOUGH ARMED_SEPARATIST [~REB] ARMED_SEPARATIST_MOVEMENT [~REB] ARMY_FOR_THE_LIBERATION_ [~REB] @@ -2080,7 +2251,7 @@ LIBERATION_FORCES_ [~REB] LIBERATION_FRONT_ [~REB] LIBERATION_MOVEMENT [~OPP] POPULAR_MOVEMENT_FOR_THE_LIBERATION_ [~REB] -PRO_INDEPENDENCE_ACTIVIST [~OPP] # ? REB seemed wrong +PRO_INDEPENDENCE_ACTIVIST [~OPP] # ? REB SEEMED WRONG REBEL_SEPARATIST [~REB] SEPARATIST [~REB] SEPARATIST_GROUP [~REB] @@ -2090,11 +2261,12 @@ SEPARATIST_MILITANT [~REB] SEPARATIST_MOVEMENT [~REB] SEPARATIST_REBEL [~REB] -# Only use of SET in the dictionaries. Changed to CVL +# ONLY USE OF SET IN THE DICTIONARIES. CHANGED TO CVL SETTLER [~CVL] CENTRAL_INTELLIGENCE_BUREAU [~SPY] CHIEF_OF_INTELLIGENCE [~SPY] +COVERT_OPERATIVE [~SPY] FOREIGN_INTELLIGENCE_SERVICE [~SPY] INTELLIGENCE [~SPY] INTELLIGENCE_ACTIVITY [~SPY] @@ -2108,6 +2280,9 @@ INTELLIGENCE_OFFICER [~SPY] INTELLIGENCE_OPERATION [~SPY] INTELLIGENCE_SERVICE [~SPY] INTER_SERVICE_INTELLIGENCE [~SPY] +MUHABARAT_ [~SPY] +MUKABARAT_ [~SPY] +MUKHABARAT_ [~SPY] NATIONAL_INTELLIGENCE_BUREAU [~SPY] NATIONAL_SECURITY_SERVICE [~SPY] OPERATIVE [~SPY] @@ -2118,9 +2293,6 @@ SPY [~SPY] SPY_AGENCY [~SPY] SPY_SHIP [~SPY] UNDERCOVER_AGENT [~SPY] -MUKHABARAT_ [~SPY] -MUHABARAT_ [~SPY] -MUKABARAT_ [~SPY] ARMED_BAND [~UAF] ARMED_CITIZENS [~UAF] @@ -2129,6 +2301,7 @@ ARMED_GANG [~UAF] ARMED_GROUP [~UAF] ARMED_MEN [~UAF] ARMED_PROFESSIONAL [~UAF] +ASSAILANT [~UAF] COMBATANT [~UAF] DEATH_SQUAD [~UAF] ENEMY_COMBATANT [~UAF] @@ -2151,6 +2324,8 @@ MERCENARY [~UAF] MILITANT [~UAF] MILITARY_WING [~UAF] MILITIA [~UAF] +MILITIAMAN [~UAF] +MILITIAMEN [~UAF] MILITANT [~UAF] MOSLEM_MILITANT [~UAFMUS] MUSLIM_MILITANT [~UAFMUS] @@ -2178,3 +2353,4 @@ OBSERVERS_IN [IGO~] PEACEKEEPING_TROOPS {} [IGO~] TRUCE_MONITOR [IGO~] +