From 21ac449844305bedcc8bc5ad73d258e19139acde Mon Sep 17 00:00:00 2001
From: "max.mehl" <max.mehl@fsfe.org>
Date: Thu, 23 Jul 2020 14:47:08 +0200
Subject: [PATCH] enable displaying a subset of countries, firstly all EEA
 countries

---
 build/xslt/countries.xsl | 37 ++++++++++++++++------
 tools/countries.de.xml   | 68 +++++++++++++++++++++-------------------
 tools/countries.en.xml   | 68 +++++++++++++++++++++-------------------
 tools/countries.et.xml   | 68 +++++++++++++++++++++-------------------
 tools/countries.it.xml   | 68 +++++++++++++++++++++-------------------
 tools/countries.ru.xml   | 68 +++++++++++++++++++++-------------------
 tools/countries.sq.xml   | 68 +++++++++++++++++++++-------------------
 7 files changed, 237 insertions(+), 208 deletions(-)

diff --git a/build/xslt/countries.xsl b/build/xslt/countries.xsl
index dd3ca59c7a..f9200641e5 100644
--- a/build/xslt/countries.xsl
+++ b/build/xslt/countries.xsl
@@ -6,6 +6,7 @@
   <xsl:template name="country-list">
     <xsl:param name="required" select="'no'" />
     <xsl:param name="class" select="''" />
+    <xsl:param name="subset" select="''" />
     <xsl:element name="select">
       <xsl:attribute name="id">country</xsl:attribute>
       <xsl:attribute name="name">country</xsl:attribute>
@@ -24,18 +25,34 @@
         </xsl:when>
       </xsl:choose>
       <!-- loop over all countries in countries.**.xml -->
-      <xsl:for-each select="/buildinfo/document/set/country">
-        <xsl:sort select="." lang="en" />
-        <!-- will output: <option value="ZZ">Fooland</option> -->
-        <xsl:element name="option">
-          <xsl:attribute name="value">
-            <xsl:value-of select="@id" />|<xsl:value-of select="." />
-          </xsl:attribute>
-          <xsl:value-of select="." />
-        </xsl:element>  <!-- /option -->
-      </xsl:for-each>
+      <xsl:choose>
+        <!-- if subset is defined, only display those that have as attribute: $subset="yes" -->
+        <xsl:when test="$subset != ''">
+          <xsl:for-each select="/buildinfo/document/set/country[@*[name() = $subset] = 'yes']">
+            <xsl:sort select="." lang="en" />
+            <xsl:call-template name="country-list-options" />
+          </xsl:for-each>
+        </xsl:when>
+        <!-- otherwise, just display all countries -->
+        <xsl:otherwise>
+          <xsl:for-each select="/buildinfo/document/set/country">
+            <xsl:sort select="." lang="en" />
+            <xsl:call-template name="country-list-options" />
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:element> <!-- /select -->
   </xsl:template>
 
+  <xsl:template name="country-list-options">
+    <!-- will output: <option value="ZZ">Fooland</option> -->
+    <xsl:element name="option">
+      <xsl:attribute name="value">
+        <xsl:value-of select="@id" />|<xsl:value-of select="." />
+      </xsl:attribute>
+      <xsl:value-of select="." />
+    </xsl:element>  <!-- /option -->
+  </xsl:template>
+
 </xsl:stylesheet>
 
diff --git a/tools/countries.de.xml b/tools/countries.de.xml
index 1c732a98c2..e0fa6e0fb1 100644
--- a/tools/countries.de.xml
+++ b/tools/countries.de.xml
@@ -3,6 +3,8 @@
 <!--	see http://www.iso.org/iso/country_codes/iso_3166_code_lists.htm
 	for updates -->
 
+<!-- eea is European Economic Area plus a few manual additions where we want to send to -->
+
 <countryset>
   <version>1</version>
 
@@ -13,7 +15,7 @@
 <country id="AF">Afghanistan</country>
 <!--<country id="">Akrotiri and Dhekelia</country> The Sovereign Base Areas of Akrotiri and Dhekelia, Cyprus, Greece-->
 <country id="AX">Åland</country>
-<country id="AL">Albanien</country>
+<country id="AL" eea="yes">Albanien</country>
 <country id="DZ">Algerien</country>
 <country id="AS">Amerikanisches Samoa</country>
 <country id="AD">Andorra</country>
@@ -33,7 +35,7 @@
 <country id="BB">Barbados</country>
 <!--<country id="">Bassas da India</country>-->
 <country id="BY">Belarus</country>
-<country id="BE">Belgien</country>
+<country id="BE" eea="yes">Belgien</country>
 <country id="BZ">Belize</country>
 <country id="BJ">Benin</country>
 <country id="BM">Bermuda</country>
@@ -46,7 +48,7 @@
 <country id="IO">Britisches Territorium im Indischen Ozean</country>
 <country id="VG">Britische Jungfraueninseln</country>
 <country id="BN">Brunei</country>
-<country id="BG">Bulgarien</country>
+<country id="BG" eea="yes">Bulgarien</country>
 <country id="BF">Burkina Faso</country>
 <country id="BI">Burundi</country>
 <country id="CL">Chile</country>
@@ -56,8 +58,8 @@
 <!--<country id="">Coral Sea Islands</country>Gay and Lesbian Kingdom of the Coral Sea Islands, Australia-->
 <country id="CR">Costa Rica</country>
 <country id="CW">Curacao</country>
-<country id="DK">Dänemark</country>
-<country id="DE">Deutschland</country>
+<country id="DK" eea="yes">Dänemark</country>
+<country id="DE" eea="yes">Deutschland</country>
 <country id="DM">Dominica</country>
 <country id="DO">Dominikanische Republik</country>
 <country id="DJ">Dschibuti</country>
@@ -65,13 +67,13 @@
 <country id="CI">Elfenbeinküste</country>
 <country id="SV">El Salvador</country>
 <country id="ER">Eritrea</country>
-<country id="EE">Estland</country>
+<country id="EE" eea="yes">Estland</country>
 <!--<country id="">Europa Island</country>-->
 <country id="FK">Falklandinseln (Malwinen)</country>
 <country id="FO">Färöer Inseln</country>
 <country id="FJ">Fidschi</country>
-<country id="FI">Finnland</country>
-<country id="FR">Frankreich</country>
+<country id="FI" eea="yes">Finnland</country>
+<country id="FR" eea="yes">Frankreich</country>
 <country id="GF">Französisch-Guyana</country>
 <country id="PF">Französisch-Polynesien</country>
 <country id="TF">Französische Süd- und Antarktisgebiete</country>
@@ -83,9 +85,9 @@
 <country id="GI">Gibraltar</country>
 <!--<country id="">Glorioso Islands</country>-->
 <country id="GD">Grenada</country>
-<country id="GR">Griechenland</country>
+<country id="GR" eea="yes">Griechenland</country>
 <country id="GL">Grönland</country>
-<country id="GB">Großbritannien</country>
+<country id="GB" eea="yes">Großbritannien</country>
 <country id="GP">Guadeloupe</country>
 <country id="GU">Guam</country>
 <country id="GT">Guatemala</country>
@@ -101,11 +103,11 @@
 <country id="ID">Indonesien</country>
 <country id="IQ">Irak</country>
 <country id="IR">Iran</country>
-<country id="IE">Irland</country>
-<country id="IS">Island</country>
+<country id="IE" eea="yes">Irland</country>
+<country id="IS" eea="yes">Island</country>
 <country id="IM">Isle of Man</country>
 <country id="IL">Israel</country>
-<country id="IT">Italien</country>
+<country id="IT" eea="yes">Italien</country>
 <country id="JM">Jamaika</country>
 <country id="SJ">Jan Mayen</country>
 <country id="JP">Japan</country>
@@ -131,25 +133,25 @@
 <country id="CG">Kongo, Republik</country>
 <country id="KP">Korea, Nord</country>
 <country id="KR">Korea, Süd</country>
-<country id="HR">Kroatien</country>
+<country id="HR" eea="yes">Kroatien</country>
 <country id="CU">Kuba</country>
 <country id="KW">Kuwait</country>
 <country id="LA">Laos</country>
 <country id="LS">Lesotho</country>
