add CTY-2108 prefixes

diff --git a/Changes b/Changes
index 12af104e25ccbbf1f2ac316e5825983bcc2f51ed..e24ef38df1110d840a1094238a431b673163afcd 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+24May11=======================================================================
+1. Add CTY-2108 prefixes
 04Apr11=======================================================================
 1. After being poked by Brendan EI6IZ, add outgoing IPV6 connect() handling
 29Mar11=======================================================================

diff --git a/data/cty.dat b/data/cty.dat
index b90cb597c966919a55ec7a93551c6d90f9a37158..24cf83d5a0d77b9440e24741a147e9a8753c0c41 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -93,7 +93,7 @@ Guyana:                   09:  12:  SA:    6.02:    59.45:     4.0:  8R:
 Croatia:                  15:  28:  EU:   45.18:   -15.30:    -1.0:  9A:
     9A;
 Ghana:                    35:  46:  AF:    7.70:     1.57:     0.0:  9G:
-    9G,=VERSION;
+    9G;
 Malta:                    15:  28:  EU:   35.88:   -14.42:    -1.0:  9H:
     9H,=9H1VC/KHS;
 Zambia:                   36:  53:  AF:  -14.22:   -26.73:    -2.0:  9J:
@@ -125,7 +125,7 @@ Tonga:                    32:  62:  OC:  -21.22:   175.13:   -13.0:  A3:
 Oman:                     21:  39:  AS:   23.60:   -58.55:    -4.0:  A4:
     A4;
 Bhutan:                   22:  41:  AS:   27.40:   -90.18:    -6.0:  A5:
-    A5;
+    A5,=VERSION;
 United Arab Emirates:     21:  39:  AS:   24.00:   -54.00:    -4.0:  A6:
     A6,=A61D/ND,=A61E/ND;
 Qatar:                    21:  39:  AS:   25.25:   -51.13:    -3.0:  A7:
@@ -260,7 +260,7 @@ China:                    24:  44:  AS:   36.00:  -102.00:    -8.0:  BY:
     BZ8R[43],BZ8S[43],BZ8T[43],BZ8U[43],BZ8V[43],BZ8W[43],BZ8X[43],
     BZ9A(24)[43],BZ9B(24)[43],BZ9C(24)[43],BZ9D(24)[43],BZ9E(24)[43],
     BZ9F(24)[43],BZ9S(23)[42],BZ9T(23)[42],BZ9U(23)[42],BZ9V(23)[42],
-    BZ9W(23)[42],BZ9X(23)[42],=BA0AA/8[43];
+    BZ9W(23)[42],BZ9X(23)[42],=VO1AU/BY1RX,=BA0AA/8[43];
 Nauru:                    31:  65:  OC:   -0.52:  -166.92:   -12.0:  C2:
     C2;
 Andorra:                  14:  27:  EU:   42.58:    -1.62:    -1.0:  C3:
@@ -288,12 +288,12 @@ Antarctica:               13:  74:  SA:  -90.00:     0.00:     0.0:  CE9:
     LU3Z[73],LU4Z[73],LU5Z[73],LU6Z[73],LU7Z[73],LU8Z[73],LU9Z[73],
     R1AN(29)[69],RI1AN(29)[69],VI0(39)[69],VK0(39)[69],ZL5(30)[71],
     ZM5(30)[71],ZS7(38)[67],=K9PET/KC4,=3Y8XSA(38)[67],=8J1RL(39)[67],
-    =AT10BP(38)[67],=DP0GVN(38)[67],=DP1POL(38)[67],=I0QHM/IA0PS(30)[71],
-    =II0AMZS(30)[71],=KC4/FT5YK[73],=KC4/WA2DKJ(30),=KC4/WB9YSD(30)[71],
-    =KC4AAA(39),=KC4AAC[73],=KC4USB(12),=KC4USV(30)[71],=LU/FT5YK[73],
-    =OJ1ABOA(38)[67],=R1ANP(39)[69],=R1ANR(38)[67],=R1ANY(38)[67],
-    =RI1ANC(29)[70],=RI1ANC/A(39)[69],=RI1ANR(38)[67],=SM/OH2FFP(38)[67],
-    =VP8ADE/B[73],=VP8DLM[73],=VP8DMH/P[73],=VU2JBK/AT10(38)[67];
+    =DP0GVN(38)[67],=DP1POL(38)[67],=I0QHM/IA0PS(30)[71],=II0AMZS(30)[71],
+    =KC4/FT5YK[73],=KC4/WA2DKJ(30),=KC4/WB9YSD(30)[71],=KC4AAA(39),
+    =KC4AAC[73],=KC4USB(12),=KC4USV(30)[71],=LU/FT5YK[73],=OJ1ABOA(38)[67],
+    =R1ANP(39)[69],=R1ANR(38)[67],=RI1ANC(29)[70],=RI1ANC/A(39)[69],
+    =RI1ANR(38)[67],=SM/OH2FFP(38)[67],=VP8ADE/B[73],=VP8DLM[73],
+    =VP8DMH/P[73];
 Cuba:                     08:  11:  NA:   21.50:    80.00:     5.0:  CM:
     CL,CM,CO,T4;
 Morocco:                  33:  37:  AF:   32.00:     5.00:     0.0:  CN:
@@ -327,13 +327,13 @@ Eritrea:                  37:  48:  AF:   15.00:   -39.00:    -3.0:  E3:
 Palestine:                20:  39:  AS:   31.28:   -34.27:    -2.0:  E4:
     E4;
 North Cook Islands:       32:  62:  OC:  -10.02:   161.08:    10.0:  E5/n:
-    =E51WWB;
+    =E51WL;
 South Cook Islands:       32:  62:  OC:  -21.90:   157.93:    10.0:  E5/s:
     E5;
 Bosnia-Herzegovina:       15:  28:  EU:   44.32:   -17.57:    -1.0:  E7:
     E7;
 Spain:                    14:  37:  EU:   40.37:     4.88:    -1.0:  EA:
-    AM,AN,AO,EA,EB,EC,ED,EE,EF,EG,EH,=EA9CP/1,=EA9FN/7;
+    AM,AN,AO,EA,EB,EC,ED,EE,EF,EG,EH,=EA9CP/1,=EA9FN/7,=EA9JS/7;
 Balearic Islands:         14:  37:  EU:   39.60:    -2.95:    -1.0:  EA6:
     AM6,AN6,AO6,EA6,EB6,EC6,ED6,EE6,EF6,EG6,EH6,=EA3BT/6;
 Canary Islands:           33:  36:  AF:   28.10:    15.40:     0.0:  EA8:
@@ -366,9 +366,9 @@ Turkmenistan:             17:  30:  AS:   38.00:   -58.00:    -5.0:  EZ:
 France:                   14:  27:  EU:   46.00:    -2.00:    -1.0:  F:
     F,HW,HX,HY,TH,TM,TP,TQ,TV,TW;
 Guadeloupe:               08:  11:  NA:   16.13:    61.67:     4.0:  FG:
-    FG,=TO11A;
+    FG;
 Mayotte:                  39:  53:  AF:  -12.88:   -45.15:    -3.0:  FH:
-    FH,=TO2FH;
+    FH;
 St. Barthelemy:           08:  11:  NA:   17.90:    62.83:     4.0:  FJ:
     FJ;
 New Caledonia:            32:  56:  OC:  -21.50:  -165.50:   -11.0:  FK:
@@ -376,7 +376,7 @@ New Caledonia:            32:  56:  OC:  -21.50:  -165.50:   -11.0:  FK:
 Chesterfield Islands:     30:  56:  OC:  -19.87:  -158.32:   -11.0:  FK/c:
     =FK8IK/C;
 Martinique:               08:  11:  NA:   14.70:    61.03:     4.0:  FM:
-    FM,=TO5A,=TO5T,=TO7A;
+    FM,=TO5A,=TO5T,=TO7A,=TO8A;
 French Polynesia:         32:  63:  OC:  -17.65:   149.40:    10.0:  FO:
     FO;
 Austral Islands:          32:  63:  OC:  -23.37:   149.48:    10.0:  FO/a:
