--- Locations.xml.in.orig	2004-12-01 20:32:55.000000000 +0100
+++ Locations.xml.in	2004-12-02 12:01:03.000000000 +0100
@@ -20061,122 +20061,201 @@
     </location>
   </country>
   <country>
+    <!-- TRANSLATOR: local name (nl): België -->
+    <!-- TRANSLATOR: local name (fr): Belgique -->
+    <!-- TRANSLATOR: local name (de): Belgien -->
     <_name>Belgium</_name>
-    <location>
-      <_name>Antwerpen</_name>
-      <code>EBAW</code>
-      <coordinates>51-12N 004-28E</coordinates>
-    </location>
-    <location>
-      <_name>Beauvechain</_name>
-      <code>EBBE</code>
-      <coordinates>50-45N 004-46E</coordinates>
-    </location>
-    <location>
-      <_name>Bertrix</_name>
-      <code>EBBX</code>
-      <coordinates>49-54N 005-13E</coordinates>
-    </location>
-    <location>
-      <_name>Brasschaat</_name>
-      <code>EBBT</code>
-      <coordinates>51-20N 004-30E</coordinates>
-    </location>
-    <location>
-      <_name>Charleroi</_name>
-      <code>EBCI</code>
-      <coordinates>50-28N 004-27E</coordinates>
-    </location>
-    <location>
-      <_name>Chievres</_name>
-      <code>EBCV</code>
-      <coordinates>50-34N 003-50E</coordinates>
-    </location>
-    <location>
-      <_name>Elsenborn</_name>
-      <code>EBLB</code>
-      <coordinates>50-28N 006-11E</coordinates>
-    </location>
-    <location>
-      <_name>Florennes</_name>
-      <code>EBFS</code>
-      <coordinates>50-14N 004-39E</coordinates>
-    </location>
-    <location>
-      <_name>Genk</_name>
-      <code>EBZW</code>
-      <coordinates>50-56N 005-30E</coordinates>
-    </location>
-    <location>
-      <_name>Gent</_name>
-      <code>EBGT</code>
-      <coordinates>51-11N 003-49E</coordinates>
-    </location>
-    <location>
-      <_name>Goetsenhoven</_name>
-      <code>EBTN</code>
-      <coordinates>50-47N 004-57E</coordinates>
-    </location>
-    <location>
-      <_name>Kleine Brogel</_name>
-      <code>EBBL</code>
-      <coordinates>51-10N 005-28E</coordinates>
-    </location>
-    <location>
-      <_name>Koksijde</_name>
-      <code>EBFN</code>
-      <coordinates>51-05N 002-39E</coordinates>
-    </location>
-    <location>
-      <_name>Liege</_name>
-      <code>EBLG</code>
-      <coordinates>50-39N 005-27E</coordinates>
-    </location>
-    <location>
-      <_name>Melsbroek Bel-Afb</_name>
-      <code>EBMB</code>
-      <coordinates>50-54N 004-30E</coordinates>
-    </location>
-    <location>
-      <_name>Munte</_name>
-      <code>EBMT</code>
-      <coordinates>50-56N 003-44E</coordinates>
-    </location>
-    <location>
-      <_name>Oostende</_name>
-      <code>EBOS</code>
-      <coordinates>51-12N 002-52E</coordinates>
-    </location>
-    <location>
-      <_name>Saint-Hubert</_name>
-      <code>EBSH</code>
-      <coordinates>50-02N 005-24E</coordinates>
-    </location>
-    <location>
-      <_name>Schaffen</_name>
-      <code>EBDT</code>
-      <coordinates>51-00N 005-04E</coordinates>
-    </location>
-    <location>
-      <_name>Sint-Truiden</_name>
-      <code>EBST</code>
-      <coordinates>50-48N 005-12E</coordinates>
-    </location>
-    <location>
-      <_name>Spa</_name>
-      <code>EBSP</code>
-      <coordinates>50-29N 005-55E</coordinates>
-    </location>
-    <location>
-      <_name>Weelde</_name>
-      <code>EBWE</code>
-      <coordinates>51-25N 005-00E</coordinates>
-    </location>
-    <location>
-      <_name>Zaventem</_name>
-      <code>EBBR</code>
-      <coordinates>50-54N 004-32E</coordinates>
-    </location>
+    <state>
+      <!-- TRANSLATOR: local name (nl): Antwerpen -->
+      <!-- TRANSLATOR: local name (fr): Anvers -->
+      <!-- TRANSLATOR: local name (de): Antwerpen -->
+      <_name>Antwerp</_name>
+      <location>
+        <!-- TRANSLATOR: local name (nl): Antwerpen -->
+        <!-- TRANSLATOR: local name (fr): Anvers -->
+        <!-- TRANSLATOR: local name (de): Antwerpen -->
+        <_name>Antwerp</_name>
+        <code>EBAW</code>
+        <coordinates>51-12N 004-28E</coordinates>
+      </location>
+      <location>
+        <_name>Brasschaat</_name>
+        <code>EBBT</code>
+        <coordinates>51-20N 004-30E</coordinates>
+      </location>
+      <location>
+        <_name>Weelde</_name>
+        <code>EBWE</code>
+        <coordinates>51-25N 005-00E</coordinates>
+      </location>
+    </state>
+    <state>
+      <!-- TRANSLATOR: local name (nl): Brussel, Vlaams- en Waals-Brabant -->
+      <!-- TRANSLATOR: local name (fr): Bruxelles, Brabant flamand et wallon -->
+      <!-- TRANSLATOR: local name (de): Brüssel, Flämish- und Wallonisch-Brabant -->
+      <_name>Brussels, Flemish and Walloon Brabant<_name>
+      <location>
+        <!-- TRANSLATOR: local name (nl): Bevekom -->
+        <!-- TRANSLATOR: local name (fr): Beauvechain -->
+        <!-- TRANSLATOR: local name (fr_BE): Bôvetchén -->
+        <_name>Beauvechain</_name>
+        <code>EBBE</code>
+        <coordinates>50-45N 004-46E</coordinates>
+      </location>
+      <location>
+        <_name>Goetsenhoven</_name>
+        <code>EBTN</code>
+        <coordinates>50-47N 004-57E</coordinates>
+      </location>
+      <location>
+        <_name>Melsbroek</_name>
+        <code>EBMB</code>
+        <coordinates>50-54N 004-30E</coordinates>
+      </location>
+      <location>
+        <_name>Schaffen</_name>
+        <code>EBDT</code>
+        <coordinates>51-00N 005-04E</coordinates>
+      </location>
+      <location>
+        <_name>Zaventem</_name>
+        <!-- TRANSLATOR: local name (nl): Nationale luchthaven van Brussel -->
+        <!-- TRANSLATOR: local name (fr): Aéroport nationale de Bruxelles -->
+        <_name>Brussels National Airport<_name>
+        <code>EBBR</code>
+        <coordinates>50-54N 004-32E</coordinates>
+      </location>
+    </state>
+    <state>
+      <!-- TRANSLATOR: local name (nl): Oost-Vlaanderen -->
+      <!-- TRANSLATOR: local name (fr): Flandre orientale -->
+      <!-- TRANSLATOR: local name (de): Ostflandern -->
+      <_name>East Flanders</_name>
+      <location>
+        <!-- TRANSLATOR: local name (nl): Gent -->
+        <!-- TRANSLATOR: local name (fr): Gand -->
+        <!-- TRANSLATOR: local name (de): Gent -->
+        <_name>Ghent</_name>
+        <code>EBGT</code>
+        <coordinates>51-11N 003-49E</coordinates>
+      </location>
+      <location>
+        <_name>Munte</_name>
+        <code>EBMT</code>
+        <coordinates>50-56N 003-44E</coordinates>
+      </location>
+    </state>
+    <state>
+      <!-- TRANSLATOR: local name (fr): Hainaut -->
+      <!-- TRANSLATOR: local name (fr_BE): Hinnot -->
+      <!-- TRANSLATOR: local name (nl): Henegouwen -->
+      <!-- TRANSLATOR: local name (de): Hennegau -->
+      <_name>Hainaut</_name>
+      <location>
+        <!-- TRANSLATOR: local name (fr): Charleroi -->
+        <!-- TRANSLATOR: local name (fr_BE): Tchalerwè -->
+        <_name>Charleroi</_name>
+        <code>EBCI</code>
+        <coordinates>50-28N 004-27E</coordinates>
+      </location>
+      <location>
+        <_name>Chièvres</_name>
+        <code>EBCV</code>
+        <coordinates>50-34N 003-50E</coordinates>
+      </location>
+    </state>
+    <state>
+      <!-- TRANSLATOR: local name (fr): Liège -->
+      <!-- TRANSLATOR: local name (fr_BE): Lîdje -->
+      <!-- TRANSLATOR: local name (nl): Luik -->
+      <!-- TRANSLATOR: local name (de): Lüttich -->
+      <_name>Liège</_name>
+      <location>
+        <_name>Elsenborn</_name>
+        <code>EBLB</code>
+        <coordinates>50-28N 006-11E</coordinates>
+      </location>
+      <location>
+        <!-- TRANSLATOR: local name (fr): Liège -->
+        <!-- TRANSLATOR: local name (fr_BE): Lîdge -->
+        <!-- TRANSLATOR: local name (nl): Luik -->
+        <!-- TRANSLATOR: local name (de): Lüttich -->
+        <_name>Liège</_name>
+        <code>EBLG</code>
+        <coordinates>50-39N 005-27E</coordinates>
+      </location>
+      <location>
+        <_name>Saint-Hubert</_name>
+        <code>EBSH</code>
+        <coordinates>50-02N 005-24E</coordinates>
+      </location>
+      <location>
+        <_name>Spa</_name>
+        <code>EBSP</code>
+        <coordinates>50-29N 005-55E</coordinates>
+      </location>
+    </state>
+    <state>
+      <!-- TRANSLATOR: local name (nl): Limburg -->
+      <!-- TRANSLATOR: local name (fr): Limbourg -->
+      <!-- TRANSLATOR: local name (de): Limburg -->
+      <_name>Limburg</_name>
+      <location>
+        <_name>Genk</_name>
+        <code>EBZW</code>
+        <coordinates>50-56N 005-30E</coordinates>
+      </location>
+      <location>
+        <_name>Kleine Brogel</_name>
+        <code>EBBL</code>
+        <coordinates>51-10N 005-28E</coordinates>
+      </location>
+      <location>
+        <_name>Sint-Truiden</_name>
+        <code>EBST</code>
+        <coordinates>50-48N 005-12E</coordinates>
+      </location>
+    </state>
+    <state>
+      <!-- TRANSLATOR: local name (fr): Luxembourg -->
+      <!-- TRANSLATOR: local name (nl): Luxemburg -->
+      <!-- TRANSLATOR: local name (de): Luxemburg -->
+      <_name>Luxembourg</_name>
+      <location>
+        <_name>Bertrix</_name>
+        <code>EBBX</code>
+        <coordinates>49-54N 005-13E</coordinates>
+      </location>
+    </state>
+    <state>
+      <!-- TRANSLATOR: local name (fr): Namur -->
+      <!-- TRANSLATOR: local name (nl): Namen -->
+      <_name>Namur</_name>
+      <location>
+        <_name>Florennes</_name>
+        <code>EBFS</code>
+        <coordinates>50-14N 004-39E</coordinates>
+      </location>
+    </state>
+    <state>
+      <!-- TRANSLATOR: local name (nl): West-Vlaanderen -->
+      <!-- TRANSLATOR: local name (fr): Flandre occidentale -->
+      <!-- TRANSLATOR: local name (de): Westflandern -->
+      <_name>West-Flanders</_name>
+      <location>
+        <_name>Koksijde</_name>
+        <code>EBFN</code>
+        <coordinates>51-05N 002-39E</coordinates>
+      </location>
+      <location>
+        <!-- TRANSLATOR: local name (nl): Oostende -->
+        <!-- TRANSLATOR: local name (fr): Ostende -->
+        <!-- TRANSLATOR: local name (de): Ostende -->
+        <_name>Ostend</_name>
+        <code>EBOS</code>
+        <coordinates>51-12N 002-52E</coordinates>
+      </location>
+    </state>
   </country>
   <country>
     <_name>Bosnia-Herzegovina</_name>
@@ -36640,9 +36719,6 @@
 need to be placed in their province which the file doesn't specify
 
 
-Belgium
-EBSU;St-Hubert;;50-02N;005-24E
-
 Canada
 CWAF;Ile Rouge Meteorological Aeronautical Presentation System ;;48-05N;069-33W
 CWAX;St. Anthony, Nfld.;;51-22N;055-38W