-<country id="LV">Lettland</country>
+<country id="LV" eea="yes">Lettland</country>
 <country id="LB">Libanon</country>
 <country id="LR">Liberia</country>
 <country id="LY">Libyen</country>
-<country id="LI">Liechtenstein</country>
-<country id="LT">Litauen</country>
-<country id="LU">Luxemburg</country>
+<country id="LI" eea="yes">Liechtenstein</country>
+<country id="LT" eea="yes">Litauen</country>
+<country id="LU" eea="yes">Luxemburg</country>
 <country id="MO">Macao</country>
 <country id="MG">Madagaskar</country>
 <country id="MW">Malawi</country>
 <country id="MY">Malaysia</country>
 <country id="MV">Malediven</country>
 <country id="ML">Mali</country>
-<country id="MT">Malta</country>
+<country id="MT" eea="yes">Malta</country>
 <country id="MA">Marokko</country>
 <country id="MH">Marshallinseln</country>
 <country id="MQ">Martinique</country>
@@ -173,14 +175,14 @@
 <country id="NC">Neukaledonien</country>
 <country id="NZ">Neuseeland</country>
 <country id="NI">Nicaragua</country>
-<country id="NL">Niederlande</country>
+<country id="NL" eea="yes">Niederlande</country>
 <country id="NE">Niger</country>
 <country id="NG">Nigeria</country>
 <country id="NU">Niue</country>
 <country id="MP">Nördliche Marianen</country>
 <country id="NF">Norfolkinsel</country>
-<country id="NO">Norwegen</country>
-<country id="AT">Österreich</country>
+<country id="NO" eea="yes">Norwegen</country>
+<country id="AT" eea="yes">Österreich</country>
 <country id="OM">Oman</country>
 <country id="PK">Pakistan</country>
 <country id="PW">Palau</country>
@@ -192,12 +194,12 @@
 <country id="PE">Peru</country>
 <country id="PH">Philippinen</country>
 <country id="PN">Pitcairninseln</country>
-<country id="PL">Polen</country>
-<country id="PT">Portugal</country>
+<country id="PL" eea="yes">Polen</country>
+<country id="PT" eea="yes">Portugal</country>
 <country id="PR">Puerto Rico</country>
 <country id="RE">Reunion</country>
 <country id="RW">Ruanda</country>
-<country id="RO">Rumänien</country>
+<country id="RO" eea="yes">Rumänien</country>
 <country id="RU">Russland</country>
 <country id="SB">Salomonen</country>
 <country id="ZM">Sambia</country>
@@ -210,8 +212,8 @@
 <country id="SM">San Marino</country>
 <country id="ST">Sao Tome und Principe</country>
 <country id="SA">Saudi-Arabien</country>
-<country id="SE">Schweden</country>
-<country id="CH">Schweiz</country>
+<country id="SE" eea="yes">Schweden</country>
+<country id="CH" eea="yes">Schweiz</country>
 <country id="SN">Senegal</country>
 <country id="RS">Serbien</country>
 <country id="SC">Seychellen</country>
@@ -220,9 +222,9 @@
 <country id="SG">Singapur</country>
 <country id="SX">Sint Maarten</country>
 <country id="SK">Slowakei</country>
-<country id="SI">Slowenien</country>
+<country id="SI" eea="yes">Slowenien</country>
 <country id="SO">Somalia</country>
-<country id="ES">Spanien</country>
+<country id="ES" eea="yes">Spanien</country>
 <!--<country id="">Spratly Islands</country>-->
 <country id="SJ">Spitzbergen</country>
 <country id="LK">Sri Lanka</country>
@@ -244,15 +246,15 @@
 <country id="TT">Trinidad und Tobago</country>
 <!--<country id="">Tromelin Island</country>-->
 <country id="TD">Tschad</country>
-<country id="CZ">Tschechische RepubliK</country>
-<country id="TR">Türkei</country>
+<country id="CZ" eea="yes">Tschechische RepubliK</country>
+<country id="TR" eea="yes">Türkei</country>
 <country id="TN">Tunesien</country>
 <country id="TM">Turkmenistan</country>
 <country id="TC">Turks- und Caicosinseln</country>
 <country id="TV">Tuvalu</country>
 <country id="UG">Uganda</country>
 <country id="UA">Ukraine</country>
-<country id="HU">Ungarn</country>
+<country id="HU" eea="yes">Ungarn</country>
 <country id="UY">Uruguay</country>
 <country id="UZ">Usbekistan</country>
 <country id="VU">Vanuatu</country>
@@ -267,6 +269,6 @@
 <country id="CX">Weihnachtsinsel</country>
 <country id="EH">Westliche Sahara</country>
 <country id="CF">Zentralafrikanische Republik</country>
-<country id="CY">Zypern</country>
+<country id="CY" eea="yes">Zypern</country>
 
 </countryset>
diff --git a/tools/countries.en.xml b/tools/countries.en.xml
index ffc51e6767..bc5bec5d58 100644
--- a/tools/countries.en.xml
+++ b/tools/countries.en.xml
@@ -7,6 +7,8 @@
 	
 	-->
 
+<!-- eea is European Economic Area plus a few manual additions where we want to send to -->
+
 <countryset>
   <version>1</version>
 
@@ -14,7 +16,7 @@
 <country id="AF">Afghanistan</country>
 <!--<country id="">Akrotiri and Dhekelia</country> The Sovereign Base Areas of Akrotiri and Dhekelia, Cyprus, Greece-->
 <country id="AX">Åland Islands</country>
-<country id="AL">Albania</country>
+<country id="AL" eea="yes">Albania</country>
 <country id="DZ">Algeria</country>
 <country id="AS">American Samoa</country>
 <country id="AD">Andorra</country>
@@ -27,7 +29,7 @@
 <country id="AW">Aruba</country>
 <!--<country id="">Ashmore and Cartier Islands</country>-->
 <country id="AU">Australia</country>
-<country id="AT">Austria</country>
+<country id="AT" eea="yes">Austria</country>
 <country id="AZ">Azerbaijan</country>
 <country id="BS">Bahamas</country><!-- Bahamas, The -->
 <country id="BH">Bahrain</country>
@@ -35,7 +37,7 @@
 <country id="BB">Barbados</country>
 <!--<country id="">Bassas da India</country>-->
 <country id="BY">Belarus</country>
-<country id="BE">Belgium</country>
+<country id="BE" eea="yes">Belgium</country>
 <country id="BZ">Belize</country>
 <country id="BJ">Benin</country>
 <country id="BM">Bermuda</country>
@@ -48,7 +50,7 @@
 <country id="IO">British Indian Ocean Territory</country>
 <country id="VG">British Virgin Islands</country>
 <country id="BN">Brunei Darussalam</country>
-<country id="BG">Bulgaria</country>
+<country id="BG" eea="yes">Bulgaria</country>
 <country id="BF">Burkina Faso</country>
 <country id="BI">Burundi</country>
 <country id="KH">Cambodia</country>
@@ -70,14 +72,14 @@
 <!--<country id="">Coral Sea Islands</country>Gay and Lesbian Kingdom of the Coral Sea Islands, Australia-->
 <country id="CR">Costa Rica</country>
 <country id="CI">Côte D’Ivoire</country>
-<country id="HR">Croatia</country>
+<country id="HR" eea="yes">Croatia</country>
 <country id="CU">Cuba</country>
 <country id="CW">Curaçao</country>
-<country id="CY">Cyprus</country>
-<country id="CZ">Czech Republic</country>
+<country id="CY" eea="yes">Cyprus</country>
+<country id="CZ" eea="yes">Czech Republic</country>
 <country id="KP">Democratic People's Republic of Korea (North Korea)</country>
 <country id="CD">Democratic Republic of the Congo (Kinshasa)</country>
-<country id="DK">Denmark</country>
+<country id="DK" eea="yes">Denmark</country>
 <country id="DJ">Djibouti</country>
 <country id="DM">Dominica</country>
 <country id="DO">Dominican Republic</country>
@@ -86,14 +88,14 @@
 <country id="SV">El Salvador</country>
 <country id="GQ">Equatorial Guinea</country>
 <country id="ER">Eritrea</country>
-<country id="EE">Estonia</country>
+<country id="EE" eea="yes">Estonia</country>
 <country id="ET">Ethiopia</country>
 <!--<country id="">Europa Island</country>-->
 <country id="FK">Falkland Islands (Islas Malvinas)</country>
 <country id="FO">Faroe Islands</country>
 <country id="FJ">Fiji</country>
