libgweather r271 - in trunk: . data
- From: danw svn gnome org
- To: svn-commits-list gnome org
- Subject: libgweather r271 - in trunk: . data
- Date: Sun, 29 Jun 2008 20:31:29 +0000 (UTC)
Author: danw
Date: Sun Jun 29 20:31:29 2008
New Revision: 271
URL: http://svn.gnome.org/viewvc/libgweather?rev=271&view=rev
Log:
* data/Locations.xml.in (Serbia and Montenegro): Belatedly split
"Serbia and Montenegro" into "Serbia" and "Montenegro".
(EGYP, NIUE, NSTU, PMDY, PWAK, TKPN): Move each of these from the
wrong <country> to the right one.
(Bermuda): move from "Central and South America" to "Atlantic".
(French Polynesia): move from "Central and South America" to
"Australasia & Oceania"
(CWWK, ESTA): Fix to use <_name> instead of <name>.
(K3A1, K4A9, KAUO, KDCU, KDHN, KGZH, KMGM, KMSL, KOZR, KTCL, KTOI):
Remove a bunch more locations that somehow got duplicated from
Alabama into Arkansas (qv #425778 below).
Modified:
trunk/ChangeLog
trunk/data/Locations.xml.in
Modified: trunk/data/Locations.xml.in
==============================================================================
--- trunk/data/Locations.xml.in (original)
+++ trunk/data/Locations.xml.in Sun Jun 29 20:31:29 2008
@@ -2667,16 +2667,6 @@
<!-- Translators: This is a state in the United States. -->
<_name>Arkansas</_name>
<tz-hint>America/Chicago</tz-hint>
- <city>
- <!-- Translators: This is in Arkansas in the United States. -->
- <_name>Auburn</_name>
- <location>
- <!-- Translators: This is in Auburn, Arkansas in the United States. -->
- <_name>Opelika Airport</_name>
- <code>KAUO</code>
- <coordinates>32-37N 085-26W</coordinates>
- </location>
- </city>
<location>
<!-- Translators: This is in Arkansas in the United States. -->
<_name>Batesville</_name>
@@ -2701,36 +2691,12 @@
</location>
<location>
<!-- Translators: This is in Arkansas in the United States. -->
- <_name>Ozark</_name>
- <code>KOZR</code>
- <coordinates>31-17N 085-43W</coordinates>
- </location>
- <location>
- <!-- Translators: This is in Arkansas in the United States. -->
- <_name>Cullman</_name>
- <code>K3A1</code>
- <coordinates>34-16-07N 086-51-30W</coordinates>
- </location>
- <location>
- <!-- Translators: This is in Arkansas in the United States. -->
<_name>De Queen</_name>
<code>KDEQ</code>
<coordinates>34-02-49N 094-23-58W</coordinates>
</location>
<location>
<!-- Translators: This is in Arkansas in the United States. -->
- <_name>Decatur</_name>
- <code>KDCU</code>
- <coordinates>34-39-29N 086-56-36W</coordinates>
- </location>
- <location>
- <!-- Translators: This is in Arkansas in the United States. -->
- <_name>Dothan</_name>
- <code>KDHN</code>
- <coordinates>31-19-17N 085-26-59W</coordinates>
- </location>
- <location>
- <!-- Translators: This is in Arkansas in the United States. -->
<_name>Eaker</_name>
<code>KBYH</code>
<coordinates>35-58N 089-57W</coordinates>
@@ -2743,12 +2709,6 @@
<radar>shv</radar>
<coordinates>33-13-15N 092-48-48W</coordinates>
</location>
- <location>
- <!-- Translators: This is in Arkansas in the United States. -->
- <_name>Evergreen</_name>
- <code>KGZH</code>
- <coordinates>31-25-08N 087-02-53W</coordinates>
- </location>
<city>
<!-- Translators: This is in Arkansas in the United States. -->
<_name>Fayetteville</_name>
@@ -2779,12 +2739,6 @@
</location>
<location>
<!-- Translators: This is in Arkansas in the United States. -->
- <_name>Fort Payne</_name>
- <code>K4A9</code>
- <coordinates>34-28-25N 085-43-17W</coordinates>
- </location>
- <location>
- <!-- Translators: This is in Arkansas in the United States. -->
<_name>Fort Smith</_name>
<code>KFSM</code>
<radar>okc</radar>
@@ -2838,12 +2792,6 @@
</location>
<location>
<!-- Translators: This is in Arkansas in the United States. -->
- <_name>Montgomery</_name>
- <code>KMGM</code>
- <coordinates>32-18-01N 086-24-22W</coordinates>
- </location>
- <location>
- <!-- Translators: This is in Arkansas in the United States. -->
<_name>Mount Ida</_name>
<code>KMWT</code>
<coordinates>34-33N 93-35W</coordinates>
@@ -2856,12 +2804,6 @@
</location>
<location>
<!-- Translators: This is in Arkansas in the United States. -->
- <_name>Muscle Shoals</_name>
- <code>KMSL</code>
- <coordinates>34-44-38N 087-35-58W</coordinates>
- </location>
- <location>
- <!-- Translators: This is in Arkansas in the United States. -->
<_name>Pine Bluff</_name>
<code>KPBF</code>
<zone>ARZ056</zone>
@@ -2920,18 +2862,6 @@
</location>
<location>
<!-- Translators: This is in Arkansas in the United States. -->
- <_name>Troy</_name>
- <code>KTOI</code>
- <coordinates>31-51-38N 086-00-44W</coordinates>
- </location>
- <location>
- <!-- Translators: This is in Arkansas in the United States. -->
- <_name>Tuscaloosa</_name>
- <code>KTCL</code>
- <coordinates>33-12-43N 087-36-57W</coordinates>
- </location>
- <location>
- <!-- Translators: This is in Arkansas in the United States. -->
<_name>Walnut Ridge</_name>
<code>KARG</code>
<zone>ARZ017</zone>
@@ -5333,12 +5263,6 @@
</location>
<location>
<!-- Translators: This is in Hawaii in the United States. -->
- <_name>Sand Island</_name>
- <code>PMDY</code>
- <coordinates>28-13N 177-22W</coordinates>
- </location>
- <location>
- <!-- Translators: This is in Hawaii in the United States. -->
<_name>Wheeler</_name>
<code>PHHI</code>
<coordinates>21-29N 158-02W</coordinates>
@@ -15680,7 +15604,7 @@
</location>
<location>
<!-- Translators: This is in British Columbia in Canada. -->
- <name>White Rock</name>
+ <_name>White Rock</_name>
<code>CWWK</code>
<coordinates>49-01N 122-47W</coordinates>
</location>
@@ -17925,6 +17849,27 @@
</location>
</country>
<country>
+ <_name>Montenegro</_name>
+ <iso-code>ME</iso-code>
+ <tz-hint>Europe/Podgorica</tz-hint>
+ <city>
+ <!-- Translators: This is in Montenegro. -->
+ <_name>Podgorica</_name>
+ <location>
+ <!-- Translators: This is in Podgorica in Montenegro. -->
+ <_name>Podgorica</_name>
+ <code>LYPG</code>
+ <coordinates>42-26N 019-17E</coordinates>
+ </location>
+ </city>
+ <location>
+ <!-- Translators: This is in Montenegro. -->
+ <_name>Tivat</_name>
+ <code>LYTV</code>
+ <coordinates>42-24N 018-44E</coordinates>
+ </location>
+ </country>
+ <country>
<_name>Norway</_name>
<iso-code>NO</iso-code>
<tz-hint>Europe/Oslo</tz-hint>
@@ -19024,53 +18969,35 @@
</location>
</country>
<country>
- <_name>Serbia and Montenegro</_name>
+ <_name>Serbia</_name>
<iso-code>RS</iso-code>
<tz-hint>Europe/Belgrade</tz-hint>
<city>
- <!-- Translators: This is in Serbia and Montenegro.
- The native name is "Beograd".
- -->
+ <!-- Translators: This is in Serbia. The native name is "Beograd". -->
<_name>Belgrade</_name>
<location>
- <!-- Translators: This is in Beograd in Serbia and Montenegro. -->
+ <!-- Translators: This is in Beograd in Serbia. -->
<_name>SurÄin</_name>
<code>LYBE</code>
<coordinates>44-49N 020-17E</coordinates>
</location>
</city>
<city>
- <!-- Translators: This is in Serbia and Montenegro. -->
+ <!-- Translators: This is in Serbia. -->
<_name>UroÅevac</_name>
<location>
- <!-- Translators: This is in UroÅevac in Serbia and Montenegro. -->
+ <!-- Translators: This is in UroÅevac in Serbia. -->
<_name>Camp Bondsteel</_name>
<code>KQUK</code>
<coordinates>42-35N 021-23E</coordinates>
</location>
</city>
<location>
- <!-- Translators: This is in Serbia and Montenegro. -->
+ <!-- Translators: This is in Serbia. -->
<_name>NiÅ</_name>
<code>LYNI</code>
<coordinates>43-20N 021-54E</coordinates>
</location>
- <city>
- <!-- Translators: This is in Serbia and Montenegro. -->
- <_name>Podgorica</_name>
- <location>
- <!-- Translators: This is in Podgorica in Serbia and Montenegro. -->
- <_name>Podgorica</_name>
- <code>LYPG</code>
- <coordinates>42-26N 019-17E</coordinates>
- </location>
- </city>
- <location>
- <!-- Translators: This is in Serbia and Montenegro. -->
- <_name>Tivat</_name>
- <code>LYTV</code>
- <coordinates>42-24N 018-44E</coordinates>
- </location>
</country>
<country>
<_name>Slovakia</_name>
@@ -19211,7 +19138,7 @@
<coordinates>67-09N 020-39E</coordinates>
</location>
<location>
- <name>Ãngelholm</name>
+ <_name>Ãngelholm</_name>
<code>ESTA</code>
<coordinates>56-17N 012-50E</coordinates>
</location>
@@ -24833,6 +24760,16 @@
<region>
<_name>Australasia & Oceania</_name>
<country>
+ <_name>American Samoa</_name>
+ <iso-code>AS</iso-code>
+ <tz-hint>Pacific/Pago_Pago</tz-hint>
+ <location>
+ <_name>Pago Pago</_name>
+ <code>NSTU</code>
+ <coordinates>14-20S 170-43W</coordinates>
+ </location>
+ </country>
+ <country>
<_name>Australia</_name>
<iso-code>AU</iso-code>
<!-- FIXME: the tz-hint for each state is correct, but some
@@ -25061,11 +24998,6 @@
<iso-code>CK</iso-code>
<tz-hint>Pacific/Rarotonga</tz-hint>
<location>
- <_name>Alofi / Niue</_name>
- <code>NIUE</code>
- <coordinates>19-04S 169-55W</coordinates>
- </location>
- <location>
<_name>Rarotonga</_name>
<code>NCRG</code>
<coordinates>21-12S 159-49W</coordinates>
@@ -25087,6 +25019,16 @@
</location>
</country>
<country>
+ <_name>French Polynesia</_name>
+ <iso-code>PF</iso-code>
+ <tz-hint>Pacific/Tahiti</tz-hint>
+ <location>
+ <_name>Tahiti-Faaa</_name>
+ <code>NTAA</code>
+ <coordinates>17-33S 149-37W</coordinates>
+ </location>
+ </country>
+ <country>
<_name>Guam</_name>
<iso-code>GU</iso-code>
<tz-hint>Pacific/Guam</tz-hint>
@@ -25110,11 +25052,6 @@
<code>PGWT</code>
<coordinates>14-59N 145-37E</coordinates>
</location>
- <location>
- <_name>Wake Island</_name>
- <code>PWAK</code>
- <coordinates>19-17N 166-39E</coordinates>
- </location>
</country>
<country>
<_name>Indonesia</_name>
@@ -25341,6 +25278,16 @@
</location>
</country>
<country>
+ <_name>Niue</_name>
+ <iso-code>NU</iso-code>
+ <tz-hint>Pacific/Niue</tz-hint>
+ <location>
+ <name>Alofi / Niue</name>
+ <code>NIUE</code>
+ <coordinates>19-04S 169-55W</coordinates>
+ </location>
+ </country>
+ <country>
<_name>Northern Mariana Islands</_name>
<iso-code>MP</iso-code>
<tz-hint>Pacific/Saipan</tz-hint>
@@ -25429,15 +25376,16 @@
<_name>United States Minor Outlying Islands</_name>
<iso-code>UM</iso-code>
<location>
- <!-- FIXME: Pago Pago is in American Samoa, which is not part of
- the "United States Minor Outlying Islands". Fix on head
- after branch, when we can add new strings.
- -->
- <_name>Pago Pago</_name>
- <iso-code>AS</iso-code>
- <tz-hint>Pacific/Pago_Pago</tz-hint>
- <code>NSTU</code>
- <coordinates>14-20S 170-43W</coordinates>
+ <!-- Translators: This is in the United States Minor Outlying Islands. -->
+ <_name>Sand Island</_name>
+ <code>PMDY</code>
+ <coordinates>28-13N 177-22W</coordinates>
+ </location>
+ <location>
+ <!-- Translators: This is in the United States Minor Outlying Islands. -->
+ <_name>Wake Island</_name>
+ <code>PWAK</code>
+ <coordinates>19-17N 166-39E</coordinates>
</location>
</country>
<country>
@@ -27278,16 +27226,6 @@
</location>
</country>
<country>
- <_name>Bermuda</_name>
- <iso-code>BM</iso-code>
- <tz-hint>Atlantic/Bermuda</tz-hint>
- <location>
- <_name>Bermuda</_name>
- <code>TXKF</code>
- <coordinates>32-22N 064-41W</coordinates>
- </location>
- </country>
- <country>
<_name>British Virgin Islands</_name>
<iso-code>VG</iso-code>
<tz-hint>America/Tortola</tz-hint>
@@ -27489,16 +27427,6 @@
</location>
</country>
<country>
- <_name>French Polynesia</_name>
- <iso-code>PF</iso-code>
- <tz-hint>Pacific/Tahiti</tz-hint>
- <location>
- <_name>Tahiti-Faaa</_name>
- <code>NTAA</code>
- <coordinates>17-33S 149-37W</coordinates>
- </location>
- </country>
- <country>
<_name>Grenada</_name>
<iso-code>GD</iso-code>
<tz-hint>America/Grenada</tz-hint>
@@ -28232,6 +28160,16 @@
</location>
</country>
<country>
+ <_name>Falkland Islands (Malvinas)</_name>
+ <iso-code>FK</iso-code>
+ <tz-hint>Atlantic/Stanley</tz-hint>
+ <location>
+ <_name>Mount Pleasant</_name>
+ <code>EGYP</code>
+ <coordinates>51-49S 058-27W</coordinates>
+ </location>
+ </country>
+ <country>
<_name>French Guiana</_name>
<iso-code>GF</iso-code>
<tz-hint>America/Cayenne</tz-hint>
@@ -28347,16 +28285,6 @@
</location>
</country>
<country>
- <_name>South Georgia and the Islands</_name>
- <iso-code>GS</iso-code>
- <tz-hint>Atlantic/South_Georgia</tz-hint>
- <location>
- <_name>Mount Pleasant</_name>
- <code>EGYP</code>
- <coordinates>51-49S 058-27W</coordinates>
- </location>
- </country>
- <country>
<_name>Suriname</_name>
<iso-code>SR</iso-code>
<tz-hint>America/Paramaribo</tz-hint>
@@ -29251,10 +29179,15 @@
<code>TAPA</code>
<coordinates>17-07N 061-47W</coordinates>
</location>
+ </country>
+ <country>
+ <_name>Bermuda</_name>
+ <iso-code>BM</iso-code>
+ <tz-hint>Atlantic/Bermuda</tz-hint>
<location>
- <_name>Charlestown/Newcast</_name>
- <code>TKPN</code>
- <coordinates>17-12N 062-35W</coordinates>
+ <_name>Bermuda</_name>
+ <code>TXKF</code>
+ <coordinates>32-22N 064-41W</coordinates>
</location>
</country>
<country>
@@ -29393,6 +29326,11 @@
<code>TKPK</code>
<coordinates>17-18N 062-41W</coordinates>
</location>
+ <location>
+ <_name>Charlestown/Newcast</_name>
+ <code>TKPN</code>
+ <coordinates>17-12N 062-35W</coordinates>
+ </location>
</country>
</region>
<region>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
