--- Locations.xml.in-1.59	2005-02-08 12:18:21 UTC
+++ Locations.xml.in	2005-02-09 16:43:30 UTC
@@ -23199,11 +23199,21 @@
         <coordinates>47-40N 009-31E</coordinates>
       </location>
       <location>
+        <_name>Heidelberg</_name>
+        <code>ETIE</code>
+        <coordinates>49-24N 008-39E</coordinates>
+      </location>
+      <location>
         <_name>Karlsruhe</_name>
         <code>EDSB</code>
         <coordinates>48-46-43N 008-04-47E</coordinates>
       </location>
       <location>
+        <_name>Konstanz</_name>
+        <code>EDTZ</code>
+        <coordinates>47-41N 009-11E</coordinates>
+      </location>
+      <location>
         <_name>Lahr</_name>
         <code>EDTL</code>
         <coordinates>48-22-09N 007-49-40E</coordinates>
@@ -23214,6 +23224,11 @@
         <coordinates>48-13N 009-55E</coordinates>
       </location>
       <location>
+        <_name>Mannheim/Coleman</_name>
+        <code>ETOR</code>
+        <coordinates>49-34N 008-28E</coordinates>
+      </location>
+      <location>
         <_name>Mannheim/Neuostheim</_name>
         <code>EDFM</code>
         <coordinates>49-28-21N 008-30-56E</coordinates>
@@ -23272,16 +23287,46 @@
       </location>
       -->
       <location>
+        <_name>Giebelstadt</_name>
+        <code>ETEU</code>
+        <coordinates>49-39N 009-58E</coordinates>
+      </location>
+      <location>
+        <_name>Grafenwöhr</_name>
+        <code>ETIC</code>
+        <coordinates>49-42N 011-57E</coordinates>
+      </location>
+      <location>
         <_name>Hof</_name>
         <code>EDQM</code>
         <coordinates>50-19N 011-53E</coordinates>
       </location>
       <location>
+        <_name>Hohenfels</_name>
+        <code>ETIH</code>
+        <coordinates>49-13N 011-50E</coordinates>
+      </location>
+      <location>
+        <_name>Illesheim</_name>
+        <code>ETIK</code>
+        <coordinates>49-28N 010-23E</coordinates>
+      </location>
+      <location>
         <_name>Ingolstadt</_name>
         <code>ETSI</code>
         <coordinates>48-43N 011-32E</coordinates>
       </location>
       <location>
+        <_name>Kitzingen</_name>
+        <code>ETIN</code>
+        <coordinates>49-45N 010-12E</coordinates>
+      </location>
+      <location>
+        <_name>Kümmersbruck</_name>
+        <code>ETGK</code>
+        <coordinates>49-26N 011-54E</coordinates>
+      </location>
+      <location>
         <_name>Landsberg</_name>
         <code>ETSA</code>
         <coordinates>48-04N 010-54E</coordinates>
@@ -23344,16 +23389,26 @@
 	<coordinates>52-28N 013-24E</coordinates>
       </location>
     </city>
-    <!-- Couldn't get current weather information (checked 2004-10-17)
     <state>
       <_name>Brandenburg</_name>
+      <!-- Couldn't get current weather information (checked 2004-10-17)
       <location>
         <_name>Cottbus</_name>
         <code>ETHT</code>
         <coordinates>51-46N 014-18E</coordinates>
       </location>
+      -->
+      <location>
+        <_name>Preschen</_name>
+        <code>ETNR</code>
+        <coordinates>51-40N 014-38E</coordinates>
+      </location>
+      <location>
+        <_name>Wittstock</_name>
+        <code>ETGW</code>
+        <coordinates>53-12N 012-31E</coordinates>
+      </location>
     </state>
-    -->
     <city>
       <_name>Bremen</_name>
       <location>
@@ -23389,6 +23444,11 @@
         <coordinates>51-07N 009-17E</coordinates>
       </location>
       <location>
+        <_name>Hanau</_name>
+        <code>ETID</code>
+        <coordinates>50-10N 008-58E</coordinates>
+      </location>
+      <location>
         <_name>Kassel-Calden</_name>
         <code>EDVK</code>
         <coordinates>51-24N 009-23E</coordinates>
@@ -23408,6 +23468,11 @@
       <!-- TRANSLATOR: local name of Lower Saxony is Niedersachsen -->
       <_name>Lower Saxony</_name>
       <location>
+        <_name>Bergen</_name>
+        <code>ETGB</code>
+        <coordinates>52-49N 009-56E</coordinates>
+      </location>
+      <location>
         <_name>Braunschweig</_name>
         <code>EDVE</code>
         <coordinates>52-18N 010-27E</coordinates>