-<country id="FI">Finland</country>
-<country id="FR">France</country>
+<country id="FI" eea="yes">Finland</country>
+<country id="FR" eea="yes">France</country>
 <country id="GF">French Guiana</country>
 <country id="PF">French Polynesia</country>
 <country id="TF">French Southern and Antarctic Lands</country>
@@ -101,11 +103,11 @@
 <country id="GM">Gambia</country>
 <!--<country id="">Gaza Strip</country> see Palestinian territories-->
 <country id="GE">Georgia</country>
-<country id="DE">Germany</country>
+<country id="DE" eea="yes">Germany</country>
 <country id="GH">Ghana</country>
 <country id="GI">Gibraltar</country>
 <!--<country id="">Glorioso Islands</country>-->
-<country id="GR">Greece</country>
+<country id="GR" eea="yes">Greece</country>
 <country id="GL">Greenland</country>
 <country id="GD">Grenada</country>
 <country id="GP">Guadeloupe</country>
@@ -119,16 +121,16 @@
 <country id="HM">Heard Island and McDonald Islands</country>
 <country id="HN">Honduras</country>
 <country id="HK">Hong Kong</country>
-<country id="HU">Hungary</country>
-<country id="IS">Iceland</country>
+<country id="HU" eea="yes">Hungary</country>
+<country id="IS" eea="yes">Iceland</country>
 <country id="IN">India</country>
 <country id="ID">Indonesia</country>
 <country id="IR">Iran (Islamic Republic of Iran)</country>
 <country id="IQ">Iraq</country>
-<country id="IE">Ireland</country>
+<country id="IE" eea="yes">Ireland</country>
 <country id="IM">Isle of Man</country>
 <country id="IL">Israel</country>
-<country id="IT">Italy</country>
+<country id="IT" eea="yes">Italy</country>
 <country id="JM">Jamaica</country>
 <country id="SJ">Jan Mayen</country>
 <country id="JP">Japan</country>
@@ -141,14 +143,14 @@
 <country id="KW">Kuwait</country>
 <country id="KG">Kyrgyzstan</country>
 <country id="LA">Lao People’s Democratic Republic</country>
-<country id="LV">Latvia</country>
+<country id="LV" eea="yes">Latvia</country>
 <country id="LB">Lebanon</country>
 <country id="LS">Lesotho</country>
 <country id="LR">Liberia</country>
 <country id="LY">Libya</country>
-<country id="LI">Liechtenstein</country>
-<country id="LT">Lithuania</country>
-<country id="LU">Luxembourg</country>
+<country id="LI" eea="yes">Liechtenstein</country>
+<country id="LT" eea="yes">Lithuania</country>
+<country id="LU" eea="yes">Luxembourg</country>
 <country id="MO">Macau</country>
 <country id="MK">Macedonia (The former Yugoslav Republic of Macedonia)</country>
 <country id="MG">Madagascar</country>
@@ -156,7 +158,7 @@
 <country id="MY">Malaysia</country>
 <country id="MV">Maldives</country>
 <country id="ML">Mali</country>
-<country id="MT">Malta</country>
+<country id="MT" eea="yes">Malta</country>
 <country id="MH">Marshall Islands</country>
 <country id="MQ">Martinique</country>
 <country id="MR">Mauritania</country>
@@ -175,7 +177,7 @@
 <country id="NR">Nauru</country>
 <!--<country id="">Navassa Island</country>-->
 <country id="NP">Nepal</country>
-<country id="NL">Netherlands</country>
+<country id="NL" eea="yes">Netherlands</country>
 <country id="NC">New Caledonia</country>
 <country id="NZ">New Zealand</country>
 <country id="NI">Nicaragua</country>
@@ -184,7 +186,7 @@
 <country id="NU">Niue</country>
 <country id="NF">Norfolk Island</country>
 <country id="MP">Northern Mariana Islands</country>
-<country id="NO">Norway</country>
+<country id="NO" eea="yes">Norway</country>
 <country id="OM">Oman</country>
 <country id="PK">Pakistan</country>
 <country id="PW">Palau</country>
@@ -196,14 +198,14 @@
 <country id="PE">Peru</country>
 <country id="PH">Philippines</country>
 <country id="PN">Pitcairn Islands</country>
-<country id="PL">Poland</country>
-<country id="PT">Portugal</country>
+<country id="PL" eea="yes">Poland</country>
+<country id="PT" eea="yes">Portugal</country>
 <country id="PR">Puerto Rico</country>
 <country id="QA">Qatar</country>
 <country id="KR">Republic of Korea (South Korea)</country>
 <country id="MD">Republic of Moldova</country>
 <country id="RE">Reunion</country>
-<country id="RO">Romania</country>
+<country id="RO" eea="yes">Romania</country>
 <country id="RU">Russian Federation</country>
 <country id="RW">Rwanda</country>
 <country id="SH">Saint Helena</country>
@@ -222,21 +224,21 @@
 <country id="SG">Singapore</country>
 <country id="SX">Sint Maarten</country>
 <country id="SK">Slovakia</country>
-<country id="SI">Slovenia</country>
+<country id="SI" eea="yes">Slovenia</country>
 <country id="SB">Solomon Islands</country>
 <country id="SO">Somalia</country>
 <country id="ZA">South Africa</country>
 <country id="GS">South Georgia and the South Sandwich Islands</country>
 <country id="SS">South Sudan (Juba)</country>
-<country id="ES">Spain</country>
+<country id="ES" eea="yes">Spain</country>
 <!--<country id="">Spratly Islands</country>-->
 <country id="LK">Sri Lanka</country>
 <country id="SD">Sudan (Khartoum)</country>
 <country id="SR">Suriname</country>
 <country id="SJ">Svalbard</country>
 <country id="SZ">Swaziland</country>
-<country id="SE">Sweden</country>
-<country id="CH">Switzerland</country>
+<country id="SE" eea="yes">Sweden</country>
+<country id="CH" eea="yes">Switzerland</country>
 <country id="SY">Syrian Arab Republic</country>
 <country id="TW">Taiwan</country>
 <country id="TJ">Tajikistan</country>
@@ -248,14 +250,14 @@
 <country id="TT">Trinidad and Tobago</country>
 <!--<country id="">Tromelin Island</country>-->
 <country id="TN">Tunisia</country>
-<country id="TR">Turkey</country>
+<country id="TR" eea="yes">Turkey</country>
 <country id="TM">Turkmenistan</country>
 <country id="TC">Turks and Caicos Islands</country>
 <country id="TV">Tuvalu</country>
 <country id="UG">Uganda</country>
 <country id="UA">Ukraine</country>
 <country id="AE">United Arab Emirates</country>
-<country id="GB">United Kingdom of Great Britain and Northern Ireland</country>
+<country id="GB" eea="yes">United Kingdom of Great Britain and Northern Ireland</country>
 <country id="TZ">United Republic of Tanzania</country>
 <country id="US">United States of America</country>
 <country id="UY">Uruguay</country>
diff --git a/tools/countries.et.xml b/tools/countries.et.xml
index 4c954529ec..9edb856815 100644
--- a/tools/countries.et.xml
+++ b/tools/countries.et.xml
@@ -7,6 +7,8 @@
 	
 	-->
 
+  <!-- eea is European Economic Area plus a few manual additions where we want to send to -->
+
 <countryset>
   <version>1</version>
 
@@ -14,7 +16,7 @@
 <country id="AF">Afganistan</country>
 <!--<country id="">Akrotiri and Dhekelia</country> The Sovereign Base Areas of Akrotiri and Dhekelia, Cyprus, Greece-->
 <country id="AX">Ahvenamaa</country>
-<country id="AL">Albaania</country>
+<country id="AL" eea="yes">Albaania</country>
 <country id="DZ">Alžeeria</country>
 <country id="AS">Ameerika Samoa</country>
 <country id="AD">Andorra</country>
@@ -27,7 +29,7 @@
 <country id="AW">Aruba</country>
 <!--<country id="">Ashmore and Cartier Islands</country>-->
 <country id="AU">Austraalia</country>
-<country id="AT">Austria</country>
+<country id="AT" eea="yes">Austria</country>
 <country id="AZ">Aserbaidžaan</country>
 <country id="BS">Bahama</country><!-- Bahamas, The -->
 <country id="BH">Bahrein</country>