@@ -388,7 +388,7 @@ Marquesas Islands:        31:  63:  OC:   -8.92:   140.07:     9.5:  FO/m:
 St. Pierre & Miquelon:    05:  09:  NA:   46.77:    56.20:     3.0:  FP:
     FP;
 Reunion:                  39:  53:  AF:  -21.12:   -55.48:    -4.0:  FR:
-    FR,=TO2Z;
+    FR;
 Glorioso:                 39:  53:  AF:  -11.55:   -47.28:    -4.0:  FR/g:
     FT5G;
 Juan de Nova & Europa:    39:  53:  AF:  -17.05:   -42.72:    -3.0:  FR/j:
@@ -410,7 +410,7 @@ French Guiana:            09:  12:  SA:    4.00:    53.00:     3.0:  FY:
 England:                  14:  27:  EU:   52.77:     1.47:     0.0:  G:
     2,G,M,ZH,ZI,ZJ;
 Isle of Man:              14:  27:  EU:   54.20:     4.53:     0.0:  GD:
-    2D,2T,GD,GT,MD,MT,=GB0AOA,=GB1RT,=GB2RT,=GB5TD;
+    2D,2T,GD,GT,MD,MT,=GB1RT,=GB2RT,=GB5TD,=MB100TT;
 Northern Ireland:         14:  27:  EU:   54.73:     6.68:     0.0:  GI:
     2I,2N,GI,GN,MI,MN,=GB0SPD,=GB1SPD,=GB2AD,=GB2SPD,=GB5SPD;
 Jersey:                   14:  27:  EU:   49.22:     2.18:     0.0:  GJ:
@@ -427,13 +427,13 @@ Shetland and Fair Isle:   14:  27:  EU:   60.50:     1.50:     0.0:  *GM/s:
     =GM4CAQ,=GM4DQD,=GM4ENK,=GM4FNA,=GM4FNE,=GM4GPN,=GM4GPP,=GM4GQD,=GM4GQM,
     =GM4IPK,=GM4LBE,=GM4LER,=GM4PXG,=GM4SLV,=GM4SRU,=GM4SSA,=GM4SWU,=GM4WXQ,
     =GM4YEL,=GM4ZHL,=GM6RTO,=GM6VZB,=GM6WVI,=GM6YQA,=GM7GWW,=GM8LNH,=GM8MMA,
-    =GM8YEC,=MA1FJM,=MM0XAU,=MM0ZCG,=MM1FJM,=MM6SJK,=MS0ZCG,=MS0ZET;
+    =GM8YEC,=MA1FJM,=MM0XAU,=MM0ZCG,=MM1FJM,=MM5PSL,=MM6SJK,=MS0ZCG,=MS0ZET;
 Guernsey:                 14:  27:  EU:   49.45:     2.58:     0.0:  GU:
     2P,2U,GP,GU,MP,MU;
 Wales:                    14:  27:  EU:   52.28:     3.73:     0.0:  GW:
     2C,2W,2X,2Y,GC,GW,MC,MW,=GB0AWS,=GB0BHR,=GB0CSA,=GB0HEL,=GB0MPA,=GB0PLB,
-    =GB0SPS,=GB2GGM,=GB2RSC,=GB2TD,=GB4BPL,=GB4MD,=GB4MDI,=GB4RC,=GB4SDD,
-    =GB5FI,=GB8CCC;
+    =GB0SPS,=GB2GGM,=GB2RSC,=GB2TD,=GB4BPL,=GB4MBC,=GB4MD,=GB4MDI,=GB4RC,
+    =GB4SDD,=GB5FI,=GB8CCC;
 Solomon Islands:          28:  51:  OC:   -9.00:  -160.00:   -11.0:  H4:
     H4;
 Temotu:                   32:  51:  OC:  -10.72:  -165.80:   -11.0:  H40:
@@ -497,7 +497,7 @@ Japan:                    25:  45:  AS:   36.40:  -138.38:    -9.0:  JA:
     JR,JS,AGJ50,HTR50,IEJ50,ISG50,KJP50,KTD50,MMD50,MNY50,OGN50,OKA50,SHI50,
     TRA50,UEO50;
 Minami Torishima:         27:  90:  OC:   24.28:  -153.97:   -10.0:  JD/m:
-    =JD1BMM;
+    =JD1BME,=JD1BMM;
 Ogasawara:                27:  45:  AS:   27.05:  -142.20:    -9.0:  JD/o:
     JD1;
 Mongolia:                 23:  32:  AS:   46.77:  -102.17:    -7.0:  JT:
@@ -516,84 +516,82 @@ United States:            05:  08:  NA:   37.88:    89.00:     5.0:  K:
     =AC4CA(4)[7],=AC6NN(5)[8],=AC8Y(5)[8],=AD1C(4)[7],=AD4EB(4)[8],
     =AD7MQ(4)[6],=AD8J(5)[8],=AE7AP(4)[6],=AG3R(4)[8],=AG3V(4)[7],
     =AG4CZ(4)[8],=AG4W(4)[8],=AH2DT(4)[6],=AH6N(4)[7],=AI1P(4)[7],