@@ -23443,6 +23508,11 @@
         <coordinates>53-32N 007-53E</coordinates>
       </location>
       <location>
+        <_name>Lemwerder</_name>
+        <code>EDWD</code>
+        <coordinates>53-09N 008-37E</coordinates>
+      </location>
+      <location>
         <_name>Meppen</_name>
         <code>ETWM</code>
         <coordinates>52-43-24N 007-19-35E</coordinates>
@@ -23453,6 +23523,11 @@
         <coordinates>53-46N 008-40E</coordinates>
       </location>
       <location>
+        <_name>Nordhorn</_name>
+        <code>ETUN</code>
+        <coordinates>52-27N 007-10E</coordinates>
+      </location>
+      <location>
         <_name>Wittmundhaven</_name>
         <code>ETNT</code>
         <coordinates>53-33N 007-40E</coordinates>
@@ -23464,7 +23539,7 @@
       </location>
     </state>
     <state>
-      <!-- TRANSLATOR: local name of Mecklenburg-Western Pomerania is  Mecklenburg-Vorpommern -->
+      <!-- TRANSLATOR: local name of Mecklenburg-Western Pomerania is Mecklenburg-Vorpommern -->
       <_name>Mecklenburg-Western Pomerania</_name>
       <location>
         <_name>Heringsdorf</_name>
@@ -23490,6 +23565,11 @@
     <state>
       <!-- TRANSLATOR: local name of North Rhine-Westphalia is Nordrhein-Westfalen -->
       <_name>North Rhine-Westphalia</_name>
+      <location>
+        <_name>Aachen/Merzbrück</_name>
+        <code>ETBA</code>
+        <coordinates>50-49N 006-11E</coordinates>
+      </location>
       <!-- Couldn't get current weather information (checked 2004-10-17)
       <location>
         <_name>Brüggen</_name>
@@ -23498,7 +23578,7 @@
       </location>
       -->
       <location>
-        <!-- TRANSLATOR: local name of Cologne name is KÃ¶ln -->
+        <!-- TRANSLATOR: local name of Cologne name is Köln -->
         <_name>Cologne/Bonn</_name>
         <code>EDDK</code>
         <coordinates>50-52N 007-10E</coordinates>
@@ -23514,6 +23594,16 @@
         <coordinates>51-18N 006-46E</coordinates>
       </location>
       <location>
+        <_name>Essen</_name>
+        <code>EDZE</code>
+        <coordinates>51-24N 006-58E</coordinates>
+      </location>
+      <location>
+        <_name>Geilenkirchen</_name>
+        <code>ETNG</code>
+        <coordinates>50-58N 006-03E</coordinates>
+      </location>
+      <location>
         <_name>Gütersloh</_name>
         <code>ETUO</code>
         <coordinates>51-55N 008-18E</coordinates>
@@ -23529,6 +23619,11 @@
         <coordinates>51-44N 006-16E</coordinates>
       </location>
       <location>
+        <_name>Laarbruch</_name>
+        <code>ETUL</code>
+        <coordinates>51-36N 006-09E</coordinates>
+      </location>
+      <location>
         <_name>Mönchengladbach</_name>
         <code>EDLN</code>
         <coordinates>51-13-49N 006-30-16E</coordinates>
@@ -23563,6 +23658,11 @@
       <!-- TRANSLATOR: local name of Rhineland-Palatinate is Rheinland-Pfalz -->
       <_name>Rhineland-Palatinate</_name>
       <location>
+        <_name>Bad Kreuznach</_name>
+        <code>ETEH</code>
+        <coordinates>49-51N 007-53E</coordinates>
+      </location>
+      <location>
         <_name>Büchel</_name>
         <code>ETSB</code>
         <coordinates>50-10N 007-04E</coordinates>
@@ -23573,16 +23673,31 @@
         <coordinates>49-57N 007-16E</coordinates>
       </location>
       <location>
+        <_name>Idar-Oberstein</_name>
+        <code>ETGI</code>
+        <coordinates>49-42N 007-20E</coordinates>
+      </location>
+      <location>
         <_name>Mendig</_name>
         <code>ETHM</code>
         <coordinates>50-22N 007-19E</coordinates>
       </location>
       <location>
+        <_name>Pferdsfeld</_name>
+        <code>ETSP</code>
+        <coordinates>49-51N 007-36E</coordinates>
+      </location>
+      <location>
         <_name>Ramstein</_name>
         <code>ETAR</code>
         <coordinates>49-26N 007-36E</coordinates>
       </location>
       <location>