@@ -35,7 +37,7 @@
 <country id="BB">Barbados</country>
 <!--<country id="">Bassas da India</country>-->
 <country id="BY">Valgevene</country>
-<country id="BE">Belgia</country>
+<country id="BE" eea="yes">Belgia</country>
 <country id="BZ">Belize</country>
 <country id="BJ">Benin</country>
 <country id="BM">Bermuda</country>
@@ -48,7 +50,7 @@
 <country id="IO">British India ookeani ala</country>
 <country id="VG">British Neitsisaared</country>
 <country id="BN">Brunei</country>
-<country id="BG">Bulgaaria</country>
+<country id="BG" eea="yes">Bulgaaria</country>
 <country id="BF">Burkina Faso</country>
 <country id="BI">Burundi</country>
 <country id="KH">Kambodža</country>
@@ -70,14 +72,14 @@
 <!--<country id="">Coral Sea Islands</country>Gay and Lesbian Kingdom of the Coral Sea Islands, Australia-->
 <country id="CR">Costa Rica</country>
 <country id="CI">Côte d’Ivoire</country>
-<country id="HR">Horvaatia</country>
+<country id="HR" eea="yes">Horvaatia</country>
 <country id="CU">Kuuba</country>
 <country id="CW">Curaçao</country>
-<country id="CY">Küpros</country>
-<country id="CZ">Tšehhi</country>
+<country id="CY" eea="yes">Küpros</country>
+<country id="CZ" eea="yes">Tšehhi</country>
 <country id="KP">Põhja-Korea</country>
 <country id="CD">Kongo Demokraatlik Vabariik</country>
-<country id="DK">Taani</country>
+<country id="DK" eea="yes">Taani</country>
 <country id="DJ">Djibouti</country>
 <country id="DM">Dominica</country>
 <country id="DO">Dominikaani Vabariik</country>
@@ -86,14 +88,14 @@
 <country id="SV">El Salvador</country>
 <country id="GQ">Ekvatoriaal-Guinea</country>
 <country id="ER">Eritrea</country>
-<country id="EE">Eesti</country>
+<country id="EE" eea="yes">Eesti</country>
 <country id="ET">Etioopia</country>
 <!--<country id="">Europa Island</country>-->
 <country id="FK">Falklandi saared</country>
 <country id="FO">Fääri saared</country>
 <country id="FJ">Fidži</country>
-<country id="FI">Soome</country>
-<country id="FR">Prantsusmaa</country>
+<country id="FI" eea="yes">Soome</country>
+<country id="FR" eea="yes">Prantsusmaa</country>
 <country id="GF">Prantsuse Guajaana</country>
 <country id="PF">Prantsuse Polüneesia</country>
 <country id="TF">Prantsuse Antarktika ja Lõunaalad</country>
@@ -101,11 +103,11 @@
 <country id="GM">Gambia</country>
 <!--<country id="">Gaza Strip</country> see Palestinian territories-->
 <country id="GE">Gruusia</country>
-<country id="DE">Saksamaa</country>
+<country id="DE" eea="yes">Saksamaa</country>
 <country id="GH">Ghana</country>
 <country id="GI">Gibraltar</country>
 <!--<country id="">Glorioso Islands</country>-->
-<country id="GR">Kreeka</country>
+<country id="GR" eea="yes">Kreeka</country>
 <country id="GL">Gröönimaa</country>
 <country id="GD">Grenada</country>
 <country id="GP">Guadeloupe</country>
@@ -119,16 +121,16 @@
 <country id="HM">Heard ja McDonald</country>
 <country id="HN">Honduras</country>
 <country id="HK">Hongkong</country>
-<country id="HU">Ungari</country>
-<country id="IS">Island</country>
+<country id="HU" eea="yes">Ungari</country>
+<country id="IS" eea="yes">Island</country>
 <country id="IN">India</country>
 <country id="ID">Indoneesia</country>
 <country id="IR">Iraan</country>
 <country id="IQ">Iraak</country>
-<country id="IE">Iirimaa</country>
+<country id="IE" eea="yes">Iirimaa</country>
 <country id="IM">Man</country>
 <country id="IL">Iisrael</country>
-<country id="IT">Itaalia</country>
+<country id="IT" eea="yes">Itaalia</country>
 <country id="JM">Jamaica</country>
 <country id="SJ">Jan Mayen</country>
 <country id="JP">Jaapan</country>
@@ -141,14 +143,14 @@
 <country id="KW">Kuveit</country>
 <country id="KG">Kõrgõzstan</country>
 <country id="LA">Laos</country>
-<country id="LV">Läti</country>
+<country id="LV" eea="yes">Läti</country>
 <country id="LB">Liibanon</country>
 <country id="LS">Lesotho</country>
 <country id="LR">Libeeria</country>
 <country id="LY">Liibüa</country>
-<country id="LI">Liechtenstein</country>
-<country id="LT">Leedu</country>
-<country id="LU">Luksemburg</country>
+<country id="LI" eea="yes">Liechtenstein</country>
+<country id="LT" eea="yes">Leedu</country>
+<country id="LU" eea="yes">Luksemburg</country>
 <country id="MO">Aomen</country>
 <country id="MK">Makedoonia</country>
 <country id="MG">Madagaskar</country>
@@ -156,7 +158,7 @@
 <country id="MY">Malaisia</country>
 <country id="MV">Maldiivid</country>
 <country id="ML">Mali</country>
-<country id="MT">Malta</country>
+<country id="MT" eea="yes">Malta</country>
 <country id="MH">Marshalli saared</country>
 <country id="MQ">Martinique</country>
 <country id="MR">Mauritaania</country>
@@ -175,7 +177,7 @@
 <country id="NR">Nauru</country>
 <!--<country id="">Navassa Island</country>-->
 <country id="NP">Nepal</country>
-<country id="NL">Holland</country>
+<country id="NL" eea="yes">Holland</country>
 <country id="NC">Uus-Kaledoonia</country>
 <country id="NZ">Uus-Meremaa</country>
 <country id="NI">Nicaragua</country>
@@ -184,7 +186,7 @@
 <country id="NU">Niue</country>
 <country id="NF">Norfolki saar</country>
 <country id="MP">Põhja-Mariaanid</country>
-<country id="NO">Norra</country>
+<country id="NO" eea="yes">Norra</country>
 <country id="OM">Omaan</country>
 <country id="PK">Pakistan</country>
 <country id="PW">Belau</country>
@@ -196,14 +198,14 @@
 <country id="PE">Peruu</country>
 <country id="PH">Filipiinid</country>
 <country id="PN">Pitcairn</country>
-<country id="PL">Poola</country>
-<country id="PT">Portugal</country>
+<country id="PL" eea="yes">Poola</country>
+<country id="PT" eea="yes">Portugal</country>
 <country id="PR">Puerto Rico</country>
 <country id="QA">Katar</country>
 <country id="KR">Korea Vabariik (Lõuna-Korea)</country>
 <country id="MD">Moldova</country>
 <country id="RE">Réunion</country>
-<country id="RO">Rumeenia</country>
+<country id="RO" eea="yes">Rumeenia</country>
 <country id="RU">Vene Föderatsioon</country>
 <country id="RW">Rwanda</country>
 <country id="SH">Saint Helena</country>
@@ -222,21 +224,21 @@
 <country id="SG">Singapur</country>
 <country id="SX">Sint Maarten</country>
 <country id="SK">Slovakkia</country>
-<country id="SI">Sloveenia</country>
+<country id="SI" eea="yes">Sloveenia</country>
 <country id="SB">Saalomoni saared</country>
 <country id="SO">Somaalia</country>
 <country id="ZA">Lõuna-Aafrika Vabariik</country>
 <country id="GS">Lõuna-Georgia ja Lõuna-Sandwichi saared</country>
 <country id="SS">Lõuna-Sudaan</country>
-<country id="ES">Hispaania</country>
+<country id="ES" eea="yes">Hispaania</country>
 <!--<country id="">Spratly Islands</country>-->
 <country id="LK">Sri Lanka</country>
 <country id="SD">Sudaan</country>
 <country id="SR">Suriname</country>
 <country id="SJ">Svalbard</country>
 <country id="SZ">Svaasimaa</country>