-    =AI4DB(4)[8],=AI4G(4)[8],=AJ4F(4)[7],=AL7QQ(4)[7],=K0COP(5)[8],
-    =K0DQ(5)[8],=K0DXC(4)[8],=K0IP(3)[6],=K0JJ(3)[6],=K0LUZ(5)[8],=K0PJ(3)[6],
-    =K0TQ(4)[8],=K0TV(5)[8],=K0ZR(5)[8],=K1DW(4)[7],=K1GU(4)[8],=K1KD(4)[7],
-    =K1LT(4)[8],=K1TN(4)[8],=K2PO(3)[6],=K2RD(3)[6],=K2RP(3)[6],=K2UR(4)[8],
-    =K2VCO(3)[6],=K2VV(4)[7],=K3CQ(4)[8],=K3FIV(3)[6],=K3GP(4)[8],=K3IE(4)[8],
-    =K3TD(4)[7],=K3WA(4)[8],=K3WT(4)[7],=K4AB(4)[8],=K4AMC(4)[8],=K4APG(4)[8],
-    =K4BP(4)[8],=K4BX(4)[8],=K4CWW(4)[8],=K4CX(4)[8],=K4DZR(4)[8],
-    =K4EDI(4)[8],=K4FT(4)[8],=K4FXN(4)[8],=K4HAL(4)[8],=K4IE(4)[8],
-    =K4IQJ(4)[8],=K4IU(4)[7],=K4LTA(4)[8],=K4NO(4)[8],=K4NVJ(4)[8],
-    =K4PJ(4)[8],=K4RO(4)[8],=K4SPO(4)[8],=K4TD(4)[8],=K4WI(4)[8],=K4WW(4)[8],
-    =K4XU(3)[6],=K4YJ(4)[8],=K4ZGB(4)[8],=K5AUP(5)[8],=K5EK(5)[8],=K5KG(5)[8],
-    =K5RQ(5)[8],=K5RR(3)[6],=K5VIP(5)[8],=K5ZD(5)[8],=K6ND(5)[8],=K6NDV(5)[8],
-    =K6PJ(4)[6],=K6XT(4)[7],=K7ABV(4)[6],=K7BG(4)[6],=K7CS(5)[8],=K7IA(4)[7],
-    =K7JNX(5)[8],=K7OM(5)[8],=K7RE(4)[7],=K7RSM(4)[7],=K7SCX(4)[7],
-    =K7SV(5)[8],=K7TD(4)[7],=K7VU(4)[7],=K7ZYV(4)[7],=K8BN(3)[6],=K8CN(5)[8],
-    =K8FC(5)[8],=K8GU(5)[8],=K8IA(3)[6],=K8JQ(5)[8],=K8LF(5)[8],=K8NYG(5)[8],
-    =K8NZ(5)[8],=K8OQL(5)[8],=K8PO(5)[8],=K8YC(5)[8],=K9BWI(4)[7],
-    =K9CHP(5)[8],=K9DU(4)[7],=K9JF(3)[6],=K9JM(3)[6],=K9JWV(3)[6],
-    =K9MBB(4)[7],=K9OM(5)[8],=K9RS(5)[8],=K9WZB(3)[6],=K9YC(3)[6],
-    =KA2EYH(4)[8],=KA3DRR(3)[6],=KA4OTB(4)[8],=KA4R(4)[8],=KA8Q(5)[8],
-    =KB7Q(4)[6],=KB8V(5)[8],=KC4HW(4)[8],=KC4SAW(4)[8],=KC4WQ(4)[8],
-    =KC8GCR(5)[8],=KD4FJ(4)[7],=KD4HXT(3)[6],=KD4N(4)[8],=KD4POJ(4)[7],
-    =KD4SN(4)[8],=KE1B(3)[6],=KE2VB(3)[6],=KE3D(4)[7],=KE4KWE(4)[8],
-    =KE4KY(4)[8],=KE4UNA(4)[8],=KE4YVD(4)[8],=KE7NO(4)[6],=KE7X(4)[6],
-    =KF7CG(4)[8],=KG4CUY(4)[8],=KG4MGE(4)[8],=KG7HF(5)[8],=KG9JP(3)[6],
-    =KH6GN(4)[8],=KH6OU(5)[8],=KH6XS(3)[6],=KI4EEY(4)[8],=KI4EZC(4)[8],
-    =KI6DY(4)[7],=KI7MT(4)[6],=KJ4AOM(4)[8],=KJ4BIX(4)[8],=KJ4EEW(4)[8],
-    =KK6MC(4)[7],=KK9A(5)[8],=KK9O(5)[8],=KL5Z(4)[7],=KL7IZC(3)[6],
-    =KL7JR(3)[6],=KL7OO(3)[6],=KL7QR(3)[6],=KL7SK(3)[6],=KL7VK(3)[6],
-    =KL7WP(3)[6],=KM4DR(4)[7],=KM4JA(4)[8],=KM7W(4)[6],=KN4Q(4)[8],
-    =KN5H(3)[6],=KN6DV(5)[8],=KO4OL(4)[8],=KO4PU(4)[8],=KO4XJ(4)[8],
-    =KO7X(4)[7],=KQ1X(4)[8],=KR4F(4)[8],=KS4L(4)[8],=KS4X(4)[8],=KS5A(3)[6],
-    =KS7T(4)[6],=KT4LF(4)[8],=KT6D(5)[8],=KU1CW(4)[7],=KU4A(4)[8],=KU8E(5)[8],
+    =AI4DB(4)[8],=AJ4A(4)[8],=AJ4F(4)[7],=K0COP(5)[8],=K0DQ(5)[8],
+    =K0DXC(4)[8],=K0IP(3)[6],=K0JJ(3)[6],=K0LUZ(5)[8],=K0PJ(3)[6],=K0TQ(4)[8],
+    =K0TV(5)[8],=K0ZR(5)[8],=K1DW(4)[7],=K1GU(4)[8],=K1KD(4)[7],=K1LT(4)[8],
+    =K1TN(4)[8],=K2HT(4)[7],=K2PO(3)[6],=K2RD(3)[6],=K2RP(3)[6],=K2UR(4)[8],
+    =K2VCO(3)[6],=K3CQ(4)[8],=K3FIV(3)[6],=K3GP(4)[8],=K3IE(4)[8],
+    =K3JWI(4)[8],=K3TD(4)[7],=K3WA(4)[8],=K3WT(4)[7],=K4AB(4)[8],=K4AMC(4)[8],
+    =K4APG(4)[8],=K4BP(4)[8],=K4BX(4)[8],=K4CWW(4)[8],=K4CX(4)[8],
+    =K4DZR(4)[8],=K4EDI(4)[8],=K4EJQ(4)[8],=K4FT(4)[8],=K4FXN(4)[8],
+    =K4HAL(4)[8],=K4IE(4)[8],=K4IQJ(4)[8],=K4IU(4)[7],=K4LTA(4)[8],
+    =K4MCK(4)[8],=K4NO(4)[8],=K4NVJ(4)[8],=K4PJ(4)[8],=K4RO(4)[8],
+    =K4SPO(4)[8],=K4TD(4)[8],=K4WI(4)[8],=K4WW(4)[8],=K4XU(3)[6],=K4ZGB(4)[8],
+    =K5AUP(5)[8],=K5EK(5)[8],=K5KG(5)[8],=K5RQ(5)[8],=K5RR(3)[6],=K5VIP(5)[8],
+    =K5ZD(5)[8],=K6ND(5)[8],=K6NDV(5)[8],=K6PJ(4)[6],=K6XT(4)[7],=K7ABV(4)[6],
+    =K7BG(4)[6],=K7CS(5)[8],=K7IA(4)[7],=K7JNX(5)[8],=K7OM(5)[8],=K7RB(4)[7],
+    =K7RE(4)[7],=K7RSM(4)[7],=K7SCX(4)[7],=K7SV(5)[8],=K7TD(4)[7],=K7VU(4)[7],
+    =K8BN(3)[6],=K8CN(5)[8],=K8FC(5)[8],=K8GU(5)[8],=K8IA(3)[6],=K8JQ(5)[8],
+    =K8LF(5)[8],=K8NYG(5)[8],=K8NZ(5)[8],=K8OM(4)[7],=K8OQL(5)[8],=K8PO(5)[8],
+    =K8YC(5)[8],=K9BWI(4)[7],=K9CHP(5)[8],=K9DU(4)[7],=K9JF(3)[6],=K9JM(3)[6],
+    =K9JWV(3)[6],=K9MBB(4)[7],=K9MWM(4)[7],=K9OM(5)[8],=K9RS(5)[8],
+    =K9WZB(3)[6],=K9YC(3)[6],=KA2EYH(4)[8],=KA3DRR(3)[6],=KA4OTB(4)[8],
+    =KA4R(4)[8],=KA4TEU(4)[8],=KA8Q(5)[8],=KB7Q(4)[6],=KB8V(5)[8],
+    =KC4HW(4)[8],=KC4SAW(4)[8],=KC4WQ(4)[8],=KC8GCR(5)[8],=KD4N(4)[8],
+    =KD4POJ(4)[7],=KD4SN(4)[8],=KE1B(3)[6],=KE2VB(3)[6],=KE3D(4)[7],
+    =KE4KY(4)[8],=KE4UNA(4)[8],=KE4YVD(4)[8],=KE7X(4)[6],=KF7CG(4)[8],
+    =KG4CUY(4)[8],=KG4MGE(4)[8],=KG9JP(3)[6],=KH6GN(4)[8],=KH6OU(5)[8],
+    =KI4EEY(4)[8],=KI4EZC(4)[8],=KI7MT(4)[6],=KJ4AOM(4)[8],=KJ4BIX(4)[8],
+    =KJ4EEW(4)[8],=KK6MC(4)[7],=KK9A(5)[8],=KK9O(5)[8],=KL5Z(4)[7],
+    =KL7IZC(3)[6],=KL7JR(3)[6],=KL7OO(3)[6],=KL7QR(3)[6],=KL7SK(3)[6],
+    =KL7VK(3)[6],=KL7WP(3)[6],=KM4DR(4)[7],=KM4JA(4)[8],=KM7W(4)[6],
+    =KN4Q(4)[8],=KN5H(3)[6],=KN6DV(5)[8],=KO4OL(4)[8],=KO4PU(4)[8],
+    =KO4XJ(4)[8],=KO7X(4)[7],=KQ1X(4)[8],=KR4F(4)[8],=KS4L(4)[8],=KS4X(4)[8],
+    =KS5A(3)[6],=KS7T(4)[6],=KT0P(5)[8],=KU1CW(4)[7],=KU4A(4)[8],=KU8E(5)[8],
     =KV4T(4)[8],=KW4JS(4)[8],=KY0W(3)[6],=KY4F(4)[8],=KY5R(4)[8],=KZ2V(3)[6],