+        <_name>Sembach</_name>
+        <code>ETAS</code>
+        <coordinates>49-30N 007-52E</coordinates>
+      </location>
+      <location>
         <_name>Spangdahlem</_name>
         <code>ETAD</code>
         <coordinates>49-59N 006-42E</coordinates>
@@ -23693,132 +23808,6 @@
         <coordinates>50-59N 010-58E</coordinates>
       </location>
     </state>
-
-    <!-- New locations: move these to the correct state or city -->
-    <location>
-      <_name>Aachen/Merzbruck</_name>
-      <code>ETBA</code>
-      <coordinates>50-49N 006-11E</coordinates>
-    </location>
-    <location>
-      <_name>Bad Kreuznach</_name>
-      <code>ETEH</code>
-      <coordinates>49-51N 007-53E</coordinates>
-    </location>
-    <location>
-      <_name>Bergen</_name>
-      <code>ETGB</code>
-      <coordinates>52-49N 009-56E</coordinates>
-    </location>
-    <location>
-      <_name>Coleman Mannheim</_name>
-      <code>ETOR</code>
-      <coordinates>49-34N 008-28E</coordinates>
-    </location>
-    <location>
-      <_name>Essen</_name>
-      <code>EDZE</code>
-      <coordinates>51-24N 006-58E</coordinates>
-    </location>
-    <location>
-      <_name>Geilenkirchen</_name>
-      <code>ETNG</code>
-      <coordinates>50-58N 006-03E</coordinates>
-    </location>
-    <location>
-      <_name>Giebelstadt</_name>
-      <code>ETEU</code>
-      <coordinates>49-39N 009-58E</coordinates>
-    </location>
-    <location>
-      <_name>Grafenwoehr</_name>
-      <code>ETIC</code>
-      <coordinates>49-42N 011-57E</coordinates>
-    </location>
-    <location>
-      <_name>Hanau</_name>
-      <code>ETID</code>
-      <coordinates>50-10N 008-58E</coordinates>
-    </location>
-    <location>
-      <_name>Heidelberg</_name>
-      <code>ETIE</code>
-      <coordinates>49-24N 008-39E</coordinates>
-    </location>
-    <location>
-      <_name>Hohenfels</_name>
-      <code>ETIH</code>
-      <coordinates>49-13N 011-50E</coordinates>
-    </location>
-    <location>
-      <_name>Idar-Oberstein</_name>
-      <code>ETGI</code>
-      <coordinates>49-42N 007-20E</coordinates>
-    </location>
-    <location>
-      <_name>Illesheim</_name>
-      <code>ETIK</code>
-      <coordinates>49-28N 010-23E</coordinates>
-    </location>
-    <location>
-      <_name>Kitzingen</_name>
-      <code>ETIN</code>
-      <coordinates>49-45N 010-12E</coordinates>
-    </location>
-    <location>
-      <_name>Konstanz</_name>
-      <code>EDTZ</code>
-      <coordinates>47-41N 009-11E</coordinates>
-    </location>
-    <location>
-      <_name>Kuemmersruck</_name>
-      <code>ETGK</code>
-      <coordinates>49-26N 011-54E</coordinates>
-    </location>
-    <location>
-      <_name>Laarbruch</_name>
-      <code>ETUL</code>
-      <coordinates>51-36N 006-09E</coordinates>
-    </location>
-    <location>
-      <_name>Lemwerder</_name>
-      <code>EDWD</code>
-      <coordinates>53-09N 008-37E</coordinates>
-    </location>
-    <location>
-      <_name>Mebstetten/Albstadt</_name>
-      <code>ETCE</code>
-      <coordinates>50-07N 009-07E</coordinates>
-    </location>
-    <location>
-      <_name>Mendig</_name>
-      <code>ETHM</code>
-    </location>
-    <location>
-      <_name>Nordhorn</_name>
-      <code>ETUN</code>
-      <coordinates>52-27N 007-10E</coordinates>
-    </location>
-    <location>
-      <_name>Pferdsfeld</_name>
-      <code>ETSP</code>
-      <coordinates>49-51N 007-36E</coordinates>
-    </location>
-    <location>
-      <_name>Preschen</_name>
-      <code>ETNR</code>
-      <coordinates>51-40N 014-38E</coordinates>
-    </location>
-    <location>
-      <_name>Sembach</_name>
-      <code>ETAS</code>
-      <coordinates>49-30N 007-52E</coordinates>
-    </location>
-    <location>
-      <_name>Wittstock</_name>
-      <code>ETGW</code>
-      <coordinates>53-12N 012-31E</coordinates>
-    </location>
   </country>
   <country>
     <_name>Greece</_name>
