diff --git a/Phoenix.Countries.actors.txt b/Phoenix.Countries.actors.txt index a84406f..b30ec39 100644 --- a/Phoenix.Countries.actors.txt +++ b/Phoenix.Countries.actors.txt @@ -67,7 +67,6 @@ AFGHANISTAN_ [AFG] +MAZAR-I-SHARIF_ +BAGRAM +HELMAND # Other provinces, since they're reported often -+KORENGAL +KUNAR +BADAKHSHAN +BADGHIS @@ -2459,7 +2458,12 @@ JOHN_HOWARD_ ; CountryInfo.txt KEVIN_RUDD_ ; CountryInfo.txt [AUSELI 750101-080101] [AUSGOV 080101-100630] - [AUSGOV >071203] + [AUSGOV 20071203-20131118] + [AUSELI] +TONY_ABBOTT ++ANTHONY_JOHN_ABBOTT + [AUSGOVLEG 19940314-20130918] + [AUSGOV >20130918] [AUSELI] ALAN_GRIFFIN_ ; CountryInfo.txt [AUSGOV 080101-100930] @@ -14081,6 +14085,7 @@ MOHAMED_MORSI_ ; http://www.saudigazette.com.sa/index.cfm?method=home.regcon&con +MOHAMMAD_MORSY_ +MORSY_ +MOHAMMAD_MORSI_ ++MOHAMMED_MORSI +PRESIDENT_MOHAMMED_MORSI_ +PRESIDENT_MOHAMED_MORSI_ +PRESIDENT_MOHAMMED_MURSI_ @@ -16034,6 +16039,7 @@ FRANCE_ [FRA] +RHONE_RIVER_ +SAONE_ +SAONE_RIVER_ ++STRASBOURG # National institutions DGSE +GENERAL_DIRECTORATE_FOR_EXTERNAL_SECURITY @@ -16070,6 +16076,7 @@ NICOLAS_SARKOZY_ ; CountryInfo.txt [FRAELI] FRANCOIS_HOLLANDE +PRESIDENT_HOLLANDE ++HOLLANDE [FRAGOV >120515] [FRAELI] JACQUES_CHABAN_DELMAS_ ; CountryInfo.txt @@ -18452,8 +18459,19 @@ FANI_PALLI_PETRALIA_ ; CountryInfo.txt [GRCGOVLAB 080101-091031] FILIPPOS_PETSALNIKOS_ ; CountryInfo.txt [GRCGOVJUD 030201-040331] +# Greek Prime Ministers GEORGIOS_ANDREAS_PAPANDREOU_ ; CountryInfo.txt - [GRCGOV >101001] ++GEORGE_PAPANDREOU + [GRCGOV 20091006-20111111] +LUCAS_PAPADEMOS ++LUCAS_DEMETRIOS_PAPADEMOS + [GRCGOV 20111111-20120516] +PANAGIOTIS_PIKRAMMENOS + [GRCGOV 20120516-20120620] +ANTONIS_SAMARAS + [GRCGOV 20120620-20150126] +ALEXIS_TSIPRAS + [GRCGOV >20150126] GEORGIOS_NIKOLAS_DENDIAS_ ; CountryInfo.txt [GRCGOVJUD 090301-091031] GEORGIOS_PROVOPOULOS_ ; CountryInfo.txt @@ -22013,6 +22031,7 @@ REVOLUTIONARY_GUARD +ARMY_OF_THE_GUARDIANS_OF_THE_ISLAMIC_REPUBLIC +BASIJ +BASIJI ++QUDS_FORCE [IRNMIL] MOHAMMAD_REZA_PAHLAVI_ ; CountryInfo.txt [IRNELI 370101-410916] @@ -22043,10 +22062,13 @@ HOJATOLISLAM_SAYYED_ALI_KHAMENEI_ ; CountryInfo.txt [IRNGOV >19890604] # Supreme Leader [IRNELI] HOJATOLISLAM_ALI_AKBAR_HASHEMI_RAFSANJANI_ ; CountryInfo.txt ++AYATOLLAH_HASHEMI_RAFSANJANI ++AKBAR_HASHEMI_RAFSANJANI [IRNGOV 890803-970803] [IRNGOV 810830-811013] [IRNELI] -HOJATOLISLAM_MOHAMMAD_KHATAMI_ ; CountryInfo.txt +MOHAMMAD_KHATAMI ++HOJATOLISLAM_MOHAMMAD_KHATAMI_ [IRNELI 610101-970803] [IRNGOV 970803-050803] [IRNELI] @@ -22278,6 +22300,8 @@ MOHAMMAD_ABBASI_ ; CountryInfo.txt [IRNGOV >080101] MOHAMMAD_ALI_ABADI_ ; CountryInfo.txt [IRNGOVEDU 051101-090930] +MOHAMMED_ALI_ALLAHDADI + [IRNMIL] MOHAMMAD_HOSEINI_ ; CountryInfo.txt [IRNGOVMED >091001] MOHAMMAD_HOSEIN_SAFAR_HARANDI_ ; CountryInfo.txt @@ -22435,6 +22459,8 @@ IRAQ_ +WESTERN_ANBAR_PROVINCE +SINJAR +NINEVEH_PROVINCE ++MUTHANNA ++AL_MUTHANNA +SAFWAN [IRQ <20030320] [IRQOCC 1920030320-20060520] @@ -22451,6 +22477,7 @@ KURDISTAN_REGIONAL_GOVERNMENT # Make new Kurdistan code? [IRQGOV] PESHMERGA # Kurdistan stuff +PESH_MERGA ++KURDISH_PESHMERGA [IRQMIL] AHMAD_HASSAN_AL_BAKR_ ; CountryInfo.txt [IRQELI 320101-680717] @@ -22552,9 +22579,19 @@ NURI_AL_MALIKI_ ; CountryInfo.txt +PM_MALIKI +MR_MALIKI +AL-MALIKI ++MALIKI [IRQELI 680101-000101] - [IRQGOV >060520] + [IRQGOV 20060520-20140908] [IRQELI] +HAIDAR_AL_ABADI ++HAIDER_JAWAD_KADHIM_AL-ABADI ++HAIDAR_AL-ABADI ++PRIME_MINISTER_HAIDAR_AL_ABADI ++PRIME_MINISTER_HAIDAR_AL-ABADI ++PRIME_MINISTER_AL-ABADI ++PRIME_MINISTER_AL_ABADI ++HAIDER_AL_ABADI + [IRQGOV >20140908] ABD_AL_AMIR_RAHIM_ABBUD_ ; CountryInfo.txt [IRQGOVAGR 031001-040630] ABD_AL_AZIZ_AL_HAKIM_ ; CountryInfo.txt @@ -24682,8 +24719,11 @@ ABDUL_KARIM_AL_KABARITI_ ; CountryInfo.txt [JORGOV 960204-970319] [JORELI] FAYEZ_TARAWNEH_ ; CountryInfo.txt ++FAYEZ_A._TARAWNEH ++FAYEZ_AL-TARAWNEH [JORELI 670101-980820] [JORGOV 980820-990304] + [JORGOV 20120502-20121011] [JORELI] ABDUL_RAUF_AL_RAWABDEH_ ; CountryInfo.txt [JORELI 570101-990304] @@ -24705,20 +24745,34 @@ ADNAN_BADRAN_ ; CountryInfo.txt [JORGOVMIL 060101-060531] [JORELI] MAROUF_AL_BAKHIT_ ; CountryInfo.txt ++MAROUF_AL-BAKHIT ++MAROUF_SULEIMAN_AL-BAKHIT ++MAROUF_BAKHIT [JORELI 650101-051127] [JORGOV 051127-071125] [JORGOV 060101-071130] + [JORGOV 20110209-20111024] [JORELI] NADER_DAHABI_ ; CountryInfo.txt +NADER_AL_DAHABI_ +NADER_DHAHABI_ +NADIR_AL_DAHABI_ ++NADER_DAHABI [JORELI 640101-071201] [JORGOVBUS 030101-031031] [JORGOV 071201-091231] [JORGOVMIL 071201-091231] - [JORGOV >071125] - [JORELI] + [JORGOV 20071125-20091214] + [JORELI] +SAMIR_RIFAI ++SAMIR_ZAID_AL-RIFAI ++SAMIR_AL_RIFAI ++SAMIR_AL-RIFAI + [JORGOV 20091214-20110209] +AWN_SHAWKAT_AL-KHASAWNEH + [JORGOV 20111024-20120702] +ABDULLAH_ENSOUR + [JORGOV >20121011] ABDALLAH_UWEIDAT_ ; CountryInfo.txt [JORGOVDEV 050501-050731] ABDEL_ELAH_AL_KHATIB_ ; CountryInfo.txt @@ -26334,6 +26388,8 @@ KUWAIT_ [KWTOCC 900802-910206] [KWT >910206] SHEIKH_JABIR_AL_AHMAD_AL_JABIR_AL_SABAH_ ; CountryInfo.txt ++JABIR_AL_AHMAD_AL_JABIR_AL_SABAH_ ; CountryInfo.txt ++SHEIKH_JABER_AL_AHMAD_AL_JABIR_AL_SABAH_ ; CountryInfo.txt [KWTELI 440101-771231] [KWTGOV 771231-060115] ALI_HASSAN_AL_MAJID_ ; CountryInfo.txt @@ -26354,8 +26410,12 @@ SHEIKH_SABAH_AL_AHMAD_AL_JABIR_AL_SABAH_ ; CountryInfo.txt [KWTELI] SHEIKH_NASSER_MUHAMMAD_AL_AHMAD_AL_SABAH_ ; CountryInfo.txt [KWTELI 580101-000101] - [KWTGOV >060207] + [KWTGOV 20060207-20111128] [KWTELI] +SHEIKH_JABER_AL-MUBARAK_AL-HAMAD_AL-SABAH ++AL-HAMAD_AL-SABAH ++JABER_AL-MUBARAK_AL-HAMAD_AL-SABAH + [KWTGOV >20111204] ABDALLAH_ABD_AL_RAHMAN_AL_MATUQ_ ; CountryInfo.txt [KWTGOVJUD 060801-071031] ABDALLAH_ABD_AL_RAHMAN_TAWIL_ ; CountryInfo.txt @@ -27026,6 +27086,8 @@ LEBANON_ [LBN] +SUR_ +TYRE_ +BYBLOS_ +GENERAL_DIRECTORATE_OF_FOREIGN_SECURITY + [LBNSPY] CHARLES_HELOU_ ; CountryInfo.txt [LBNELI 19300101-640923] [LBNGOV 640923-700922] @@ -27343,6 +27405,9 @@ SALIM_WARDEH_ ; CountryInfo.txt SAMIR_AL_JISR_ ; CountryInfo.txt [LBNGOVJUD 030101-030430] [LBNGOVEDU 030501-041031] +SAMIR_GEAGEA ++SAMIR_FARID_GEAGEA + [LBNELI] SAMI_HADDAD_ ; CountryInfo.txt [LBNGOVBUS 050801-080731] SAMI_MINKARA_ ; CountryInfo.txt @@ -27942,12 +28007,23 @@ MOHAMED_ALI_AL_MASIRATI_ ; CountryInfo.txt [LBYGOVJUD 030101-040930] MOUSA_KOUSA_ ; CountryInfo.txt [LBYGOV >090401] -MUAMMAR_QADHAFI_ ; CountryInfo.txt +MUAMMAR_GADDAFI_ ++MUAMMAR_QADHAFI_ ; CountryInfo.txt +MUAMMAR_ABU_MINYAR_AL_QADHAFI_ - [LBYGOV >030101] -MUAMMAR_GADDAFI_ ; CountryInfo.txt +MUAMMAR_GADHAFI_ - [LBYGOV >030101] ++MOAMMAR_GADHAFI ++COLONEL_GADDAFI ++MUAMMAR_QADDAFI ++MOAMMAR_GADDAFI ++MOAMMAR_GADHAFI ++MUAMMAR_EL-QADDAFI ++MOAMMAR_KADAFI ++MUAMMAR_GADDAFI ++GADDAFI ++MOAMMAR_EL-GADHAFI ++MOHAMMED_QADDAFI ++QADDAFI + [LBYGOV 19690901-20110823] MUBARAK_ABDULLAH_AL_SHAMIKH_ ; CountryInfo.txt [LBYGOV 030101-030630] [LBYGOV 080401-100331] @@ -35856,6 +35932,7 @@ PAKISTAN_ [PAK] +GUJRANWALA_ +MULTAN_ +NORTH_WAZIRISTAN ++WAZIRISTAN +FEDERALLY_ADMINISTERED_TRIBAL_AREA +BAJOUR +BAJAUR @@ -36089,7 +36166,7 @@ HUSAIN_HAQQANI_ ; CountryInfo.txt [PAKGOV >080801] IJAZ_UL_HAQ_ ; CountryInfo.txt [PAKGOVREL 041101-070131] -IMRAN_KAHN +IMRAN_KHAN [PAKELI] [PAKGOVLEG >20130511] [PAKGOVLEG 20021010-20071103] @@ -36418,6 +36495,7 @@ PALESTINE_ [PSE] +QALANDIYA +KALANDIA +HEBRON ++FATAH PALESTINIAN_AUTHORITY +PALESTINIAN_NATIONAL_AUTHORITY [PSEGOV >19940913] @@ -38714,6 +38792,7 @@ REPUBLIC_OF_SERBIAN_KRAJINA_ [KRJUNR 911219-951112] +KNIN_ REPUBLIC_OF_SOUTH_AFRICA_ [ZAF] ++SOUTH_AFRICA +SOUTH_AFRICAN_ +ZUID_AFRICA_ +SUID_AFRIKA_ @@ -39306,6 +39385,8 @@ KREMLIN_ FEDERAL_SECURITY_SERVICE_ +FSB_ # hmm... Could get false positives [RUSCOP] # Or SPY? Law says one thing, common usage another. +FEDERAL_SERVICE_FOR_MILITARY-TECHNICAL_COOPERATION + [RUSMIL] NIKITA_KHRUSHCHEV_ +NIKITA_KRUSCHEV_ +NIKITA_KRUSHCHEV_ @@ -39664,6 +39745,7 @@ SERGEY_LAVROV_ ; CountryInfo.txt +RUSSIAN_FOREIGN_MINISTER_SERGEY_LAVROV +AMBASSADOR_LAVROV +AMBASSADOR_SERGEY_LAVROV ++SERGEI_LAVROV [RUSGOV 19940922-20040712] # Amb. to UN [RUSGOV >20040309] # Foreign Minister SERGEY_NARYSHKIN_ ; CountryInfo.txt @@ -41310,8 +41392,6 @@ SERBIA_AND_MONTENEGRO [SCG 920428-060605] +SERBIA_MONTENEGRO +YUGOSLAV_FEDERAL_REPUBLIC +SERBIAN_MONTENEGRIN_ -+BELGRADE_ -+BEOGRAD_ SEYCHELLES_ [SYC] +SEYCHELLOIS_ @@ -45240,6 +45320,7 @@ SYRIA_ [SYR] +DEIR_AL-ZOR +DEIR_AL_ZOR +DAYR_AL-ZAWR ++DEIR_EL_ZOUR +DER_EZZOR +HOMS_ +HALAB_ @@ -45570,10 +45651,24 @@ FREE_SYRIAN_ARMY_ ; +LIWAA_AL-UMMA_ +LIWAA_AL_UMMAH_ +LIWAA_AL-UMMAH_ ++FURSAN_AL_HAQQ_BRIGADE ++SALIM_IDRIS ++SELIM_IDRISS + [SYRREB] + +MUHAJIRIN_WA-ANSAR_ALLIANCE +SARAYAT_AL-QUDS +JUND_AL_AQSA +ABU_ABDUL_'AZIZ_AL-QATARI + [SYRREBMUS] + +HAZM_MOVEMENT ++HARAKAT_HAZM [SYRREB] SYRIAN_REVOLUTIONARY_FRONT +SYRIA_REVOLUTIONARIES_FRONT ++SYRIAN_REVOLUTIONARIES_FRONT +SYRIAN_REBEL_FRONT [SYRREB] @@ -45620,10 +45715,18 @@ JABHAT_AL_NUSRA_ ; +JOULANI_ +ABU_MUHAMMAD_AL_JOULANI_ +AL_JOULANI_ ++KHORASAN_GROUP [SYRREBMUS] + +KURDISH_DEMOCRATIC_UNION_PARTY + [SYRREB >20121215] SUPREME_COUNCIL_OF_THE_SYRIAN_REVOLUTION_ ; [SYROPP >110101] + +SYRIA_EMERGENCY_TASK_FORCE ++SYRIAN_EMERGENCY_TASK_FORCE + [SYROPP > 20120101] MOVEMENT_FOR_JUSTICE_AND_DEVELOPMENT_IN_SYRIA_ ; +ḤARAKAT_AL-'IDALAT_WAL-BANA'A_FI_SURIYAH_ @@ -45726,19 +45829,21 @@ THE_ISLAMIC_FRONT_ ; ASSAD_FORCES_ [SYRMIL] -ASSAD +BASHAR_AL-ASSAD ++ASSAD +ASSAD_GOVERNMENT_ +ASSAD_REGIME_ +MR_ASSAD +MR._ASSAD -+BASHAR_AL-ASSAD ++ASSAD ++BASHAR_ASSAD ++AL_ASSAD +BASHAR_AL_ASSAD +SYRIA'S_GOVERNMENT +SYRIAS_GOVERNMENT [SYRGOV] ISLAMIC_STATE_OF_IRAQ_AND_THE_LEVANT_; kkl mod -+ISLAMIC_STATE +ISLAMIC_STATE_OF_IRAQ_ +ISLAMIC_STATE_OF_IRAQ_AND_SYRIA_ +ISLAMIC_STATE_OF_IRAQ_AND_AL_SHAM_ @@ -45769,13 +45874,7 @@ ISLAMIC_STATE_OF_IRAQ_AND_THE_LEVANT_; kkl mod +THE_ORGANIZATION_OF_MONOTHEISM_AND_JIHAD_ +JAMA'AT_AL-TAWHID_WAL-JIHAD_ +TANZIM_QAIDAT_AL-JIHAD_FI_BILAD_AL-RAFIDAYN_ -AL-DAWLA_AL-ISLAMIYA_FI_AL-IRAQ_WA_AL-SHAM_ -+ISIS_ -+ISIL_ -+DAIISH_ -+DA'ESH_ -+DAASH -+DAESH_ ++AL-DAWLA_AL-ISLAMIYA_FI_AL-IRAQ_WA_AL-SHAM_ +TANZEEM_QAEDAT_AL-JIHAD_FI_BILAD_AL-RAFIDAYN_ +ABU_MUZAB_AL-ZARQAWI_ +ABU_OMAR_AL-BAGHDADI_ @@ -45800,8 +45899,16 @@ AL-DAWLA_AL-ISLAMIYA_FI_AL-IRAQ_WA_AL-SHAM_ +MONER_MOHAMMAD_ABU_SALHA +MONER_MOHAMMAD_ABU-SALHA +ABU_HURAYRA - [IMGMUSISI] ; just assigned ISI special code + [IMGMUSISI >19990101] ; just assigned ISI special code +ISLAMIC_STATE ++ISIS_ ++ISIL_ ++DAIISH_ ++DA'ESH_ ++DAASH ++DAESH_ + [IMGMUSISI >20130408] # tighter date range for possible false positives TAIWAN_ [TWN] +TAIWANESE_ @@ -48212,7 +48319,9 @@ ZOUHEIR_MDHAFFAR_ ; CountryInfo.txt [TUNGOV >100301] TURKEY_ [TUR] -+TURKISH_ ++TURKISH_ ++TURKISH_REPUBLIC ++REPUBLIC OF TURKEY +TURK_ +TURKIYE_ +TURKY_ @@ -48228,6 +48337,9 @@ TURKEY_ [TUR] +BURSA_ +ADANA_ +GAZIANTEP_ ++DIYARBAKIR ++INCIRLIK ++SANLIURFA +EDIRNE_ +ADRIANOPLE_ +ADRIANOPOLIS_ @@ -48239,6 +48351,7 @@ TURKEY_ [TUR] +ANTIOCH_ +ANTAKYA_ +ANTAKIYA_ ++ANATOLIA +HALICARNASSUS_ +STAMBUL_ +STAMBOUL_ @@ -48260,6 +48373,9 @@ TURKEY_ [TUR] +BEYOGLU +URFA +MARDIN ++GEZI_PARK +ERGENEKON + [TURELI] # ? The deep state thing TURGUT_OZAL_ ; CountryInfo.txt [TURELI 450101-891109] [TURGOV 891109-930417] @@ -48308,6 +48424,7 @@ BULENT_ECEVIT_ ; CountryInfo.txt RECEP_TAYYIP_ERDOGAN_ ; CountryInfo.txt +RECEP_ERDOGAN_ +ERDOGAN_ ++TAYYIP_ERDOGAN [TURELI 720101-021118] [TURGOV 021118-030314] [TURGOV >030314] @@ -48343,6 +48460,10 @@ DURMUS_YILMAZ_ ; CountryInfo.txt [TURGOVBUS >060501] EGEMEN_BAGIS_ ; CountryInfo.txt [TURGOV >090201] +EKMELEDDIN_IHSANOGLU ++EKMELEDDIN_MEHMET_IHSANOGLU ++EKMELEDDIN_İHSANOĞLU + [TURELI] # and OIC when we figure that out ERKAN_MUMCU_ ; CountryInfo.txt [TURGOVEDU 030101-030228] [TURGOVBUS 030501-050228] @@ -48432,6 +48553,9 @@ SADULLAH_ERGIN_ ; CountryInfo.txt [TURGOVJUD >090601] SAMI_GUCLU_ ; CountryInfo.txt [TURGOVAGR 030101-050630] +SELAHATTIN_DEMIRTAS ++SELAHATTIN_DEMIRTAŞ + [TURELI] # and parties, when we figure those out. SELMA_ALIYE_KAVAF_ ; CountryInfo.txt [TURGOV >090601] SUREYYA_SERDENGECTI_ ; CountryInfo.txt @@ -49657,6 +49781,8 @@ PAVLO_KACHUR_ ; CountryInfo.txt PETRO_KRUPKO_ ; CountryInfo.txt [UKRGOV 080101-100331] PETRO_POROSHENKO ; CountryInfo.txt ++POROSHENKO ++PETRO_OLEKSIYOVYCH_POROSHENKO [UKRGOV 091201-100331] [UKRGOVMIL 050201-050930] [UKRGOV > 20140607] @@ -50278,6 +50404,7 @@ UNITED_STATES_OF_AMERICA_ [USA] +MINNEAPOLIS_ +SAN_DIEGO_ +ST._LOUIS_ ++ST_LOUIS +CLEVELAND_ +TAMPA_ +DENVER_ @@ -50429,6 +50556,12 @@ UNITED_STATES_CONGRESS_ +US_SENATE_ +US_HOUSE_OF_REPRESENTATIVES_ +UNITED_STATES_HOUSE_OF_REPRESENTATIVES_ ++HOUSE_ARMED_SERVICES_COMMITTEE ++SENATE_ARMED_SERVICES_COMMITTEE ++SENATE_SELECT_COMMITTEE_ON_INTELLIGENCE ++SENATE_INTELLIGENCE_COMMITTEE ++SENATE_FOREIGN_RELATIONS_COMMITTEE ++HOUSE_FOREIGN_AFFAIRS_COMMITTEE [USAGOVLEG] UNITED_STATES_SUPREME_COURT_ @@ -50454,10 +50587,12 @@ WHITE_HOUSE_ DEPARTMENT_OF_STATE +US_STATE_DEPARTMENT +STATE_DEPARTMENT_OFFICIAL ++U.S._STATE_DEPARTMENT ++U.S._DEPARTMENT_OF_STATE [USAGOV] -DEPARTMENT_OF_DEFENSE_ -+UNITED_STATES_MILITARY_ +UNITED_STATES_MILITARY_ ++DEPARTMENT_OF_DEFENSE_ +US_MILITARY +U.S._MILITARY +THE_UNITED_STATES_MILITARY @@ -50470,6 +50605,7 @@ DEPARTMENT_OF_DEFENSE_ +DEFENSE_ADVANCED_RESEARCH_PROJECTS_AGENCY_ +DARPA_ +UNITED_STATES_CENTRAL_COMMAND ++US_CENTRAL_COMMAND +CENTCOM +PACIFIC_COMMAND +PACOM @@ -50480,6 +50616,7 @@ DEPARTMENT_OF_DEFENSE_ +SOCOM +STRATCOM +TRANSCOM ++JOHN_KIRBY [USAMIL] PROVINCIAL_RECONSTRUCTION_TEAM +COALITION_HUMANITARIAN_LIAISON_CELL @@ -50494,7 +50631,8 @@ DEPARTMENT_OF_STATE_ +UNITED_STATES_DEPARTMENT_OF_STATE_ [USAGOV] -INTELLIGENCE_COMMUNITY_ +US_INTELLIGENCE_COMMUNITY_ ++INTELLIGENCE_COMMUNITY_ +CENTRAL_INTELLIGENCE_AGENCY_ +CIA_ +NATIONAL_SECURITY_AGENCY_ @@ -50502,6 +50640,7 @@ INTELLIGENCE_COMMUNITY_ +OFFICE_OF_THE_DIRECTOR_OF_NATIONAL_INTELLIGENCE_ +NATIONAL_RECONNAISSANCE_OFFICE_ +NATIONAL_GEOSPATIAL-INTELLIGENCE_AGENCY_ ++ODNI [USASPY] FEDERAL_BUREAU_OF_INVESTIGATION_ # I know, they're different, but they're all USACOP @@ -50517,6 +50656,7 @@ ENVIRONMENTAL_PROTECTION_AGENCY_ UNITED_STATES_AGENCY_FOR_INTERNATIONAL_DEVELOPMENT_ +US_AGENCY_FOR_INTERNATIONAL_DEVELOPMENT_ ++U.S._AGENCY_FOR_INTERNATIONAL_DEVELOPMENT +USAID_ +OFFICE_OF_US_FOREIGN_DISASTER_ASSISTANCE_ +OFDA_ @@ -50554,6 +50694,10 @@ UNITED_STATES_DEPARTMENT_OF_EDUCATION UNITED_STATES_DEPARTMENT_OF_ENERGY [USAGOV] +U.S._FEDERAL_RESERVE ++FEDERAL_RESERVE + [USAGOVBUS] + UNITED_STATES_DEPARTMENT_OF_HOMELAND_SECURITY_ +FEDERAL_EMERGENCY_MANAGEMENT_AGENCY_ +FEMA_ @@ -50625,6 +50769,22 @@ NATIONAL_AERONAUTICS_AND_SPACE_ADMINISTRATION_ +NATIONAL_SCIENCE_FOUNDATION_ # check for other countries [USAGOV] +# Think tanks +WASHINGTON-BASED_THINK_TANK ++CENTER_FOR_AMERICAN_PROGRESS ++CENTER_FOR_STRATEGIC_AND_INTERNATIONAL_STUDIES ++BROOKINGS_INSTITUTE ++CENTER_FOR_A_NEW_AMERICAN_SECURITY ++WASHINGTON-BASED_INSTITUTE ++WASHINGTON_INSTITUTE_FOR_NEAR_EAST_POLICY ++FOUNDATION_FOR_DEFENSE_OF_DEMOCRACIES ++FEDERATION_OF_AMERICAN_SCIENTISTS + [USAELI] + +# Universities (need a general system eventually...) +GEORGETOWN_UNIVERSITY + [USAEDU] + # U.S. Presidents PRESIDENT_OF_THE_UNITED_STATES_ +AMERICAN_PRESIDENT_ @@ -51289,6 +51449,11 @@ CHUCK_HAGEL +SENATOR_HAGEL [USAGOVLEG 19970103-20090103] # Senator from Nebraska [USAGOVMIL >20130227] # Sec Def +JOHN_BRENNAN ++JOHN_O._BRENNAN ++CIA_DIRECTOR_JOHN_BRENNAN + [USAGOV 20090120-20130308] + [USAGOVSPY >20130308] # U.S. Attorneys General US_ATTORNEY_GENERAL_ +UNITED_STATES_ATTORNEY_GENERAL_ @@ -53493,7 +53658,18 @@ YASIN_SAID_NUMAN_ ; CountryInfo.txt ALI_ABDULLAH_SALEH_ ; CountryInfo.txt [YEMELI 600101-780718] [YEMGOV 780718-900522] - [YEMGOV >900522] + [YEMGOV 19900522-20120227] + [YEMELI] +MANSOUR_HADI ++ABD_RABBUH_MANSUR_HADI ++ABD-RABBU_MANSOUR_HADI ++MANSOUR_ABDRABBUH_HADI ++ABDRABUH_MANSOUR_HADI ++ABED_RABBO_MANSOUR_HADI ++ABDRABUH_MANSUR_HADI ++ABDU_RABBO_MANSOUR_HADI + [YEMGOV >20111123] +AHMAD_AWAD_BIN_MUBARAK [YEMELI] ABDUL_AZIZ_ABDUL_GHANI_ ; CountryInfo.txt [YEMELI 570101-831113] diff --git a/Phoenix.International.actors.txt b/Phoenix.International.actors.txt index ffd94e8..b9bc937 100644 --- a/Phoenix.International.actors.txt +++ b/Phoenix.International.actors.txt @@ -104,6 +104,7 @@ THE_UN_ [IGOUNO] ;MleH 20 Jul 2009; NGO_Actors TRYGVE_LIE_ [IGOUNO 460201-521110] [ELI]; IGOrulers.txt U.N. [IGOUNO] ;MleH 06 Aug 2009 + BK 16 Jul 2009; NGO_Actors U.N._MONITOR_ [IGOUNO] ;MleH 20 Jul 2009; NGO_Actors +U.N._SECURITY_COUNCIL [IGOUNO] UN DEPARTMENT_OF_PEACEKEEPING_OPERATIONS_ [IGOUNO] ;BK 07 Jul 2009; NGO_Actors UNDP_ [IGOUNODEV] ;MleH 13 Aug 2009 + BK 13 Jul 2009; NGO_Actors UNESCAP_ [IGOUNODEV] ;CTA 31 Jul 2009; NGO_Actors @@ -436,6 +437,10 @@ AFP +AGENCE_FRANCE-PRESSE +AGENCE_FRANCE_PRESSE [MED] +MCCLATCHY + [MED] +DER_SPIEGEL + [MED] ORGANIZATION_FOR_THE_PROHIBITION_OF_CHEMICAL_WEAPONS +OPCW @@ -492,7 +497,10 @@ ICCO_ [IGOAGRICO]; Intl Cocoa Org., very very iffy; NGO_Actors ICC_ [IGOJUDICC] ;MleH 09 Aug 2009; NGO_Actors ICJ_ [IGOUNOJUDICJ]; Intl Court of Justice; NGO_Actors IGAD_ [IGODEVIAD]; Inter-Govt Authority on Development; NGO_Actors + IMF_ [IGOBUSIMF]; Intl Monetary Fund; NGO_Actors ++INTERNATIONAL_MONETARY_FUND + INDIAN_OCEAN_COMMISSION_ [IGOAFR] ;MleH 09 Jul 2009; NGO_Actors INDIAN_UN_PEACEKEEPER_ [IGOUNO] ;MleH 10 Aug 2009; NGO_Actors INDO_BANGLADESH_JOINT_RIVERS_COMMISSION_ [IGOSASDEV]; NGO_Actors diff --git a/Phoenix.MilNonState.actors.txt b/Phoenix.MilNonState.actors.txt index d80dd18..bcaa1ff 100644 --- a/Phoenix.MilNonState.actors.txt +++ b/Phoenix.MilNonState.actors.txt @@ -13,7 +13,7 @@ # http://www.start.umd.edu/start/data_collections/tops/ # -ABU_NIDAL_ORGANIZATION [INTREB] # kkl 21 Mar 13 +ABU_NIDAL_ORGANIZATION [IMGMUSALQ] # kkl 21 Mar 13 +ARAB_REVOLUTIONARY_BRIGADES_ +ARAB_REVOLUTIONARY_COUNCIL_ +FATAH_REVOLUTIONARY_COUNCIL_ @@ -33,10 +33,11 @@ ADEN_ABYAN_ISLAMIC_ARMY_(AAIA)_ [YEMREB] # kkl 21 Mar 13 +JAYSH_ADAN_ +MUHAMMEDS_ARMY_ -AL-QAEDA_ [INTREB] # kkl 21 Mar 13 +AL-QAEDA_ [IMGMUSALQ] # kkl 21 Mar 13 +AL_QAIDA_ +QIDAT_AL-JIHAD_ -+THE_BASE_ ++AL-QAIDA ++AL_QAIDA-AFFILIATED AL-INTIQAMI_AL-PAKISTANI_ [KKLREB] # kkl 21 Mar 13 +REVENGE_OF_JEHADI_ @@ -154,6 +155,7 @@ HAMAS_ # kkl 21 Mar 13 +HARAKAT_AL-MUQAWAMMAH_AL-ISLAMMIYYA +ISLAMIC_RESISTANCE_MOVEMENT +AL-AQSA_FOUNDATION ++KHALED_MESHAAL [PSEREBHMS] SHEIKH_AHMED_YASSIN +AHMED_YASSIN @@ -228,7 +230,8 @@ KU_KLUX_KLAN_(KKK)_ [USAREB] # kkl 21 Mar 13 +IMPERIAL_KLANS_OF_AMERICA_ +KNIGHTS_OF_THE_WHITE_KAMELIA_ -KURDISTAN_WORKERS'_PARTY_(PKK)_ [TURREB] # kkl 21 Mar 13 +KURDISTAN_WORKERS'_PARTY [TURREB] # kkl 21 Mar 13 ++KURDISTAN_WORKERS_PARTY +KADEK_ +KHK_ +KONGRA-GEL_(KGK)_ @@ -590,6 +593,8 @@ ARMATA_DI_LIBERAZIONE_NAZIUNALE_ [FRAREB] # kkl 21 Mar 13 ANDRES_CASTRO_UNITED_FRONT_ [NICREB] # kkl 21 Mar 13 HEZBOLLAH_ [LBNREB] # kkl 21 Mar 13 ++HIZBULLAH ++HIZBALLAH +ISLAMIC_JIHAD_ +ISLAMIC_JIHAD_FOR_THE_LIBERATION_OF_PALESTINE_ +ORGANIZATION_OF_THE_OPPRESSED_ON_EARTH_ @@ -597,9 +602,13 @@ HEZBOLLAH_ [LBNREB] # kkl 21 Mar 13 +REVOLUTIONARY_JUSTICE_ORGANIZATION_ +THE_ISLAMIC_RESISTANCE_ +HASAN_NASRALLAH ++HASSAN_NASRALLAH ++SAYYID_HASSAN_NASRALLAH +NASRALLAH +IMAD_MUGHNIYEH +IMAD_FAYEZ_MUGHNIYEH ++IMAD_MUGHNIYAH ++IMAD_MOUGHNIYAH ARIZONA_PATRIOTS_ [USAREB] # kkl 21 Mar 13 @@ -2026,8 +2035,10 @@ ISLAMIC_JIHAD_BRIGADES_ [IRQREB] # kkl 21 Mar 13 FREE_PEOPLE_OF_GALILLEE_ [ISRREB] # kkl 21 Mar 13 +GALILEE_LIBERATORS_ -AL-QAEDA_IN_THE_ARABIAN_PENINSULA [SAUREB] # kkl 21 Mar 13 +AL-QAEDA_IN_THE_ARABIAN_PENINSULA [IMG] # kkl 21 Mar 13 +AQAP ++AL-AWLAKI ++ANWAR_AL-AWLAKI COMMUNIST_LIBERATION_FACTION_ [GRCREB] # kkl 21 Mar 13 @@ -2460,7 +2471,7 @@ AL-HARAMAIN_FOUNDATION_ [INTREB] AL-ITIHAAD_AL-ISLAMIYA_ [SOMREB] # Wikipedia says dissolved after 9/11 +AIAI_ -AL-SHABAAB[SOMREB] +AL-SHABAAB [SOMREB] +AL_SHABAB +HARAKAT_AL-SHABAAB_AL-MUJAHIDEEN +HSM_ diff --git a/Phoenix.agents.txt b/Phoenix.agents.txt index 647a120..1d146e1 100644 --- a/Phoenix.agents.txt +++ b/Phoenix.agents.txt @@ -96,7 +96,7 @@ ARMS_INDUSTRY [~BUS] AUTOMAKER [~BUS] AUTO_MAKER [~BUS] AUTO_MANUFACTURER [~BUS] -BANK [~BUS] +#BANK [~BUS] BARGAINER [~BUS] BOSS [~BUS] BUSINESSPERSON [~BUS] diff --git a/Phoenix.discards.txt b/Phoenix.discards.txt index 820762c..bc3273c 100644 --- a/Phoenix.discards.txt +++ b/Phoenix.discards.txt @@ -319,6 +319,7 @@ MADE A JOKE ABOUT HAVING A BOMB # ELH 06 Jul 2009 +MAJOR LEAGUE # MleH 10 Aug 2009 MALAYSIAN OPEN # MleH 15 Jul 2009 MANNY PACQUIAO # ELH 16 Jul 2009 +MANCHESTER UNITED MARATHON # MleH 11 Aug 2009 MATCH SERIES # MleH 28 Jul 2009 MATCH WIN # MleH 28 Jul 2009