-<country id="SE">Rootsi</country>
-<country id="CH">Šveits</country>
+<country id="SE" eea="yes">Rootsi</country>
+<country id="CH" eea="yes">Šveits</country>
 <country id="SY">Süüria</country>
 <country id="TW">Hiina Vabariik (Taiwan)</country>
 <country id="TJ">Tadžikistan</country>
@@ -248,14 +250,14 @@
 <country id="TT">Trinidad ja Tobago</country>
 <!--<country id="">Tromelin Island</country>-->
 <country id="TN">Tuneesia</country>
-<country id="TR">Türgi</country>
+<country id="TR" eea="yes">Türgi</country>
 <country id="TM">Türkmenistan</country>
 <country id="TC">Turks ja Caicos</country>
 <country id="TV">Tuvalu</country>
 <country id="UG">Uganda</country>
 <country id="UA">Ukraina</country>
 <country id="AE">Araabia Ühendemiraadid</country>
-<country id="GB">Ühendkuningriik</country>
+<country id="GB" eea="yes">Ühendkuningriik</country>
 <country id="TZ">Tansaania</country>
 <country id="US">Ameerika Ühendriigid</country>
 <country id="UY">Uruguay</country>
diff --git a/tools/countries.it.xml b/tools/countries.it.xml
index a1ced488dc..2d2378853b 100644
--- a/tools/countries.it.xml
+++ b/tools/countries.it.xml
@@ -7,6 +7,8 @@
 	
 	-->
 
+  <!-- eea is European Economic Area plus a few manual additions where we want to send to -->
+
 <countryset>
   <version>1</version>
 
@@ -14,7 +16,7 @@
 <country id="AF">Afghanistan</country>
 <!--<country id="">Akrotiri and Dhekelia</country> The Sovereign Base Areas of Akrotiri and Dhekelia, Cyprus, Greece-->
 <country id="AX">Isole Åland</country>
-<country id="AL">Albania</country>
+<country id="AL" eea="yes">Albania</country>
 <country id="DZ">Algeria</country>
 <country id="AS">Samoa americane</country>
 <country id="AD">Andorra</country>
@@ -27,7 +29,7 @@
 <country id="AW">Aruba</country>
 <!--<country id="">Ashmore and Cartier Islands</country>-->
 <country id="AU">Australia</country>
-<country id="AT">Austria</country>
+<country id="AT" eea="yes">Austria</country>
 <country id="AZ">Azerbaigian</country>
 <country id="BS">Bahamas</country><!-- Bahamas, The -->
 <country id="BH">Bahrein</country>
@@ -35,7 +37,7 @@
 <country id="BB">Barbados</country>
 <!--<country id="">Bassas da India</country>-->
 <country id="BY">Bielorussia</country>
-<country id="BE">Belgio</country>
+<country id="BE" eea="yes">Belgio</country>
 <country id="BZ">Belize</country>
 <country id="BJ">Benin</country>
 <country id="BM">Bermuda</country>
@@ -48,7 +50,7 @@
 <country id="IO">Territorio britannico dell'Oceano Indiano</country>
 <country id="VG">Isole Vergini britanniche</country>
 <country id="BN">Brunei</country>
-<country id="BG">Bulgaria</country>
+<country id="BG" eea="yes">Bulgaria</country>
 <country id="BF">Burkina Faso</country>
 <country id="BI">Burundi</country>
 <country id="KH">Cambogia</country>
@@ -70,14 +72,14 @@
 <!--<country id="">Coral Sea Islands</country>Gay and Lesbian Kingdom of the Coral Sea Islands, Australia-->
 <country id="CR">Costa Rica</country>
 <country id="CI">Costa d'Avorio</country>
-<country id="HR">Croazia</country>
+<country id="HR" eea="yes">Croazia</country>
 <country id="CU">Cuba</country>
 <country id="CW">Curaçao</country>
-<country id="CY">Cipro</country>
-<country id="CZ">Repubblica Ceca</country>
+<country id="CY" eea="yes">Cipro</country>
+<country id="CZ" eea="yes">Repubblica Ceca</country>
 <country id="KP">Repubblica Popolare Democratica di Corea (Corea del nord)</country>
 <country id="CD">Repubblica Democratica del Congo (Kinshasa)</country>
-<country id="DK">Danimarca</country>
+<country id="DK" eea="yes">Danimarca</country>
 <country id="DJ">Gibuti</country>
 <country id="DM">Dominica</country>
 <country id="DO">Repubblica Dominicana</country>
@@ -86,14 +88,14 @@
 <country id="SV">El Salvador</country>
 <country id="GQ">Guinea Equatoriale</country>
 <country id="ER">Eritrea</country>
-<country id="EE">Estonia</country>
+<country id="EE" eea="yes">Estonia</country>
 <country id="ET">Etiopia</country>
 <!--<country id="">Europa Island</country>-->
 <country id="FK">Isole Falkland (Isole Malvine)</country>
 <country id="FO">Isole Faroe</country>
 <country id="FJ">Figi</country>
-<country id="FI">Finlandia</country>
-<country id="FR">Francia</country>
+<country id="FI" eea="yes">Finlandia</country>
+<country id="FR" eea="yes">Francia</country>
 <country id="GF">Guyana francese</country>
 <country id="PF">Polinesia francese</country>
 <country id="TF">Terre australi e antartiche francesi</country>
@@ -101,11 +103,11 @@
 <country id="GM">Gambia</country>
 <!--<country id="">Gaza Strip</country> see Palestinian territories-->
 <country id="GE">Georgia</country>
-<country id="DE">Germania</country>
+<country id="DE" eea="yes">Germania</country>
 <country id="GH">Ghana</country>
 <country id="GI">Gibilterra</country>
 <!--<country id="">Glorioso Islands</country>-->
-<country id="GR">Grecia</country>
+<country id="GR" eea="yes">Grecia</country>
 <country id="GL">Groenlandia</country>
 <country id="GD">Grenada</country>
 <country id="GP">Guadalupa</country>
@@ -119,16 +121,16 @@
 <country id="HM">Isole Heard e McDonald</country>
 <country id="HN">Honduras</country>
 <country id="HK">Hong Kong</country>
-<country id="HU">Ungheria</country>
-<country id="IS">Islanda</country>
+<country id="HU" eea="yes">Ungheria</country>
+<country id="IS" eea="yes">Islanda</country>
 <country id="IN">India</country>
 <country id="ID">Indonesia</country>
 <country id="IR">Iran</country>
 <country id="IQ">Iraq</country>
-<country id="IE">Irlanda</country>
+<country id="IE" eea="yes">Irlanda</country>
 <country id="IM">Isola di Man</country>
 <country id="IL">Israele</country>
-<country id="IT">Italia</country>
+<country id="IT" eea="yes">Italia</country>
 <country id="JM">Giamaica</country>
 <country id="SJ">Isola di Jan Mayen</country>
 <country id="JP">Giappone</country>
@@ -141,14 +143,14 @@
 <country id="KW">Kuwait</country>
 <country id="KG">Kirghizistan</country>
 <country id="LA">Repubblica Popolare Democratica del Laos</country>
-<country id="LV">Lettonia</country>
+<country id="LV" eea="yes">Lettonia</country>
 <country id="LB">Libano</country>
 <country id="LS">Lesotho</country>
 <country id="LR">Liberia</country>
 <country id="LY">Libia</country>
-<country id="LI">Liechtenstein</country>
-<country id="LT">Lituania</country>
-<country id="LU">Lussemburgo</country>
+<country id="LI" eea="yes">Liechtenstein</country>
+<country id="LT" eea="yes">Lituania</country>
+<country id="LU" eea="yes">Lussemburgo</country>
 <country id="MO">Macao</country>
 <country id="MK">Macedonia (ex Repubblica Jugoslava di Macedonia)</country>
 <country id="MG">Madagascar</country>
@@ -156,7 +158,7 @@
 <country id="MY">Malesia</country>
 <country id="MV">Maldive</country>
 <country id="ML">Mali</country>
-<country id="MT">Malta</country>
+<country id="MT" eea="yes">Malta</country>
 <country id="MH">Isole Marshall</country>
 <country id="MQ">Martinica</country>
 <country id="MR">Mauritania</country>