-    =N0EOP(4)[8],=N0FW(4)[8],=N1CC(4)[7],=N1LU(4)[8],=N1WQ(4)[7],=N2BJ(4)[8],
-    =N2IC(4)[7],=N2NS(3)[6],=N2OPW(4)[8],=N2WN(4)[8],=N3BB(4)[7],=N3BUO(4)[7],
-    =N3CO(4)[8],=N3FAW(3)[6],=N3RC(4)[6],=N3XRU(3)[6],=N3ZZ(3)[6],
-    =N4AAI(4)[8],=N4ARO(4)[8],=N4AU(4)[8],=N4BCB(4)[8],=N4BCD(4)[8],
-    =N4CB(4)[8],=N4DW(4)[8],=N4IJ(4)[7],=N4IR(4)[8],=N4JF(4)[8],=N4JIK(4)[8],
-    =N4KG(4)[8],=N4KZ(4)[8],=N4NM(4)[8],=N4NO(4)[8],=N4NTQ(4)[8],=N4OGW(4)[8],
-    =N4QS(4)[8],=N4TZ(4)[8],=N4UC(4)[8],=N4UW(4)[8],=N4VI(4)[7],=N4VN(4)[8],
-    =N4VV(4)[8],=N4ZI(4)[8],=N4ZZ(4)[8],=N5KO(3)[6],=N5LZ(3)[6],=N5VI(5)[8],
-    =N6AR(5)[8],=N7FF(4)[7],=N7FLT(4)[6],=N7GVV(4)[8],=N7IV(4)[7],=N7IX(4)[7],
-    =N7KA(4)[7],=N7MZW(4)[7],=N7NG(4)[7],=N8AJN(4)[7],=N8CL(5)[8],=N8II(5)[8],
-    =N8MPX(5)[8],=N8NA(5)[8],=N8PR(5)[8],=N8RA(5)[8],=N8RR(5)[8],=N8WXQ(5)[8],
-    =N9CM(5)[8],=N9HDE(4)[7],=N9MM(4)[7],=N9NC(5)[8],=NA2U(3)[6],=NA4C(4)[8],
-    =NA4K(4)[8],=NA4W(4)[8],=NB4M(4)[8],=NB7V(4)[6],=ND2T(3)[6],=ND4X(4)[8],
-    =ND8N(3)[6],=NE4M(4)[8],=NE8J(5)[8],=NE9Z(4)[7],=NH6Z(3)[6],=NH7C(5)[8],
+    =N0EOP(4)[8],=N0FW(4)[8],=N1CC(4)[7],=N1JM(3)[6],=N1LU(4)[8],=N1WQ(4)[7],
+    =N2BJ(4)[8],=N2IC(4)[7],=N2NS(3)[6],=N2OPW(4)[8],=N2WN(4)[8],=N3BB(4)[7],
+    =N3BUO(4)[7],=N3CO(4)[8],=N3FAW(3)[6],=N3RC(4)[6],=N3XRU(3)[6],
+    =N3ZZ(3)[6],=N4AAI(4)[8],=N4ARO(4)[8],=N4AU(4)[8],=N4BCB(4)[8],
+    =N4BCD(4)[8],=N4DTF(4)[8],=N4DW(4)[8],=N4IJ(4)[7],=N4IR(4)[8],=N4JF(4)[8],
+    =N4JIK(4)[8],=N4KG(4)[8],=N4KZ(4)[8],=N4NM(4)[8],=N4NO(4)[8],=N4NTQ(4)[8],
+    =N4OGW(4)[8],=N4QS(4)[8],=N4TZ(4)[8],=N4UC(4)[8],=N4UW(4)[8],=N4VI(4)[7],
+    =N4VN(4)[8],=N4VV(4)[8],=N4ZI(4)[8],=N4ZZ(4)[8],=N5KO(3)[6],=N5LZ(3)[6],
+    =N5VI(5)[8],=N6AR(5)[8],=N7FF(4)[7],=N7FLT(4)[6],=N7GVV(4)[8],=N7IV(4)[7],
+    =N7KA(4)[7],=N7MB(4)[8],=N7MZW(4)[7],=N7NG(4)[7],=N8AJN(4)[7],=N8CL(5)[8],
+    =N8II(5)[8],=N8MPX(5)[8],=N8NA(5)[8],=N8PR(5)[8],=N8RA(5)[8],=N8RR(5)[8],
+    =N8WXQ(5)[8],=N9CM(5)[8],=N9HDE(4)[7],=N9MM(4)[7],=N9NC(5)[8],=NA2U(3)[6],
+    =NA4C(4)[8],=NA4K(4)[8],=NA4W(4)[8],=NB4M(4)[8],=NB7V(4)[6],=ND2T(3)[6],
+    =ND4X(4)[8],=ND8N(3)[6],=NE4M(4)[8],=NE8J(5)[8],=NE9Z(4)[7],=NH6Z(3)[6],
     =NJ4I(4)[8],=NM4K(4)[8],=NN4MM(4)[8],=NN4US(4)[8],=NN7A(4)[7],=NO2D(4)[7],
     =NO9E(5)[8],=NP2N(4)[7],=NP3D(5)[8],=NQ4U(4)[8],=NR7DX(4)[6],=NS0I(5)[8],
-    =NS2X(4)[8],=NU4B(4)[8],=NV4B(4)[8],=NW6S(5)[8],=NW8U(5)[8],=NX1P(3)[6],
-    =NX9T(5)[8],=NY6DX(5)[8],=W0BR(5)[8],=W0IZ(4)[8],=W0JLC(5)[8],=W0PV(5)[8],
+    =NS2X(4)[8],=NU4B(4)[8],=NV4B(4)[8],=NW8U(5)[8],=NX1P(3)[6],=NX9T(5)[8],
+    =NY6DX(5)[8],=W0BR(5)[8],=W0IZ(4)[8],=W0JLC(5)[8],=W0PV(5)[8],
     =W0QQG(5)[8],=W0UCE(5)[8],=W0YK(3)[6],=W0YR(5)[8],=W1NN(4)[8],=W1RH(3)[6],