@@ -175,7 +177,7 @@
 <country id="NR">Nauru</country>
 <!--<country id="">Navassa Island</country>-->
 <country id="NP">Nepal</country>
-<country id="NL">Paesi Bassi</country>
+<country id="NL" eea="yes">Paesi Bassi</country>
 <country id="NC">Nuova Caledonia</country>
 <country id="NZ">Nuova Zelanda</country>
 <country id="NI">Nicaragua</country>
@@ -184,7 +186,7 @@
 <country id="NU">Niue</country>
 <country id="NF">Isola Norfolk</country>
 <country id="MP">Isole Marianne Settentrionali</country>
-<country id="NO">Norvegia</country>
+<country id="NO" eea="yes">Norvegia</country>
 <country id="OM">Oman</country>
 <country id="PK">Pakistan</country>
 <country id="PW">Palau</country>
@@ -196,14 +198,14 @@
 <country id="PE">Perù</country>
 <country id="PH">Filippine</country>
 <country id="PN">Isola Pitcairn</country>
-<country id="PL">Polonia</country>
-<country id="PT">Portogallo</country>
+<country id="PL" eea="yes">Polonia</country>
+<country id="PT" eea="yes">Portogallo</country>
 <country id="PR">Porto Rico</country>
 <country id="QA">Qatar</country>
 <country id="KR">Repubblica di Corea (Corea del sud)</country>
 <country id="MD">Repubblica di Moldavia</country>
 <country id="RE">Isola della Riunione</country>
-<country id="RO">Romania</country>
+<country id="RO" eea="yes">Romania</country>
 <country id="RU">Federazione Russa</country>
 <country id="RW">Ruanda</country>
 <country id="SH">Sant'Elena</country>
@@ -222,21 +224,21 @@
 <country id="SG">Singapore</country>
 <country id="SX">Sint Maarten</country>
 <country id="SK">Slovacchia</country>
-<country id="SI">Slovenia</country>
+<country id="SI" eea="yes">Slovenia</country>
 <country id="SB">Isole Salomone</country>
 <country id="SO">Somalia</country>
 <country id="ZA">Sudafrica</country>
 <country id="GS">Georgia del Sud e Isole Sandwich Australi</country>
 <country id="SS">Sudan del Sud (Giuba)</country>
-<country id="ES">Spagna</country>
+<country id="ES" eea="yes">Spagna</country>
 <!--<country id="">Spratly Islands</country>-->
 <country id="LK">Sri Lanka</country>
 <country id="SD">Sudan (Khartoum)</country>
 <country id="SR">Suriname</country>
 <country id="SJ">Isole Svalbard</country>
 <country id="SZ">Swaziland</country>
-<country id="SE">Svezia</country>
-<country id="CH">Svizzera</country>
+<country id="SE" eea="yes">Svezia</country>
+<country id="CH" eea="yes">Svizzera</country>
 <country id="SY">Repubblica Araba di Siria</country>
 <country id="TW">Repubblica di Cina</country>
 <country id="TJ">Tagikistan</country>
@@ -248,14 +250,14 @@
 <country id="TT">Trinidad e Tobago</country>
 <!--<country id="">Tromelin Island</country>-->
 <country id="TN">Tunisia</country>
-<country id="TR">Turchia</country>
+<country id="TR" eea="yes">Turchia</country>
 <country id="TM">Turkmenistan</country>
 <country id="TC">Turks e Caicos</country>
 <country id="TV">Tuvalu</country>
 <country id="UG">Uganda</country>
 <country id="UA">Ucraina</country>
 <country id="AE">Emirati Arabi Uniti</country>
-<country id="GB">Regno Unito</country>
+<country id="GB" eea="yes">Regno Unito</country>
 <country id="TZ">Repubblica Unita di Tanzania</country>
 <country id="US">Stati Uniti d'America</country>
 <country id="UY">Uruguay</country>
diff --git a/tools/countries.ru.xml b/tools/countries.ru.xml
index 70dd97c8d4..7829d62c4b 100644
--- a/tools/countries.ru.xml
+++ b/tools/countries.ru.xml
@@ -9,15 +9,17 @@
         ("Общероссийский классификатор стран мира") were used.
 	-->
 
+  <!-- eea is European Economic Area plus a few manual additions where we want to send to -->
+
 <countryset>
   <version>1</version>
 
 
 <country id="AU">Австралия</country>
-<country id="AT">Австрия</country>
+<country id="AT" eea="yes">Австрия</country>
 <country id="AZ">Азербайджан</country>
 <!--<country id="">Akrotiri and Dhekelia</country> The Sovereign Base Areas of Akrotiri and Dhekelia, Cyprus, Greece-->
-<country id="AL">Албания</country>
+<country id="AL" eea="yes">Албания</country>
 <country id="DZ">Алжир</country>
 <country id="AS">Американское Самоа</country>
 <country id="AI">Ангилья</country>
@@ -37,10 +39,10 @@
 <!--<country id="">Bassas da India</country>-->
 <country id="BY">Беларусь</country>
 <country id="BZ">Белиз</country>
-<country id="BE">Бельгия</country>
+<country id="BE" eea="yes">Бельгия</country>
 <country id="BJ">Бенин</country>
 <country id="BM">Бермуды</country>
-<country id="BG">Болгария</country>
+<country id="BG" eea="yes">Болгария</country>
 <country id="BO">Боливия</country>
 <country id="BA">Босния и Герцеговина</country>
 <country id="BW">Ботсвана</country>
@@ -53,7 +55,7 @@
 <country id="BT">Бутан</country>
 <country id="VU">Вануату</country>
 <country id="VA">Ватикан</country>
-<country id="HU">Венгрия</country>
+<country id="HU" eea="yes">Венгрия</country>
 <country id="VE">Венесуэла</country>
 <country id="VN">Вьетнам</country>
 <country id="VG">Виргинские острова</country>
@@ -67,7 +69,7 @@
 <country id="GT">Гватемала</country>
 <country id="GN">Гвинея</country>
 <country id="GW">Гвинея-Бисау</country>
-<country id="DE">Германия</country>
+<country id="DE" eea="yes">Германия</country>
 <country id="GG">Гернси</country>
 <country id="GI">Гибралтар</country>
 <!--<country id="">Glorioso Islands</country>-->
@@ -75,10 +77,10 @@
 <country id="HK">Гонконг</country>
 <country id="GD">Гренада</country>
 <country id="GL">Гренландия</country>
-<country id="GR">Греция</country>
+<country id="GR" eea="yes">Греция</country>
 <country id="GE">Грузия</country>
 <country id="GU">Гуам</country>
-<country id="DK">Дания</country>
+<country id="DK" eea="yes">Дания</country>
 <country id="CD">Демократическая Республика Конго</country>
 <country id="JE">Джерси</country>
 <country id="DJ">Джибути</country>
@@ -94,11 +96,11 @@
 <country id="ID">Индонезия</country>
 <country id="IQ">Ирак</country>
 <country id="IR">Иран</country>
-<country id="IE">Ирландия</country>
+<country id="IE" eea="yes">Ирландия</country>
 <country id="JO">Иордания</country>
-<country id="IS">Исландия</country>
-<country id="ES">Испания</country>
-<country id="IT">Италия</country>
+<country id="IS" eea="yes">Исландия</country>
+<country id="ES" eea="yes">Испания</country>
+<country id="IT" eea="yes">Италия</country>
 <country id="CV">Кабо-Верде</country>
 <country id="KZ">Казахстан</country>
 <country id="KH">Камбоджа</country>
@@ -106,7 +108,7 @@
 <country id="CA">Канада</country>
 <country id="QA">Катар</country>
 <country id="KE">Кения</country>
-<country id="CY">Кипр</country>
+<country id="CY" eea="yes">Кипр</country>
 <country id="KG">Киргизия</country>
 <country id="KI">Кирибати</country>
 <country id="CN">Китай</country>
@@ -126,14 +128,14 @@
 <!--<country id="">Europa Island</country>-->
 <!--<country id="">Juan de Nova Island</country>-->
 <country id="LA">Лаосская Народно-Демократическая Республика</country>
-<country id="LV">Латвия</country>
+<country id="LV" eea="yes">Латвия</country>
 <country id="LS">Лесото</country>
 <country id="LR">Либерия</country>
 <country id="LB">Ливан</country>
 <country id="LY">Ливийская Арабская Джамахирия</country>