-    =W2OO(4)[8],=W2VJN(3)[6],=W2VKT(3)[6],=W3CP(3)[6],=W3HDH(4)[8],
-    =W4BCG(4)[8],=W4BK(4)[8],=W4DAN(4)[8],=W4DVG(4)[8],=W4EEH(4)[8],
-    =W4EF(3)[6],=W4GHD(4)[8],=W4GKM(4)[8],=W4HOD(4)[8],=W4HZD(4)[8],
-    =W4JHC(4)[7],=W4JSI(4)[8],=W4KW(4)[8],=W4LC(4)[8],=W4LSC(3)[6],
-    =W4LWW(4)[8],=W4NBS(4)[8],=W4NI(4)[8],=W4NJK(3)[6],=W4NZ(4)[8],
-    =W4PV(4)[8],=W4RK(4)[7],=W4RRE(4)[8],=W4RYW(4)[8],=W4TGB(4)[8],
-    =W4TKI(4)[8],=W4UAL(4)[8],=W4UAT(3)[6],=W4UT(4)[8],=W5DQ(3)[6],
-    =W5JBO(3)[6],=W5JBV(5)[8],=W5JR(5)[8],=W5MPC(5)[8],=W5MX(4)[8],
-    =W5NYC(5)[8],=W5UHQ(4)[8],=W6AAN(5)[8],=W6GMT(4)[7],=W6HGF(5)[8],
-    =W6IHG(5)[8],=W6KGP(4)[7],=W6LFB(4)[7],=W6NWS(5)[8],=W6PU(4)[7],
-    =W6SAI(4)[8],=W6UB(4)[8],=W6XR(5)[8],=W7DO(5)[8],=W7HJ(5)[8],=W7IMP(5)[8],
-    =W7IY(5)[8],=W7JI(4)[7],=W7KAM(4)[7],=W7KF(4)[6],=W7KU(4)[7],=W7THY(4)[7],
+    =W1ZD(3)[6],=W2OO(4)[8],=W2VJN(3)[6],=W2VKT(3)[6],=W3CP(3)[6],
+    =W3HDH(4)[8],=W4BCG(4)[8],=W4BCU(4)[8],=W4BK(4)[8],=W4DAN(4)[8],
+    =W4DVG(4)[8],=W4EEH(4)[8],=W4EF(3)[6],=W4GHD(4)[8],=W4GKM(4)[8],
+    =W4HOD(4)[8],=W4HZD(4)[8],=W4JHC(4)[7],=W4JSI(4)[8],=W4KW(4)[8],
+    =W4LC(4)[8],=W4LSC(3)[6],=W4LWW(4)[8],=W4NBS(4)[8],=W4NI(4)[8],
+    =W4NJK(3)[6],=W4NZ(4)[8],=W4PHS(4)[8],=W4PV(4)[8],=W4RK(4)[7],
+    =W4RRE(4)[8],=W4RYW(4)[8],=W4TKI(4)[8],=W4UAL(4)[8],=W4UAT(3)[6],
+    =W4UT(4)[8],=W5DQ(3)[6],=W5JBO(3)[6],=W5JBV(5)[8],=W5JR(5)[8],
+    =W5MPC(5)[8],=W5MX(4)[8],=W5UHQ(4)[8],=W6AAN(5)[8],=W6GMT(4)[7],
+    =W6HGF(5)[8],=W6IHG(5)[8],=W6KGP(4)[7],=W6LFB(4)[7],=W6NWS(5)[8],
+    =W6PU(4)[7],=W6SAI(4)[8],=W6UB(4)[8],=W6XR(5)[8],=W7DO(5)[8],=W7HJ(5)[8],
+    =W7IMP(5)[8],=W7IY(5)[8],=W7JI(4)[7],=W7KF(4)[6],=W7KU(4)[7],=W7THY(4)[7],
     =W8AEF(3)[6],=W8AKS(5)[8],=W8FJ(5)[8],=W8FN(4)[7],=W8HGH(5)[8],
-    =W8IVF(5)[8],=W8JA(5)[8],=W8JI(5)[8],=W8OHT(5)[8],=W8TK(3)[6],
+    =W8HW(5)[8],=W8IVF(5)[8],=W8JI(5)[8],=W8OHT(5)[8],=W8TK(3)[6],
     =W8WEJ(5)[8],=W8ZA(5)[8],=W9CF(3)[6],=W9IL(5)[8],=W9LHG(4)[7],
     =W9NGA(3)[6],=W9PL(3)[6],=W9UK(5)[8],=W9XQ(4)[7],=WA0KDS(3)[6],
     =WA0WWW(3)[6],=WA1FCN(4)[8],=WA1PMA(3)[6],=WA1UJU(4)[8],=WA3C(4)[8],
-    =WA4SM(4)[8],=WA4WLI(4)[8],=WA5VGI(3)[6],=WA7JHQ(4)[7],=WA7NPX(4)[7],
-    =WA8OJR(5)[8],=WA8WV(5)[8],=WA8ZBT(4)[7],=WB5NMZ(4)[8],=WB8BPU(5)[8],
+    =WA4SM(4)[8],=WA4WLI(4)[8],=WA5VGI(3)[6],=WA7NPX(4)[7],=WA8OJR(5)[8],
+    =WA8WV(5)[8],=WA8ZBT(4)[7],=WB4YDL(4)[8],=WB5NMZ(4)[8],=WB8BPU(5)[8],
     =WB8YYY(5)[8],=WB9KPT(5)[8],=WC2Z(4)[8],=WC7S(4)[7],=WC7V(4)[6],
-    =WD4OHD(4)[8],=WD8CQB(5)[8],=WF4U(3)[6],=WF7T(4)[8],=WG7Y(4)[7],
-    =WJ9B(5)[8],=WK5X(5)[8],=WO4O(4)[8],=WP4JBG(4)[8],=WR1Q(4)[8],=WS6K(4)[8],
-    =WS9M(5)[8],=WT5L(5)[8],=WT9Q(4)[7],=WU9B(3)[6],=WW2Y(4)[7],=WW4R(4)[8],
-    =WX4MM(4)[8],=WX4TM(4)[8],=WX5S(3)[6],=WY5I(5)[8],=WY7FD(4)[7],
-    =WY7LL(4)[7],=WY7SS(4)[7],=WZ4F(4)[8];
+    =WD8CQB(5)[8],=WF4U(3)[6],=WF7T(4)[8],=WG7Y(4)[7],=WJ9B(5)[8],=WK5X(5)[8],
+    =WO4O(4)[8],=WP2B(4)[7],=WS6K(4)[8],=WS9M(5)[8],=WT5L(5)[8],=WT9Q(4)[7],
+    =WU9B(3)[6],=WW2Y(4)[7],=WW4R(4)[8],=WX4MM(4)[8],=WX4TM(4)[8],=WX5S(3)[6],
+    =WY5I(5)[8],=WY7FD(4)[7],=WY7LL(4)[7],=WY7SS(4)[7],=WZ4F(4)[8];
 Guantanamo Bay:           08:  11:  NA:   20.00:    75.00:     5.0:  KG4:
     KG4;
 Northern Mariana Islands: 27:  64:  OC:   15.18:  -145.72:   -10.0:  KH0:
@@ -611,7 +609,7 @@ Palmyra & Jarvis Islands: 31:  61:  OC:    5.87:   162.07:    11.0:  KH5:
 Kingman Reef:             31:  61:  OC:    6.40:   162.40:    11.0:  KH5K:
     AH5K,KH5K,NH5K,WH5K;
 Hawaii:                   31:  61:  OC:   19.67:   155.57:    10.0:  KH6:
-    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=K4XV,=WB4JTT;
+    AH6,AH7,KH6,KH7,NH6,NH7,WH6,WH7,=K4XV,=N6KB,=WB4JTT;
 Kure Island:              31:  61:  OC:   29.00:   178.00:    10.0:  KH7K:
     AH7K,KH7K,NH7K,WH7K;
 American Samoa:           32:  62:  OC:  -14.32:   170.78:    11.0:  KH8:
@@ -621,13 +619,13 @@ Swains Island:            32:  62:  OC:  -11.05:   171.25:    11.0:  KH8/s:
 Wake Island:              31:  65:  OC:   19.28:  -166.63:   -12.0:  KH9:
     AH9,KH9,NH9,WH9;
 Alaska:                   01:  01:  NA:   63.87:   153.78:     8.0:  KL:
-    AL,KL,NL,WL,=KH0NF,=KH0NG;
+    AL,KL,NL,WL,=AH0AH;
 Navassa Island:           08:  11:  NA:   18.40:    75.00:     5.0:  KP1:
     KP1,NP1,WP1;
 U.S. Virgin Islands:      08:  11:  NA:   17.73:    64.80:     4.0:  KP2:
-    KP2,NP2,WP2,=K9VV,=KV4BT,=KV4BW,=KV4CF,=KV4FZ;
+    KP2,NP2,WP2,=KV4BT,=KV4BW,=KV4CF,=KV4FZ;
 Puerto Rico:              08:  11:  NA:   18.18:    66.55:     4.0:  KP4:
-    KP3,KP4,NP3,NP4,WP3,WP4,=K4J,=KC2TE,=KH2RU;
+    KP3,KP4,NP3,NP4,WP3,WP4,=KC2TE,=KH2RU;
 Desecheo Island:          08:  11:  NA:   18.08:    67.88:     4.0:  KP5:
     KP5,NP5,WP5;
 Norway:                   14:  18:  EU:   61.00:    -9.00:    -1.0:  LA:
@@ -728,13 +726,12 @@ Argentina:                13:  14:  SA:  -34.80:    65.92:     3.0:  LU:
     LW2W[16],LW2X[16],LW2Y[16],LW3V[16],LW3W[16],LW3X[16],LW3Y[16],LW4V[16],
     LW4W[16],LW4X[16],LW4Y[16],LW5V[16],LW5W[16],LW5X[16],LW5Y[16],LW6V[16],
     LW6W[16],LW6X[16],LW6Y[16],LW7V[16],LW7W[16],LW7X[16],LW7Y[16],LW8V[16],
-    LW8W[16],LW8X[16],LW8Y[16],LW9V[16],LW9W[16],LW9X[16],LW9Y[16],
-    =LP0B/XP[16],=LU1DKD/D,=LU1DZ/D,=LU1XZ/H,=LU1YY/XA[16],=LU2CHP/D,=LU2CM/D,
-    =LU2DJB/J,=LU2DT/D,=LU2DVI/H,=LU2EE/D,=LU2FP/F,=LU2HOD/D,=LU3DJI/D,
-    =LU3FV/F,=LU3VAL/V[16],=LU4DBP/D,=LU4DBT/D,=LU4DBT/XA[16],=LU4ETN/F,
-    =LU4HOD/F,=LU5DEM/W[16],=LU5DFR/D,=LU5DGI/W[16],=LU5DRV/D,=LU5EJL/D,
-    =LU5FHD/F,=LU6EE/XA[16],=LU7DSY/V[16],=LU7FM/F,=LU7JMS/J,=LU8DIP/D,
-    =LU8DQ/D,=LU9ESD/W[16],=LU9JMG/J,=LU9XPA/L,=LV7E/D,=LW8EAG/D;
+    LW8W[16],LW8X[16],LW8Y[16],LW9V[16],LW9W[16],LW9X[16],LW9Y[16],=LU1DKD/D,
+    =LU1DZ/D,=LU1XZ/H,=LU1YY/XA[16],=LU2AVW/D,=LU2CHP/D,=LU2CM/D,=LU2DJB/J,
+    =LU2DVI/H,=LU2EE/D,=LU2FP/F,=LU2HOD/D,=LU3DJI/D,=LU3FV/F,=LU3VAL/V[16],
+    =LU4DBP/D,=LU4DBT/XA[16],=LU4ETN/F,=LU4HOD/F,=LU5DEM/W[16],=LU5DGI/W[16],
+    =LU5EJL/D,=LU6EE/XA[16],=LU6FE/H,=LU7DSY/V[16],=LU7FM/F,=LU7JMS/J,
+    =LU8DIP/D,=LU8DQ/D,=LU8DZE/D,=LU9JMG/J,=LU9XPA/L,=LV7E/D,=LW8EAG/D;
 Luxembourg:               14:  27:  EU:   50.00:    -6.00:    -1.0:  LX:
     LX;
 Lithuania:                15:  29:  EU:   55.45:   -23.63:    -2.0:  LY:
@@ -786,7 +783,7 @@ Brazil:                   11:  12:  SA:  -10.00:    53.00:     3.0:  PY:
     PT4[15],PT7[13],PT9[15],PU3[15],PU4[15],PV3[15],PV4[15],PW3[15],PW4[15],
     PX3[15],PX4[15],PY1[15],PY2[15],PY3[15],PY4[15],PY5[15],PY6[13],PY7[13],
     PY8[13],PY9[13],ZV3[15],ZV4[15],ZW3[15],ZW4[15],ZX3[15],ZX4[15],ZY3[15],
-    ZY4[15],ZZ3[15],ZZ4[15],=PY4MAB/BNC[15];
+    ZY4[15],ZZ3[15],ZZ4[15],=PY7ACQ,=PY4MAB/BNC[15];
 Fernando de Noronha:      11:  13:  SA:   -3.85:    32.43:     2.0:  PY0F:
     PP0F,PQ0F,PR0F,PS0F,PT0F,PU0F,PV0F,PW0F,PX0F,PY0F,PY0Z,ZV0F,ZW0F,ZX0F,
     ZY0F,ZY0R,ZY0Z,ZZ0F;
@@ -1115,7 +1112,7 @@ Canada:                   05:  09:  NA:   44.35:    78.75:     5.0:  VE:
     CI1(1)[2],CI2,CJ2[4],CK2[4],CY1,CY2(2),CZ0(2)[4],CZ1(1)[2],CZ2,VA2[4],
     VB2[4],VC2[4],VD1,VD2(2),VE2[4],VF0(2)[4],VF1(1)[2],VF2,VG2[4],VO1,VO2(2),
     VX2[4],VY0(2)[4],VY1(1)[2],VY2,XJ1,XJ2(2),XK0(2)[4],XK1(1)[2],XK2,XL2[4],
-    XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20110329,=VE0MDL(3)[2],
+    XM2[4],XN1,XN2(2),XO0(2)[4],XO1(1)[2],XO2,=VER20110523,=VE0MDL(3)[2],
     =VE2AEJ(4)[3],=VE2DXY(2)[4],=VE2FK[9],=VE2GSO(2)[4],=VE2III(2)[4],
     =VE2IM(2)[4],=VE2TKH(2)[4],=VE2XAA/2(2)[4],=VE3DO/7(3)[2],=VE8RAC(2)[4],
     =VY0PW(4)[3];
@@ -1125,7 +1122,7 @@ Australia:                30:  59:  OC:  -23.70:  -132.33:   -10.0:  VK:
 Heard Island:             39:  68:  AF:  -53.08:   -73.50:    -5.0:  VK0H:
     =VK0IR;
 Macquarie Island:         30:  60:  OC:  -54.60:  -158.88:   -10.0:  VK0M:
-    =VK0KEV;
+    =VK0KEV,=VK0M/ZL4DB/P;
 Cocos-Keeling:            29:  54:  OC:  -12.15:   -96.82:    -6.5:  VK9C:
     AX9C,AX9Y,VH9C,VH9Y,VI9C,VI9Y,VJ9C,VJ9Y,VK9C,VK9Y,VL9C,VL9Y,VM9C,VM9Y,
     VN9C,VN9Y,VZ9C,VZ9Y,=VK9AA;
@@ -1157,7 +1154,7 @@ Falkland Islands:         13:  16:  SA:  -51.63:    58.72:     4.0:  VP8:
 South Georgia:            13:  73:  SA:  -54.48:    37.08:     2.0:  VP8/g:
     =VP8DIF;
 South Shetland:           13:  73:  SA:  -62.08:    58.67:     4.0:  VP8/h:
-    CE9,XR9,=DT8A,=HF0POL,=I1SR,=LU8DIP/Z,=R1ANF/B;
+    CE9,XR9,=DT8A,=HF0POL,=I1SR,=LU8DIP/Z;
 South Orkney:             13:  73:  SA:  -60.60:    45.55:     3.0:  VP8/o:
     =AY1ZA,=LU1ZA;
 South Sandwich:           13:  73:  SA:  -58.43:    26.33:     2.0:  VP8/s:
@@ -1246,7 +1243,7 @@ Niue:                     32:  62:  OC:  -19.03:   169.85:    11.0:  ZK2:
 Tokelau:                  31:  62:  OC:   -9.40:   171.20:    10.0:  ZK3:
     ZK3;
 New Zealand:              32:  60:  OC:  -41.83:  -173.27:   -12.0:  ZL:
-    ZK,ZL,ZM,=ZL50GH,=ZL50VK;
+    ZK,ZL,ZM,=ZL50GH;
 Chatham Islands:          32:  60:  OC:  -43.85:   176.48:  -12.75:  ZL7:
     ZL7,ZM7;
 Kermadec Islands:         32:  60:  OC:  -29.25:   177.92:   -12.0:  ZL8:

diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index 52233db4ddd95a283a7ba091c0c533ea8e09124c..6fdf3c6151dbdd46a7c8541aab4616f5fc0d133f 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -315,14 +315,13 @@
   '=AG3V' => '207',
   '=AG4CZ' => '207',
   '=AG4W' => '207',
+  '=AH0AH' => '423',
   '=AH2DT' => '207',
   '=AH6N' => '207',
   '=AI1P' => '207',
   '=AI4DB' => '207',
-  '=AI4G' => '207',
+  '=AJ4A' => '207',
   '=AJ4F' => '207',