-<country id="LT">Литва</country>
-<country id="LI">Лихтенштейн</country>
-<country id="LU">Люксембург</country>
+<country id="LT" eea="yes">Литва</country>
+<country id="LI" eea="yes">Лихтенштейн</country>
+<country id="LU" eea="yes">Люксембург</country>
 <country id="MU">Маврикий</country>
 <country id="MR">Мавритания</country>
 <country id="MG">Мадагаскар</country>
@@ -143,7 +145,7 @@
 <country id="MY">Малайзия</country>
 <country id="ML">Мали</country>
 <country id="MV">Мальдивы</country>
-<country id="MT">Мальта</country>
+<country id="MT" eea="yes">Мальта</country>
 <country id="MQ">Мартиника</country>
 <country id="MH">Маршалловы Острова</country>
 <country id="MX">Мексика</country>
@@ -159,14 +161,14 @@
 <country id="NR">Науру</country>
 <!--<country id="">Navassa Island</country>-->
 <country id="NP">Непал</country>
-<country id="NL">Нидерланды</country>
+<country id="NL" eea="yes">Нидерланды</country>
 <country id="NE">Нигер</country>
 <country id="NG">Нигерия</country>
 <country id="NI">Никарагуа</country>
 <country id="NU">Ниуэ</country>
 <country id="NZ">Новая Зеландия</country>
 <country id="NC">Новая Каледония</country>
-<country id="NO">Норвегия</country>
+<country id="NO" eea="yes">Норвегия</country>
 <country id="TZ">Объединенная Республика Танзания</country>
 <country id="AE">Объединенные Арабские Эмираты</country>
 <country id="OM">Оман</country>
@@ -187,13 +189,13 @@
 <country id="PY">Парагвай</country>
 <country id="PE">Перу</country>
 <country id="PN">Питкерн</country>
-<country id="PL">Польша</country>
-<country id="PT">Португалия</country>
+<country id="PL" eea="yes">Польша</country>
+<country id="PT" eea="yes">Португалия</country>
 <country id="PR">Пуэрто-Рико</country>
 <country id="MK">Республика Македония</country>
 <country id="RE">Реюньон</country>
 <country id="RU">Россия</country>
-<country id="RO">Румыния</country>
+<country id="RO" eea="yes">Румыния</country>
 <country id="RW">Руанда</country>
 <country id="WS">Самоа</country>
 <country id="SM">Сан-Марино</country>
@@ -213,8 +215,8 @@
 <country id="SX">Синт-Мартен</country>
 <country id="SY">Сирийская Арабская Республика</country>
 <country id="SK">Словакия</country>
-<country id="SI">Словения</country>
-<country id="GB">Соединенное Королевство</country>
+<country id="SI" eea="yes">Словения</country>
+<country id="GB" eea="yes">Соединенное Королевство</country>
 <country id="US">Соединенные Штаты</country>
 <country id="SB">Соломоновы Острова</country>
 <country id="SO">Сомали</country>
@@ -234,7 +236,7 @@
 <country id="TV">Тувалу</country>
 <country id="TN">Тунис</country>
 <country id="TM">Туркмения</country>
-<country id="TR">Турция</country>
+<country id="TR" eea="yes">Турция</country>
 <country id="UG">Уганда</country>
 <country id="UA">Украина</country>
 <country id="WF">Уоллис и Футуна</country>
@@ -243,22 +245,22 @@
 <country id="FO">Фарерские острова</country>
 <country id="FJ">Фиджи</country>
 <country id="PH">Филиппины</country>
-<country id="FI">Финляндия</country>
+<country id="FI" eea="yes">Финляндия</country>
 <country id="FK">Фолклендские (Мальвинские) острова</country>
-<country id="FR">Франция</country>
+<country id="FR" eea="yes">Франция</country>
 <country id="GF">Французская Гвиана</country>
 <country id="PF">Французская Полинезия</country>
 <country id="TF">Французские Южные территории</country>
-<country id="HR">Хорватия</country>
+<country id="HR" eea="yes">Хорватия</country>
 <country id="CF">Центрально-Африканская Республика</country>
 <country id="TD">Чад</country>
 <country id="ME">Черногория</country>
-<country id="CZ">Чешская Республика</country>
+<country id="CZ" eea="yes">Чешская Республика</country>
 <country id="CL">Чили</country>
 <!--<country id="">Wake Island</country>-->
 <!--<country id="">West Bank</country> see Palestinian territories-->
-<country id="CH">Швейцария</country>
-<country id="SE">Швеция</country>
+<country id="CH" eea="yes">Швейцария</country>
+<country id="SE" eea="yes">Швеция</country>
 <country id="SJ">Шпицберген и Ян Майен</country>
 <country id="LK">Шри-Ланка</country>
 <country id="EC">Эквадор</country>
@@ -266,7 +268,7 @@
 <country id="AX">Эландские острова</country>
 <country id="SV">Эль-Сальвадор</country>
 <country id="ER">Эритрея</country>
-<country id="EE">Эстония</country>
+<country id="EE" eea="yes">Эстония</country>
 <country id="ET">Эфиопия</country>
 <country id="ZA">Южная Африка</country>
 <country id="GS">Южная Джорджия и Южные Сандвичевы острова</country>
diff --git a/tools/countries.sq.xml b/tools/countries.sq.xml
index 4bfd71fc3f..efa7793117 100644
--- a/tools/countries.sq.xml
+++ b/tools/countries.sq.xml
@@ -7,6 +7,8 @@
 	
 	-->
 
+  <!-- eea is European Economic Area plus a few manual additions where we want to send to -->
+
 <countryset>
   <version>1</version>
 
@@ -14,7 +16,7 @@
 <country id="AF">Afganistan</country>
 <!--<country id="">Akrotiri and Dhekelia</country> The Sovereign Base Areas of Akrotiri and Dhekelia, Cyprus, Greece-->
 <country id="AX">Ishujt Åland</country>
-<country id="AL">Shqipëri</country>
+<country id="AL" eea="yes">Shqipëri</country>
 <country id="DZ">Algjeri</country>
 <country id="AS">Samoa Amerikane</country>
 <country id="AD">Andorrë</country>
@@ -27,7 +29,7 @@
 <country id="AW">Arubë</country>
 <!--<country id="">Ashmore and Cartier Islands</country>-->
 <country id="AU">Australi</country>
-<country id="AT">Austri</country>
+<country id="AT" eea="yes">Austri</country>
 <country id="AZ">Azerbaixhan</country>
 <country id="BS">Bahamas</country><!-- Bahamas, The -->
 <country id="BH">Bahrein</country>
@@ -35,7 +37,7 @@
 <country id="BB">Barbados</country>
 <!--<country id="">Bassas da India</country>-->
 <country id="BY">Bjellorusi</country>
-<country id="BE">Belgjikë</country>
+<country id="BE" eea="yes">Belgjikë</country>
 <country id="BZ">Belize</country>
 <country id="BJ">Benini</country>
 <country id="BM">Bermudë</country>
@@ -48,7 +50,7 @@
 <country id="IO">Territoret Britanike të Oqeanit Indian</country>
 <country id="VG">Ishujt e Virgjër Britanikë</country>
 <country id="BN">Brunei Darusalam</country>
-<country id="BG">Bullgari</country>
+<country id="BG" eea="yes">Bullgari</country>
 <country id="BF">Burkina Faso</country>
 <country id="BI">Burundi</country>
 <country id="KH">Kamboxhia</country>
@@ -70,14 +72,14 @@
 <!--<country id="">Coral Sea Islands</country>Gay and Lesbian Kingdom of the Coral Sea Islands, Australia-->
 <country id="CR">Kosta Rikë</country>
 <country id="CI">Bregu i Fildishtë</country>
-<country id="HR">Kroaci</country>
+<country id="HR" eea="yes">Kroaci</country>
 <country id="CU">Kubë</country>
 <country id="CW">Kuraçao</country>
-<country id="CY">Qipro</country>
-<country id="CZ">Republika Çeke</country>
+<country id="CY" eea="yes">Qipro</country>
+<country id="CZ" eea="yes">Republika Çeke</country>
 <country id="KP">Republika Demokratike Popullore e Koresë (Korea e Veriut)</country>
 <country id="CD">Republika Demokratike e Kongos (Kinshasa)</country>