-  '=AL7QQ' => '207',
-  '=AT10BP' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=AY1ZA' => '338',
   '=BA0AA/8' => '10,343,344,345',
   '=BS7H' => '304',
@@ -330,17 +329,17 @@
   '=DP0GVN' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=DP1POL' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=DT8A' => '340',
-  '=E51WWB' => '341',
+  '=E51WL' => '341',
   '=EA3BT/6' => '35',
   '=EA5RKL/8' => '36',
   '=EA9CE/D' => '37,374,375',
   '=EA9CE/I' => '37,374,375',
   '=EA9CP/1' => '34',
   '=EA9FN/7' => '34',
+  '=EA9JS/7' => '34',
   '=FK8IK/C' => '316',
   '=FO8RZ/P' => '314',
   '=G0FBJ' => '381',
-  '=GB0AOA' => '61',
   '=GB0AWS' => '66',
   '=GB0BHR' => '66',
   '=GB0CSA' => '66',
@@ -376,6 +375,7 @@
   '=GB3SWF' => '64,381',
   '=GB4BPL' => '66',
   '=GB4GS' => '64,381',
+  '=GB4MBC' => '66',
   '=GB4MD' => '66',
   '=GB4MDI' => '66',
   '=GB4RC' => '66',
@@ -454,6 +454,7 @@
   '=IQ0AL' => '84',
   '=IQ0QP' => '84',
   '=IQ0SS' => '84',
+  '=JD1BME' => '330',
   '=JD1BMM' => '330',
   '=JW4GHA' => '395',
   '=K0COP' => '207',
@@ -471,16 +472,17 @@
   '=K1KD' => '207',
   '=K1LT' => '207',
   '=K1TN' => '207',
+  '=K2HT' => '207',
   '=K2PO' => '207',
   '=K2RD' => '207',
   '=K2RP' => '207',
   '=K2UR' => '207',
   '=K2VCO' => '207',
-  '=K2VV' => '207',
   '=K3CQ' => '207',
   '=K3FIV' => '207',
   '=K3GP' => '207',
   '=K3IE' => '207',
+  '=K3JWI' => '207',
   '=K3TD' => '207',
   '=K3WA' => '207',
   '=K3WT' => '207',
@@ -493,14 +495,15 @@
   '=K4CX' => '207',
   '=K4DZR' => '207',
   '=K4EDI' => '207',
+  '=K4EJQ' => '207',
   '=K4FT' => '207',
   '=K4FXN' => '207',
   '=K4HAL' => '207',
   '=K4IE' => '207',
   '=K4IQJ' => '207',
   '=K4IU' => '207',
-  '=K4J' => '113',
   '=K4LTA' => '207',
+  '=K4MCK' => '207',
   '=K4NO' => '207',
   '=K4NVJ' => '207',
   '=K4PJ' => '207',
@@ -511,7 +514,6 @@
   '=K4WW' => '207',
   '=K4XU' => '207',
   '=K4XV' => '105,418,419',
-  '=K4YJ' => '207',
   '=K4ZGB' => '207',
   '=K5AUP' => '207',
   '=K5EK' => '207',
@@ -530,13 +532,13 @@
   '=K7IA' => '207',
   '=K7JNX' => '207',
   '=K7OM' => '207',
+  '=K7RB' => '207',
   '=K7RE' => '207',
   '=K7RSM' => '207',
   '=K7SCX' => '207',
   '=K7SV' => '207',
   '=K7TD' => '207',
   '=K7VU' => '207',
-  '=K7ZYV' => '207',
   '=K8BN' => '207',
   '=K8CN' => '207',
   '=K8FC' => '207',
@@ -546,6 +548,7 @@
   '=K8LF' => '207',
   '=K8NYG' => '207',
   '=K8NZ' => '207',
+  '=K8OM' => '207',
   '=K8OQL' => '207',
   '=K8PO' => '207',
   '=K8YC' => '207',
@@ -556,16 +559,17 @@
   '=K9JM' => '207',
   '=K9JWV' => '207',
   '=K9MBB' => '207',
+  '=K9MWM' => '207',
   '=K9OM' => '207',
   '=K9PET/KC4' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=K9RS' => '207',
-  '=K9VV' => '112',
   '=K9WZB' => '207',
   '=K9YC' => '207',
   '=KA2EYH' => '207',
   '=KA3DRR' => '207',
   '=KA4OTB' => '207',
   '=KA4R' => '207',
+  '=KA4TEU' => '207',
   '=KA8Q' => '207',
   '=KB7Q' => '207',
   '=KB8V' => '207',
@@ -581,36 +585,27 @@
   '=KC4USV' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=KC4WQ' => '207',
   '=KC8GCR' => '207',
-  '=KD4FJ' => '207',
-  '=KD4HXT' => '207',
   '=KD4N' => '207',
   '=KD4POJ' => '207',
   '=KD4SN' => '207',
   '=KE1B' => '207',
   '=KE2VB' => '207',
   '=KE3D' => '207',
-  '=KE4KWE' => '207',
   '=KE4KY' => '207',
   '=KE4UNA' => '207',
   '=KE4YVD' => '207',
-  '=KE7NO' => '207',
   '=KE7X' => '207',
   '=KF7CG' => '207',
   '=KG4CUY' => '207',
   '=KG4MGE' => '207',
   '=KG6DX' => '100',
-  '=KG7HF' => '207',
   '=KG9JP' => '207',
-  '=KH0NF' => '423',
-  '=KH0NG' => '423',
   '=KH2RU' => '113',
   '=KH6GN' => '207',
   '=KH6OU' => '207',
-  '=KH6XS' => '207',
   '=KH8SI' => '319',
   '=KI4EEY' => '207',
   '=KI4EZC' => '207',
-  '=KI6DY' => '207',
   '=KI7MT' => '207',
   '=KJ4AOM' => '207',
   '=KJ4BIX' => '207',
@@ -643,8 +638,7 @@
   '=KS4X' => '207',
   '=KS5A' => '207',
   '=KS7T' => '207',
-  '=KT4LF' => '207',
-  '=KT6D' => '207',
+  '=KT0P' => '207',
   '=KU1CW' => '207',
   '=KU4A' => '207',
   '=KU8E' => '207',
@@ -658,17 +652,16 @@
   '=KY4F' => '207',
   '=KY5R' => '207',
   '=KZ2V' => '207',
-  '=LP0B/XP' => '117,427,428',
   '=LU/FT5YK' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=LU1DKD/D' => '117,427,428',
   '=LU1DZ/D' => '117,427,428',
   '=LU1XZ/H' => '117,427,428',
   '=LU1YY/XA' => '117,427,428',
   '=LU1ZA' => '338',
+  '=LU2AVW/D' => '117,427,428',
   '=LU2CHP/D' => '117,427,428',
   '=LU2CM/D' => '117,427,428',
   '=LU2DJB/J' => '117,427,428',
-  '=LU2DT/D' => '117,427,428',
   '=LU2DVI/H' => '117,427,428',
   '=LU2EE/D' => '117,427,428',
   '=LU2FP/F' => '117,427,428',
@@ -677,38 +670,38 @@
   '=LU3FV/F' => '117,427,428',
   '=LU3VAL/V' => '117,427,428',
   '=LU4DBP/D' => '117,427,428',
-  '=LU4DBT/D' => '117,427,428',
   '=LU4DBT/XA' => '117,427,428',
   '=LU4ETN/F' => '117,427,428',
   '=LU4HOD/F' => '117,427,428',
   '=LU5DEM/W' => '117,427,428',
-  '=LU5DFR/D' => '117,427,428',
   '=LU5DGI/W' => '117,427,428',
-  '=LU5DRV/D' => '117,427,428',
   '=LU5EJL/D' => '117,427,428',
-  '=LU5FHD/F' => '117,427,428',
   '=LU6EE/XA' => '117,427,428',
+  '=LU6FE/H' => '117,427,428',
   '=LU7DSY/V' => '117,427,428',
   '=LU7FM/F' => '117,427,428',
   '=LU7JMS/J' => '117,427,428',
   '=LU8DIP/D' => '117,427,428',
   '=LU8DIP/Z' => '340',
   '=LU8DQ/D' => '117,427,428',