-<country id="DK">Danimarkë</country>
+<country id="DK" eea="yes">Danimarkë</country>
 <country id="DJ">Xhibut</country>
 <country id="DM">Dominikë</country>
 <country id="DO">Republika Dominikane</country>
@@ -86,14 +88,14 @@
 <country id="SV">Salvador</country>
 <country id="GQ">Guine Ekuatoriale</country>
 <country id="ER">Eritre</country>
-<country id="EE">Estoni</country>
+<country id="EE" eea="yes">Estoni</country>
 <country id="ET">Etiopi</country>
 <!--<country id="">Europa Island</country>-->
 <country id="FK">Ishujt Malvine (Ishujt Fokland)</country>
 <country id="FO">Ishujt Faroe</country>
 <country id="FJ">Fixhi</country>
-<country id="FI">Finlandë</country>
-<country id="FR">Francë</country>
+<country id="FI" eea="yes">Finlandë</country>
+<country id="FR" eea="yes">Francë</country>
 <country id="GF">Guajana Frënge</country>
 <country id="PF">Polinezia Frënge</country>
 <country id="TF">Tokat Frënge Jugore dhe të Antarktidës</country>
@@ -101,11 +103,11 @@
 <country id="GM">Gambia</country>
 <!--<country id="">Gaza Strip</country> see Palestinian territories-->
 <country id="GE">Gjeorgji</country>
-<country id="DE">Gjermani</country>
+<country id="DE" eea="yes">Gjermani</country>
 <country id="GH">Ganë</country>
 <country id="GI">Gjibraltar</country>
 <!--<country id="">Glorioso Islands</country>-->
-<country id="GR">Greqi</country>
+<country id="GR" eea="yes">Greqi</country>
 <country id="GL">Groenlandë</country>
 <country id="GD">Grenadë</country>
 <country id="GP">Guadalupë</country>
@@ -119,16 +121,16 @@
 <country id="HM">Ishulli Hërd dhe Ishujt McDonald</country>
 <country id="HN">Honduras</country>
 <country id="HK">Hong Kong</country>
-<country id="HU">Hungari</country>
-<country id="IS">Islandë</country>
+<country id="HU" eea="yes">Hungari</country>
+<country id="IS" eea="yes">Islandë</country>
 <country id="IN">Indi</country>
 <country id="ID">Indonezi</country>
 <country id="IR">Iran (Republika Islamike e Iranit)</country>
 <country id="IQ">Irak</country>
-<country id="IE">Irlandë</country>
+<country id="IE" eea="yes">Irlandë</country>
 <country id="IM">Ishulli i Robit</country>
 <country id="IL">Izrael</country>
-<country id="IT">Itali</country>
+<country id="IT" eea="yes">Itali</country>
 <country id="JM">Xhamaikë</country>
 <country id="SJ">Jan Majn</country>
 <country id="JP">Japoni</country>
@@ -141,14 +143,14 @@
 <country id="KW">Kuvajt</country>
 <country id="KG">Kirgizstan</country>
 <country id="LA">Republika Demokratike Popullore e Laosit</country>
-<country id="LV">Letoni</country>
+<country id="LV" eea="yes">Letoni</country>
 <country id="LB">Liban</country>
 <country id="LS">Lesoto</country>
 <country id="LR">Liberi</country>
 <country id="LY">Libi</country>
-<country id="LI">Lihtenshtein</country>
-<country id="LT">Lituani</country>
-<country id="LU">Luksemburg</country>
+<country id="LI" eea="yes">Lihtenshtein</country>
+<country id="LT" eea="yes">Lituani</country>
+<country id="LU" eea="yes">Luksemburg</country>
 <country id="MO">Makau</country>
 <country id="MK">Maqedoni (Ish Republika Jugosllave e Maqedonisë)</country>
 <country id="MG">Madagaskar</country>
@@ -156,7 +158,7 @@
 <country id="MY">Malajzi</country>
 <country id="MV">Maldive</country>
 <country id="ML">Mali</country>
-<country id="MT">Maltë</country>
+<country id="MT" eea="yes">Maltë</country>
 <country id="MH">Ishujt Marshall</country>
 <country id="MQ">Martinikë</country>
 <country id="MR">Mauritani</country>
@@ -175,7 +177,7 @@
 <country id="NR">Nauru</country>
 <!--<country id="">Navassa Island</country>-->
 <country id="NP">Nepal</country>
-<country id="NL">Hollandë</country>
+<country id="NL" eea="yes">Hollandë</country>
 <country id="NC">Kaledoni e Re</country>
 <country id="NZ">Zelandë e Re</country>
 <country id="NI">Nikaragua</country>
@@ -184,7 +186,7 @@
 <country id="NU">Niue</country>
 <country id="NF">Ishujt Norfolk</country>
 <country id="MP">Ishujt Veriorë Mariana</country>
-<country id="NO">Norvegji</country>
+<country id="NO" eea="yes">Norvegji</country>
 <country id="OM">Oman</country>
 <country id="PK">Pakistan</country>
 <country id="PW">Palau</country>
@@ -196,14 +198,14 @@
 <country id="PE">Peru</country>
 <country id="PH">Filipine</country>
 <country id="PN">Ishujt Pitkern</country>
-<country id="PL">Poloni</country>
-<country id="PT">Portugali</country>
+<country id="PL" eea="yes">Poloni</country>
+<country id="PT" eea="yes">Portugali</country>
 <country id="PR">Porto Riko</country>
 <country id="QA">Katar</country>
 <country id="KR">Republika e Koresë (Korea e Jugut)</country>
 <country id="MD">Republika e Moldavisë</country>
 <country id="RE">Reunioni</country>
-<country id="RO">Rumani</country>
+<country id="RO" eea="yes">Rumani</country>
 <country id="RU">Federata Ruse</country>
 <country id="RW">Ruandë</country>
 <country id="SH">Shën Helenë</country>
@@ -222,21 +224,21 @@
 <country id="SG">Singapor</country>
 <country id="SX">Sint Maarten</country>
 <country id="SK">Slovaki</country>
-<country id="SI">Sloveni</country>
+<country id="SI" eea="yes">Sloveni</country>
 <country id="SB">Ishujt Solomon</country>
 <country id="SO">Somali</country>
 <country id="ZA">Afrikë e Jugut</country>
 <country id="GS">Ishujt Xhorxhia Jugore dhe Sanduiçi Jugor</country>
 <country id="SS">Sudan i Jugut (Juba)</country>
-<country id="ES">Spanjë</country>
+<country id="ES" eea="yes">Spanjë</country>
 <!--<country id="">Spratly Islands</country>-->
 <country id="LK">Sri Lankë</country>
 <country id="SD">Sudan (Kartumi)</country>
 <country id="SR">Surinam</country>
 <country id="SJ">Svalbard</country>
 <country id="SZ">Svaziland</country>
-<country id="SE">Suedi</country>
-<country id="CH">Zvicër</country>
+<country id="SE" eea="yes">Suedi</country>
+<country id="CH" eea="yes">Zvicër</country>
 <country id="SY">Republika Arabe e Sirisë</country>
 <country id="TW">Taivan</country>
 <country id="TJ">Taxhikistan</country>
@@ -248,14 +250,14 @@
 <country id="TT">Trinidad dhe Tobago</country>
 <!--<country id="">Tromelin Island</country>-->
 <country id="TN">Tunizi</country>
-<country id="TR">Turqi</country>
+<country id="TR" eea="yes">Turqi</country>
 <country id="TM">Turkmenistan</country>
 <country id="TC">Ishujt Turks dhe Kaikos</country>
 <country id="TV">Tuvalu</country>
 <country id="UG">Ugandë</country>
 <country id="UA">Ukrainë</country>
 <country id="AE">Emiratet e Bashkuara Arabe</country>
-<country id="GB">Mbretëria e Bashkuar e Britanisë së Madhe dhe e Irlandës Veriore</country>
+<country id="GB" eea="yes">Mbretëria e Bashkuar e Britanisë së Madhe dhe e Irlandës Veriore</country>
 <country id="TZ">Republika e Bashkuar e Tanzanisë</country>
 <country id="US">Shtetet e Bashkuar të Amerikës</country>
 <country id="UY">Uruguai</country>