-  '=LU9ESD/W' => '117,427,428',
+  '=LU8DZE/D' => '117,427,428',
   '=LU9JMG/J' => '117,427,428',
   '=LU9XPA/L' => '117,427,428',
   '=LV7E/D' => '117,427,428',
   '=LW8EAG/D' => '117,427,428',
   '=MA1FJM' => '381',
+  '=MB100TT' => '61',
   '=MM0XAU' => '381',
   '=MM0ZCG' => '381',
   '=MM1FJM' => '381',
+  '=MM5PSL' => '381',
   '=MM6SJK' => '381',
   '=MS0ZCG' => '381',
   '=MS0ZET' => '381',
   '=N0EOP' => '207',
   '=N0FW' => '207',
   '=N1CC' => '207',
+  '=N1JM' => '207',
   '=N1LU' => '207',
   '=N1WQ' => '207',
   '=N2BJ' => '207',
@@ -729,7 +722,7 @@
   '=N4AU' => '207',
   '=N4BCB' => '207',
   '=N4BCD' => '207',
-  '=N4CB' => '207',
+  '=N4DTF' => '207',
   '=N4DW' => '207',
   '=N4IJ' => '207',
   '=N4IR' => '207',
@@ -754,12 +747,13 @@
   '=N5LZ' => '207',
   '=N5VI' => '207',
   '=N6AR' => '207',
+  '=N6KB' => '105,418,419',
   '=N7FF' => '207',
   '=N7FLT' => '207',
   '=N7GVV' => '207',
   '=N7IV' => '207',
-  '=N7IX' => '207',
   '=N7KA' => '207',
+  '=N7MB' => '207',
   '=N7MZW' => '207',
   '=N7NG' => '207',
   '=N8AJN' => '207',
@@ -788,7 +782,6 @@
   '=NE8J' => '207',
   '=NE9Z' => '207',
   '=NH6Z' => '207',
-  '=NH7C' => '207',
   '=NJ4I' => '207',
   '=NM4K' => '207',
   '=NN4MM' => '207',
@@ -804,17 +797,15 @@
   '=NS2X' => '207',
   '=NU4B' => '207',
   '=NV4B' => '207',
-  '=NW6S' => '207',
   '=NW8U' => '207',
   '=NX1P' => '207',
   '=NX9T' => '207',
   '=NY6DX' => '207',
   '=OJ1ABOA' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=PY4MAB/BNC' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
-  '=R1ANF/B' => '340',
+  '=PY7ACQ' => '133,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507',
   '=R1ANP' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=R1ANR' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
-  '=R1ANY' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=R2MWO' => '171',
   '=R7LV/2' => '171',
   '=RA2AT' => '169,516,517,518,519',
@@ -838,12 +829,10 @@
   '=SV9DRU/1' => '146',
   '=SX65AP' => '147',
   '=SX65AP/5' => '147',
-  '=TO11A' => '43',
-  '=TO2FH' => '44',
-  '=TO2Z' => '50,51,379,53',
   '=TO5A' => '46',
   '=TO5T' => '46',
   '=TO7A' => '46',
+  '=TO8A' => '46',
   '=TX3D' => '313',
   '=TX5C' => '48',
   '=UA9KAS/6/P' => '169,516,517,518,519',
@@ -858,20 +847,21 @@
   '=VE2XAA/2' => '187,543,544,545,546,547,548,549,550,551',
   '=VE3DO/7' => '187,543,544,545,546,547,548,549,550,551',
   '=VE8RAC' => '187,543,544,545,546,547,548,549,550,551',
-  '=VER20110329' => '187,543,544,545,546,547,548,549,550,551',
-  '=VERSION' => '283',
+  '=VER20110523' => '187,543,544,545,546,547,548,549,550,551',
+  '=VERSION' => '4',
   '=VK0IR' => '190',
   '=VK0KEV' => '191',
+  '=VK0M/ZL4DB/P' => '191',
   '=VK9AA' => '334',
   '=VK9FLHI' => '332',
   '=VK9ZLH' => '332',
+  '=VO1AU/BY1RX' => '10,343,344,345',
   '=VP6DX' => '317',
   '=VP8ADE/B' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=VP8DIF' => '337',
   '=VP8DLM' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=VP8DMH/P' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=VP8THU' => '339',
-  '=VU2JBK/AT10' => '97,396,397,399,400,401,402,403,404,405,406,407,408,409,411,413',
   '=VY0PW' => '187,543,544,545,546,547,548,549,550,551',
   '=W0BR' => '207',
   '=W0IZ' => '207',
@@ -883,12 +873,14 @@
   '=W0YR' => '207',
   '=W1NN' => '207',
   '=W1RH' => '207',
+  '=W1ZD' => '207',
   '=W2OO' => '207',
   '=W2VJN' => '207',
   '=W2VKT' => '207',
   '=W3CP' => '207',
   '=W3HDH' => '207',
   '=W4BCG' => '207',
+  '=W4BCU' => '207',
   '=W4BK' => '207',
   '=W4DAN' => '207',
   '=W4DVG' => '207',
@@ -908,11 +900,11 @@
   '=W4NI' => '207',
   '=W4NJK' => '207',
   '=W4NZ' => '207',
+  '=W4PHS' => '207',
   '=W4PV' => '207',
   '=W4RK' => '207',
   '=W4RRE' => '207',
   '=W4RYW' => '207',
-  '=W4TGB' => '207',
   '=W4TKI' => '207',
   '=W4UAL' => '207',
   '=W4UAT' => '207',
@@ -923,7 +915,6 @@
   '=W5JR' => '207',
   '=W5MPC' => '207',
   '=W5MX' => '207',
-  '=W5NYC' => '207',
   '=W5UHQ' => '207',
   '=W6AAN' => '207',
   '=W6GMT' => '207',
@@ -941,7 +932,6 @@
   '=W7IMP' => '207',
   '=W7IY' => '207',
   '=W7JI' => '207',
-  '=W7KAM' => '207',
   '=W7KF' => '207',
   '=W7KU' => '207',
   '=W7THY' => '207',
@@ -950,8 +940,8 @@
   '=W8FJ' => '207',
   '=W8FN' => '207',
   '=W8HGH' => '207',
+  '=W8HW' => '207',
   '=W8IVF' => '207',
-  '=W8JA' => '207',
   '=W8JI' => '207',
   '=W8OHT' => '207',
   '=W8TK' => '207',
@@ -973,12 +963,12 @@
   '=WA4SM' => '207',
   '=WA4WLI' => '207',
   '=WA5VGI' => '207',
-  '=WA7JHQ' => '207',
   '=WA7NPX' => '207',
   '=WA8OJR' => '207',
   '=WA8WV' => '207',
   '=WA8ZBT' => '207',
   '=WB4JTT' => '105,418,419',
+  '=WB4YDL' => '207',
   '=WB5NMZ' => '207',
   '=WB8BPU' => '207',
   '=WB8YYY' => '207',
@@ -986,7 +976,6 @@
   '=WC2Z' => '207',
   '=WC7S' => '207',
   '=WC7V' => '207',
-  '=WD4OHD' => '207',
   '=WD8CQB' => '207',
   '=WF4U' => '207',
   '=WF7T' => '207',
@@ -994,8 +983,7 @@
   '=WJ9B' => '207',
   '=WK5X' => '207',
   '=WO4O' => '207',
-  '=WP4JBG' => '207',
-  '=WR1Q' => '207',
+  '=WP2B' => '207',
   '=WS6K' => '207',
   '=WS9M' => '207',
   '=WT5L' => '207',
@@ -1013,7 +1001,6 @@
   '=WZ4F' => '207',
   '=YU8/HB9BF' => '324',
   '=ZL50GH' => '239,638,639,640,641',
-  '=ZL50VK' => '239,638,639,640,641',
   'A2' => '1',
   'A3' => '2',
   'A4' => '3',