added CTY1705 and extended 60m band

diff --git a/Changes b/Changes
index 6da8bad89c0c67163a80dc7979f125a5c47e5218..ee588d0a81d28d4c7953eded696ff21cb54bc92e 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+31Jul07=======================================================================
+1. extend 60m band slighty and add ssb section.
+2. add a new cty.dat (CTY-1705) from Jim AD1C.
 27Jul07=======================================================================
 1. Added Angel's changes to Messages for Spanish (finally).
 25Jul07=======================================================================

diff --git a/data/bands.pl b/data/bands.pl
index 643358f7027a894c7db39b4e49a49d951ca60f1e..534f4ec246efa544e1faa511084feab44c49eb83 100644 (file)
--- a/data/bands.pl
+++ b/data/bands.pl
@@ -36,8 +36,8 @@
                                                        ssb => [ 3601, 4000 ]  
                                                  }, 'Bands'),
 
-                 '60m' => bless( { band => [ 5258, 5407], 
-                               
+                 '60m' => bless( { band => [ 5258, 5410],
+                                                       ssb => [5300, 5410],
                                }, 'Bands' ),
 
                  '40m' => bless( { band => [ 7000, 7400 ], 

diff --git a/data/cty.dat b/data/cty.dat
index 72a6e891fabd6c047682ca99e7f3a8c606ebb718..2a0a1e48bf7b2f3e1ba8781acfb047bc2398cd20 100644 (file)
--- a/data/cty.dat
+++ b/data/cty.dat
@@ -256,8 +256,8 @@ Turkmenistan:             17:  30:  AS:   38.00:   -58.40:    -5.0:  EZ:
 France:                   14:  27:  EU:   48.80:    -2.30:    -1.0:  F:\r
     F,HW,HX,HY,TH,TM,TP,TQ,TV,TW,4U60UO;\r
 Guadeloupe:               08:  11:  NA:   16.00:    61.70:     4.0:  FG:\r
-    FG,TO1T,TO2ANT,TO2FG,TO2OOO,TO4T,TO5BG,TO5C,TO5G,TO5GI,TO5ROM,TO5S,TO6T,\r
-    TO7ACR,TO7AES,TO7DSR,TO7GAS,TO7T,TO8CW,TO8RR,TO9T;\r
+    FG,TO1T,TO1USB,TO2ANT,TO2FG,TO2OOO,TO4T,TO5BG,TO5C,TO5G,TO5GI,TO5ROM,TO5S,\r
+    TO6T,TO7ACR,TO7AES,TO7DSR,TO7GAS,TO7T,TO8CW,TO8RR,TO9T;\r
 Mayotte:                  39:  53:  AF:  -13.00:   -45.30:    -3.0:  FH:\r
     FH,TO8MZ,TX0P,TX5M,TX5NK,TX5T,TX6A;\r
 French St. Martin:        08:  11:  NA:   18.10:    63.10:     4.0:  FJ:\r
@@ -267,8 +267,8 @@ New Caledonia:            32:  56:  OC:  -22.30:  -166.50:   -11.0:  FK:
 Chesterfield Is.:         30:  56:  OC:  -19.90:  -158.30:   -11.0:  FK/c:\r
     TX0AT,TX0C,TX0DX,TX9;\r
 Martinique:               08:  11:  NA:   14.60:    61.00:     4.0:  FM:\r
-    FM,TO0O,TO0P,TO1A,TO2DX,TO3M,TO3W,TO4A,TO5A,TO5AA,TO5MM,TO5T,TO5X,TO6M,\r
-    TO7HAM,TO7X,TO8B,TO9A,TX4B;\r
+    FM,TO0O,TO0P,TO1A,TO1YR,TO2DX,TO3M,TO3W,TO4A,TO5A,TO5AA,TO5J,TO5MM,TO5T,\r
+    TO5X,TO6M,TO7HAM,TO7X,TO8B,TO9A,TX4B;\r
 French Polynesia:         32:  63:  OC:  -17.60:   149.50:    10.0:  FO:\r
     FO;\r
 Austral Is.:              32:  63:  OC:  -22.50:   152.00:    10.0:  FO/a:\r
@@ -300,8 +300,8 @@ French Guiana:            09:  12:  SA:    4.90:    52.30:     3.0:  FY:
 England:                  14:  27:  EU:   51.50:     0.10:     0.0:  G:\r
     2E,G,M;\r
 Isle of Man:              14:  27:  EU:   54.30:     4.50:     0.0:  GD:\r
-    2D,GD,GT,MD,MT,GB0MST,GB0WCY,GB100MER,GB100TT,GB125SR,GB2IOM,GB2WB,GB3GD,\r
-    GB4IOM,GB4WXM/P,GB50UN,GB5MOB,GB6SPC;\r
+    2D,GD,GT,MD,MT,GB0MST,GB0WCY,GB100MER,GB100TT,GB125SR,GB2IOM,GB2MAD,GB2WB,\r
+    GB3GD,GB4IOM,GB4MNH,GB4WXM/P,GB50UN,GB5MOB,GB6SPC;\r
 Northern Ireland:         14:  27:  EU:   54.60:     5.90:     0.0:  GI:\r
     2I,2N,GI,GN,MI,MN,GB0BTC,GB0BVC,GB0CI,GB0CSC,GB0DDF,GB0GPF,GB0MFD,GB0PSM,\r
     GB0REL,GB0SHC,GB0SIC,GB0SPD,GB0TCH,GB0WOA,GB1SPD,GB2IL,GB2LL,GB2MGY,\r
@@ -311,38 +311,38 @@ Jersey:                   14:  27:  EU:   49.30:     2.20:     0.0:  GJ:
     2H,2J,GH,GJ,MH,MJ,GB0CLR,GB0GUD,GB0JSA,GB0SHL,GB2BYL,GB2JSA,GB4BHF,\r
     GJ3DVC/L;\r
 Scotland:                 14:  27:  EU:   55.80:     4.30:     0.0:  GM:\r
-    2A,2M,2S,2T,GM,GS,MM,MS,GB0AC,GB0BNC,GB0DGL,GB0FFS,GB0FLA,GB0GDS,GB0GEI,\r
-    GB0GHD,GB0GKR,GB0GNE,GB0HHW,GB0KGS,GB0KTC,GB0LCS,GB0MLM,GB0NHL,GB0OS,\r
-    GB0OYT,GB0PPE,GB0QWM,GB0RBS,GB0SHP,GB0SK,GB0SKY,GB0SS,GB0SSF,GB100MAS,\r
-    GB125BRC,GB150NRL,GB1FVT,GB2AGG,GB2AST,GB2AYR,GB2CHG,GB2DHS,GB2ELH,GB2FBM,\r
-    GB2FIO,GB2FSM,GB2GNL,GB2GTM,GB2HI,GB2HRH,GB2HST,GB2HSW,GB2IAS,GB2IGB,\r
-    GB2IGS,GB2IOC,GB2IOG,GB2IOT,GB2JUNO,GB2KDS,GB2KHL,GB2LAY,GB2LBN,GB2LCL,\r
-    GB2LCP,GB2LGB,GB2LMG,GB2LNM,GB2LO,GB2LP,GB2LS,GB2LSS,GB2LT,GB2LTN,GB2MAS,\r
-    GB2MOD,GB2MOF,GB2MSL,GB2MUL,GB2NAG,GB2NBC,GB2NCL,GB2NEF,GB2NL,GB2NTS,\r
-    GB2OWM,GB2OYC,GB2PBF,GB2PS,GB2RB,GB2RRL,GB2SKG,GB2SLH,GB2SPD,GB2SSF,\r
-    GB2STB,GB2TDS,GB2TI,GB2WBB,GB3GM,GB400CA,GB4AAS,GB4CGW,GB4DAS,GB4GM,\r
-    GB4LNM,GB4NFE,GB4PMS,GB4RAF,GB4SLH,GB4TSR,GB4ZBS,GB50ATC,GB50SWL,GB5AST,\r
-    GB5CO,GB5FHC,GB5OL,GB5RO,GB5SI,GB5TI,GB60BBC,GB60CRB,GB60NTS,GB6MI,GB6SA,\r
-    GB6SM,GB6TAA,GB6WW,GB700BSB,GB75GD,GB75SCP,GB75STT,GB8AYR,GB8CA,GB8CF,\r
-    GB8CI,GB8CM,GB8CN,GB8CO,GB8CY,GB8FF,GB8OO,GB8RU,GB93AM,MM/DL6MHW;\r
-Shetlands:                14:  27:  EU:   60.40:     1.50:     0.0:  *GM/s:\r
-    GZ,MZ,2M1ANT,2M1ASQ,2M1ODL,GM0DJI,GM0EKM,GM0ILB,GM0MZD,GM0VFA,GM1CBQ,\r
-    GM1KKI,GM1ZNR,GM3KLA,GM3STU,GM3WCH,GM3WHT,GM3XPQ,GM3ZET,GM3ZNM,GM3ZXH,\r
-    GM4AGX,GM4CAQ,GM4DQD,GM4ENK,GM4FNA,GM4FNE,GM4GPP,GM4GQD,GM4GQM,GM4IPK,\r
-    GM4LBE,GM4LER,GM4PXG,GM4SRU,GM4SSA,GM4SWU,GM4WXQ,GM4ZHL,GM8LNH,GM8MMA,\r
-    GM8YEC,MM/DL1CW/P,MM/DL4BQE/P,MM/DL5BUT/P,MM/DM4VDE/P,MM0XAU;\r
+    2A,2M,2S,2T,GM,GS,MM,MS,GB0AC,GB0BNC,GB0BWT,GB0DGL,GB0FFS,GB0FLA,GB0GDS,\r
+    GB0GEI,GB0GHD,GB0GKR,GB0GNE,GB0HHW,GB0KGS,GB0KTC,GB0LCS,GB0MLM,GB0NHL,\r
+    GB0OS,GB0OYT,GB0PPE,GB0QWM,GB0RBS,GB0SHP,GB0SK,GB0SKY,GB0SS,GB0SSF,\r
+    GB100MAS,GB125BRC,GB150NRL,GB1EPC,GB1FVT,GB2AGG,GB2AST,GB2AYR,GB2CHG,\r
+    GB2DHS,GB2ELH,GB2FBM,GB2FIO,GB2FSM,GB2GNL,GB2GTM,GB2HI,GB2HRH,GB2HST,\r
+    GB2HSW,GB2IAS,GB2IGB,GB2IGS,GB2IOC,GB2IOG,GB2IOT,GB2JUNO,GB2KDS,GB2KHL,\r
+    GB2LAY,GB2LBN,GB2LCL,GB2LCP,GB2LGB,GB2LMG,GB2LNM,GB2LO,GB2LP,GB2LS,GB2LSS,\r
+    GB2LT,GB2LTN,GB2MAS,GB2MOD,GB2MOF,GB2MSL,GB2MUL,GB2NAG,GB2NBC,GB2NCL,\r
+    GB2NEF,GB2NL,GB2NTS,GB2OWM,GB2OYC,GB2PBF,GB2PS,GB2RB,GB2RRL,GB2SKG,GB2SLH,\r
+    GB2SPD,GB2SSF,GB2STB,GB2TDS,GB2TI,GB2WBB,GB3GM,GB400CA,GB4AAS,GB4CGW,\r
+    GB4DAS,GB4GM,GB4LNM,GB4NFE,GB4PMS,GB4RAF,GB4SLH,GB4TSR,GB4ZBS,GB50ATC,\r
+    GB50SWL,GB5AST,GB5BBS,GB5CO,GB5FHC,GB5OL,GB5RO,GB5SI,GB5TI,GB60BBC,\r
+    GB60CRB,GB60NTS,GB6MI,GB6SA,GB6SM,GB6TAA,GB6WW,GB700BSB,GB75GD,GB75SCP,\r
+    GB75STT,GB8AYR,GB8CA,GB8CF,GB8CI,GB8CM,GB8CN,GB8CO,GB8CY,GB8FF,GB8OO,\r
+    GB8RU,GB93AM,MM/DL6MHW;\r
+Shetland:                 14:  27:  EU:   60.40:     1.50:     0.0:  *GM/s:\r
+    GZ,MZ,2M0ZET,GB2ELH,GM0AVR,GM0CXQ,GM0CYJ,GM0DJI,GM0EKM,GM0ILB,GM0ULK,\r
+    GM1ZNR,GM3KLA,GM3WHT,GM3ZET,GM3ZNM,GM4GPP,GM4GQM,GM4IPK,GM4LBE,GM4LER,\r
+    GM4SLV,GM4SSA,GM4SWU,GM4WXQ,GM4ZHL,GM7AFE,GM7GWW,GM8LNH,GM8MMA,GM8YEC,\r
+    MM0LSM,MM0XAU,MM0ZAL,MM1FJM,MM3VQO,MM5PSL;\r
 Guernsey:                 14:  27:  EU:   49.50:     2.70:     0.0:  GU:\r
     2P,2U,GP,GU,MP,MU,GB0GUC,GB0JAG,GB0ON,GB2ECG,GB2GU,GB50LIB;\r
 Wales:                    14:  27:  EU:   51.50:     3.20:     0.0:  GW:\r
     2C,2W,2X,2Y,GC,GW,MC,MW,GB0CCE,GB0CLC,GB0CVA,GB0GCR,GB0GIW,GB0GLV,GB0HEL,\r
     GB0HMT,GB0ML,GB0MPA,GB0MWL,GB0NEW,GB0PSG,GB0RPO,GB0RSC,GB0SDD,GB0SH,\r
     GB0SOA,GB0SPS,GB0SRH,GB0TD,GB0TTT,GB0WRC,GB100BD,GB100FI,GB100LP,GB1CCC,\r
-    GB1LSG,GB1SSL,GB1TDS,GB2000SET,GB200HNT,GB2ANG,GB2CPC,GB2GGM,GB2GLS,\r
-    GB2GOL,GB2GSG,GB2GSS,GB2HDG,GB2IMD,GB2LNP,GB2LSA,GB2MIL,GB2MLM,GB2MOP,\r
-    GB2RFS,GB2RSC,GB2RTB,GB2SDD,GB2SIP,GB2TD,GB2TTA,GB2VK,GB2WDS,GB2WFF,\r
-    GB2WHO,GB2WSF,GB4BPL,GB4CI,GB4DPS,GB4HMD,GB4HMM,GB4LSG,GB4MD,GB4MDI,\r
-    GB4NDG,GB4SA,GB4SMM,GB4SNF,GB4XXX,GB5BS/J,GB5FI,GB5SIP,GB60VLY,GB6AR,\r
-    GB750CC,GB8OQE;\r
+    GB1LSG,GB1SSL,GB1TDS,GB2000SET,GB200A,GB200HNT,GB2ANG,GB2CPC,GB2GGM,\r
+    GB2GLS,GB2GOL,GB2GSG,GB2GSS,GB2HDG,GB2IMD,GB2LNP,GB2LSA,GB2MIL,GB2MLM,\r
+    GB2MOP,GB2RFS,GB2RSC,GB2RTB,GB2SDD,GB2SIP,GB2TD,GB2TTA,GB2VK,GB2WDS,\r
+    GB2WFF,GB2WHO,GB2WSF,GB4BPL,GB4CI,GB4DPS,GB4HMD,GB4HMM,GB4LSG,GB4MD,\r
+    GB4MDI,GB4NDG,GB4SA,GB4SMM,GB4SNF,GB4XXX,GB5BS/J,GB5FI,GB5SIP,GB60VLY,\r
+    GB6AR,GB750CC,GB8OQE;\r
 Solomon Islands:          28:  51:  OC:   -9.40:  -160.00:   -11.0:  H4:\r
     H4;\r
 Temotu:                   32:  51:  OC:  -10.70:  -165.80:   -11.0:  H40:\r
@@ -405,8 +405,9 @@ Japan:                    25:  45:  AS:   35.70:  -139.80:    -9.0:  JA:
     7J,7K,7L,7M,7N,8J,8K,8L,8M,8N,JA,JB,JC,JE,JF,JG,JH,JI,JJ,JK,JL,JM,JN,JO,\r
     JP,JQ,JR,JS;\r
 Minami Torishima:         27:  90:  OC:   24.30:  -154.00:   -10.0:  JD/m:\r
-    7J1ACH,JD1/JI7BCD,JD1BIE/JD1,JD1BIP,JD1BIU,JD1BIY,JD1BIZ,JD1BJA,JD1BJE,\r
-    JD1BME,JD1YAA,JD1YBJ,JG8NQJ/JD1,JL1KFR/JD1,JR6TYH/JD1;\r
+    7J1ACH,JA6GXK/JD1,JD1/JI7BCD,JD1BIE/JD1,JD1BIP,JD1BIU,JD1BIY,JD1BIZ,\r
+    JD1BJA,JD1BJE,JD1BME,JD1BMM,JD1YAA,JD1YBJ,JG8NQJ/JD1,JL1KFR/JD1,\r
+    JR6TYH/JD1;\r
 Ogasawara:                27:  45:  AS:   27.50:  -141.00:   -10.0:  JD/o:\r
     JD1;\r
 Mongolia:                 23:  32:  AS:   47.90:  -106.90:    -8.0:  JT:\r
@@ -438,35 +439,36 @@ United States:            05:  08:  NA:   43.00:    87.90:     5.0:  K:
     K8IA(3)[6],K8JQ(5),K8OQL(5),K8OSF(5),K8XS(5),K8YC(5),K9AW(5),K9ES(5),\r
     K9FY(5),K9HUY(5),K9JF(3)[6],K9OM(5),K9VV(5),KA2EYH(4),KA8Q(5),KB7Q(4)[6],\r
     KC3MR(4),KC7UP(4)[6],KD5M(5)[8],KD5MDO(4)[7],KE4MBP(4),KE4OAR(4),\r
-    KE7NO(4)[6],KH2D(5)[8],KH6DX(3)[6],KH6HHS(5)[8],KH6RW(3)[6],KI6DY(4)[7],\r
-    KK9A(5),KL1IF(4)[8],KL2A/7(3)[6],KL7FDQ(3)[6],KL7WP(3)[6],KL7XX(4)[8],\r
-    KM4FO(4),KM6JD(5)[8],KN4Q(4),KN4QS(4)[7],KN5H(3)[6],KN6RO(5)[8],KN8J(5),\r
-    KO7X(4)[7],KP2N(5)[8],KP4E(4)[8],KS7T(4)[6],KU1CW(4)[7],KU8E(5),KY1V(4),\r
-    KY4AA(4),KY4Z(4)[7],N0AX(3)[6],N1LN(4)[7],N1SZ(4)[7],N1WI(4),N1ZP(4),\r
-    N2BJ(4),N2BJL(5),N2IC(4)[7],N2LA(4)[7],N2NB(3)[6],N2WN(4),N3AIU(4)[7],\r
-    N3BB(4)[7],N3ZZ(3)[6],N4CVO(4),N4DD(4),N4DW(4),N4GK(4),N4GN(4),N4IR(4),\r
-    N4IRR(5),N4JF(4),N4KG(4),N4KZ(4),N4NO(4),N4OGW(4)[7],N4QS(4),N4SL(3)[6],\r
-    N4TN(4),N4TZ(4),N4UW(4),N4VV(4),N4XM(4),N4ZZ(4),N6AR(5)[8],N6MW(5)[8],\r
-    N6MWA(3)[6],N6RFM(5)[8],N6ZO(5)[8],N6ZZ(4)[7],N7DC(5)[8],N7DF(4)[7],\r
-    N7FLT(4)[6],N7IV(4)[7],N7NG(5)[8],N7VMR(4)[6],N8FF(5),N8II(5),N8NA(5),\r
-    N8PR(5),N8RA(5),N8WXQ(5),N9ADG(3)[6],NA4K(4),NA4M(4)[7],NA4MA(5)[8],\r
-    ND2T(3)[6],ND9M(5),NH7C(5)[8],NJ4I(4),NL7AU(5)[8],NL7CO(4)[7],NL7XM(5)[8],\r
-    NP3D(5)[8],NQ4U(4),NU4B(4),NU4BP(5),NW7MT(4)[6],NW8U(5),NX9T(5),NY4N(4),\r
-    NY6DX(5)[8],W0RLI(3)[6],W0UCE(5)[8],W0YK(3)[6],W0YR(5)[8],W0YRN(4)[7],\r
-    W0ZZ(3)[6],W0ZZQ(4)[7],W1DY(4)[7],W1DYH(5)[8],W1DYJ(5)[8],W1MVY(3)[6],\r
-    W1RH(3)[6],W1SRD(3)[6],W2OO(4),W2VJN(3)[6],W3CP(3)[6],W3HDH(4),W4BCG(4),\r
-    W4CID(4),W4DAN(4),W4DHE(4),W4DVG(4),W4EEH(4),W4EF(3)[6],W4FMS(4),W4GKM(4),\r
-    W4HZD(4),W4JSI(4),W4KW(4),W4LC(4),W4LIA(4),W4NBS(4),W4NI(4),W4NTI(4),\r
-    W4NZ(4),W4PA(4),W4RYW(4),W4TDB(4),W4TYU(4),W4YOK(4)[7],W5KI(5)[8],\r
-    W5REA(5)[8],W6AAN(5)[8],W6DSQ(4)[8],W6FC(5)[8],W6IHG(5)[8],W6JV(5)[8],\r
-    W6LFB(4)[7],W6NWS(5)[8],W6TER(4)[7],W6UB(4)[8],W6XR(5)[8],W6YJ(4)[7],\r
-    W7FG(4)[7],W7LPF(5)[8],W7LR(4)[6],W7LRD(3)[6],W7QF(5)[8],W7SE(4)[7],\r
-    W8AEF(3)[6],W8FJ(5),W8HGH(5),W8TN(5),W8WEJ(5),W8ZA(5),W9GE(5),W9GEN(4),\r
-    W9IGJ(5),W9MAK(3)[6],W9NGA(3)[6],WA0KDS(3)[6],WA1FCN(4),WA1MKE(4),\r
-    WA1UJU(4),WA2MNO(4)[7],WA4GLH(4),WA4JA(4),WA4OSD(4),WA5VGI(3)[6],WA8WV(5),\r
-    WB2ORD(4),WB4YDL(4),WB4ZBI(4),WB6BWZ(5)[8],WB8YQJ(3)[6],WB8YYY(5),WD4K(4),\r
-    WD4OHD(4),WG7Y(4)[7],WH0AI(4)[8],WH6ASW/M(3)[6],WJ9B(5),WL7K(3)[6],\r
-    WN4M(4),WO4O(4),WO5D(5)[8],WP4JBG(4)[8],WS4Y(4)[7],WT5L(5)[8],WX4TM(4);\r
+    KE7NO(4)[6],KH2D(5)[8],KH6DX(3)[6],KH6HHS(5)[8],KH6QAJ(3)[6],KH6RW(3)[6],\r
+    KI6DY(4)[7],KK9A(5),KL0LN(4)[8],KL1IF(4)[8],KL2A/7(3)[6],KL7FDQ(3)[6],\r
+    KL7WP(3)[6],KL7XX(4)[8],KM4FO(4),KM6JD(5)[8],KN4Q(4),KN4QS(4)[7],\r
+    KN5H(3)[6],KN6RO(5)[8],KN8J(5),KO7X(4)[7],KP2N(5)[8],KP4E(4)[8],\r
+    KS7T(4)[6],KU1CW(4)[7],KU8E(5),KY1V(4),KY4AA(4),KY4Z(4)[7],N0AX(3)[6],\r
+    N1LN(4)[7],N1SZ(4)[7],N1WI(4),N1ZP(4),N2BJ(4),N2BJL(5),N2IC(4)[7],\r
+    N2LA(4)[7],N2NB(3)[6],N2WN(4),N3AIU(4)[7],N3BB(4)[7],N3ZZ(3)[6],N4CVO(4),\r
+    N4DD(4),N4DW(4),N4GK(4),N4GN(4),N4IR(4),N4IRR(5),N4JF(4),N4KG(4),N4KZ(4),\r
+    N4NO(4),N4OGW(4)[7],N4QS(4),N4SL(3)[6],N4TN(4),N4TZ(4),N4UW(4),N4VV(4),\r
+    N4XM(4),N4ZZ(4),N6AR(5)[8],N6MW(5)[8],N6MWA(3)[6],N6RFM(5)[8],N6ZO(5)[8],\r
+    N6ZZ(4)[7],N7DC(5)[8],N7DF(4)[7],N7FLT(4)[6],N7IV(4)[7],N7NG(5)[8],\r
+    N7VMR(4)[6],N8FF(5),N8II(5),N8NA(5),N8PR(5),N8RA(5),N8WXQ(5),N9ADG(3)[6],\r
+    NA4K(4),NA4M(4)[7],NA4MA(5)[8],ND2T(3)[6],ND9M(5),NH7C(5)[8],NJ4I(4),\r
+    NL7AU(5)[8],NL7CO(4)[7],NL7XM(5)[8],NP3D(5)[8],NQ4U(4),NU4B(4),NU4BP(5),\r
+    NW7MT(4)[6],NW8U(5),NX9T(5),NY4N(4),NY6DX(5)[8],W0RLI(3)[6],W0UCE(5)[8],\r
+    W0YK(3)[6],W0YR(5)[8],W0YRN(4)[7],W0ZZ(3)[6],W0ZZQ(4)[7],W1DY(4)[7],\r
+    W1DYH(5)[8],W1DYJ(5)[8],W1MVY(3)[6],W1RH(3)[6],W1SRD(3)[6],W2OO(4),\r
+    W2VJN(3)[6],W3CP(3)[6],W3HDH(4),W4BCG(4),W4CID(4),W4DAN(4),W4DHE(4),\r
+    W4DVG(4),W4EEH(4),W4EF(3)[6],W4FMS(4),W4GKM(4),W4HZD(4),W4JSI(4),W4KW(4),\r
+    W4LC(4),W4LIA(4),W4NBS(4),W4NI(4),W4NTI(4),W4NZ(4),W4PA(4),W4RYW(4),\r
+    W4TDB(4),W4TYU(4),W4YOK(4)[7],W5KI(5)[8],W5REA(5)[8],W6AAN(5)[8],\r
+    W6DSQ(4)[8],W6FC(5)[8],W6IHG(5)[8],W6JV(5)[8],W6LFB(4)[7],W6NWS(5)[8],\r
+    W6TER(4)[7],W6UB(4)[8],W6XR(5)[8],W6YJ(4)[7],W7FG(4)[7],W7LPF(5)[8],\r
+    W7LR(4)[6],W7LRD(3)[6],W7QF(5)[8],W7SE(4)[7],W8AEF(3)[6],W8FJ(5),W8HGH(5),\r
+    W8TN(5),W8WEJ(5),W8ZA(5),W9GE(5),W9GEN(4),W9IGJ(5),W9MAK(3)[6],\r
+    W9NGA(3)[6],WA0KDS(3)[6],WA1FCN(4),WA1MKE(4),WA1UJU(4),WA2MNO(4)[7],\r
+    WA4GLH(4),WA4JA(4),WA4OSD(4),WA5VGI(3)[6],WA8WV(5),WB2ORD(4),WB4YDL(4),\r
+    WB4ZBI(4),WB6BWZ(5)[8],WB8YQJ(3)[6],WB8YYY(5),WD4K(4),WD4OHD(4),\r
+    WG7Y(4)[7],WH0AI(4)[8],WH6ASW/M(3)[6],WJ9B(5),WL7K(3)[6],WN4M(4),WO4O(4),\r
+    WO5D(5)[8],WP4JBG(4)[8],WS4Y(4)[7],WT5L(5)[8],WX4TM(4);\r
 Guantanamo Bay:           08:  11:  NA:   19.90:    75.20:     5.0:  KG4:\r
     KG4,KG44;\r
 Mariana Is.:              27:  64:  OC:   15.20:  -145.80:   -10.0:  KH0:\r
@@ -717,7 +719,7 @@ Asiatic Russia:           17:  30:  AS:   55.00:   -83.00:    -7.0:  UA9:
     UG9W(16),UH0,UH7,UH8,UH8T(18)[32],UH8V(18)[33],UH9,UH9I(18)[31],UH9M(17),\r
     UH9S(16),UH9T(16),UH9W(16),UI0,UI7,UI8,UI8T(18)[32],UI8V(18)[33],UI9,\r
     UI9I(18)[31],UI9M(17),UI9S(16),UI9T(16),UI9W(16),R270A,R270E,R375I,R3F/9,\r
-    R40WK,R9HQ(17)[30],UE105SBM(18)[32],UE15UWC(18)[32];\r
+    R40WK,R70PW,R9HQ(17)[30],UE105SBM(18)[32],UE15UWC(18)[32];\r
 Uzbekistan:               17:  30:  AS:   41.20:   -69.30:    -5.0:  UK:\r
     UJ,UK,UL,UM;\r
 Kazakhstan:               17:  30:  AS:   43.30:   -76.90:    -5.0:  UN:\r
@@ -764,12 +766,12 @@ Cocos-Keeling:            29:  54:  OC:  -12.20:   -96.80:    -6.5:  VK9C:
     AX9C,AX9Y,VH9C,VH9Y,VI9C,VI9Y,VJ9C,VJ9Y,VK9C,VK9FC,VK9KC,VK9KY,VK9Y,VL9C,\r
     VL9Y,VM9C,VM9Y,VN9C,VN9Y,VZ9C,VZ9Y,VK9AA;\r
 Lord Howe I.:             30:  60:  OC:  -31.60:  -159.10:   -10.5:  VK9L:\r
-    AX9L,VH9L,VI9L,VJ9L,VK9FL,VK9KL,VK9L,VL9L,VM9L,VN9L,VZ9L,VK9AE,VK9NM,\r
-    VK9PG,VK9YQS;\r
+    AX9L,VH9L,VI9L,VJ9L,VK9CL,VK9FL,VK9GL,VK9KL,VK9L,VL9L,VM9L,VN9L,VZ9L,\r
+    VK9AE,VK9NM,VK9PG,VK9YQS;\r
 Mellish Reef:             30:  56:  OC:  -17.60:  -155.80:   -10.0:  VK9M:\r
     AX9M,VH9M,VI9M,VJ9M,VK9FM,VK9KM,VK9M,VL9M,VM9M,VN9M,VZ9M;\r
 Norfolk I.:               32:  60:  OC:  -29.00:  -168.00:   -11.5:  VK9N:\r
-    AX9,VH9,VI9,VJ9,VK9,VL9,VM9,VN9,VZ9;\r
+    AX9,VH9,VI9,VJ9,VK9,VK9CN,VL9,VM9,VN9,VZ9;\r
 Willis I.:                30:  55:  OC:  -16.30:  -149.50:   -10.0:  VK9W:\r
     AX9W,VH9W,VI9W,VJ9W,VK9FW,VK9KW,VK9W,VL9W,VM9W,VN9W,VZ9W;\r
 Christmas I.:             29:  54:  OC:  -10.50:  -105.70:    -7.0:  VK9X:\r
@@ -785,7 +787,7 @@ Turks & Caicos:           08:  11:  NA:   21.80:    72.40:     5.0:  VP5:
 Pitcairn I.:              32:  63:  OC:  -25.10:   130.10:     8.5:  VP6:\r
     VP6;\r
 Ducie I.:                 32:  63:  OC:  -24.67:   124.79:     8.5:  VP6/d:\r
-    VP6DI;\r
+    VP6DI,VP6DX;\r
 Falkland Is.:             13:  16:  SA:  -51.70:    57.90:     4.0:  VP8:\r
     VP8;\r
 South Georgia:            13:  73:  SA:  -54.30:    36.80:     2.0:  VP8/g:\r

diff --git a/data/prefix_data.pl b/data/prefix_data.pl
index 2bd4c84ad0f63028d7505d8f0c420e0d97d7325b..de96a5fdeb94239c9b2e9c7a593c0abe16c314c0 100644 (file)
--- a/data/prefix_data.pl
+++ b/data/prefix_data.pl
@@ -14,9 +14,7 @@
   '2I' => '62',
   '2J' => '63',
   '2M' => '64',
-  '2M1ANT' => '351',
-  '2M1ASQ' => '351',
-  '2M1ODL' => '351',
+  '2M0ZET' => '351',
   '2N' => '62',
   '2P' => '65',
   '2S' => '64',
@@ -899,6 +897,7 @@
   'GB0BNC' => '64,351',
   'GB0BTC' => '62',
   'GB0BVC' => '62',
+  'GB0BWT' => '64,351',
   'GB0CCE' => '66',
   'GB0CI' => '62',
   'GB0CLC' => '66',
@@ -977,12 +976,14 @@
   'GB125SR' => '61',
   'GB150NRL' => '64,351',
   'GB1CCC' => '66',
+  'GB1EPC' => '64,351',
   'GB1FVT' => '64,351',
   'GB1LSG' => '66',
   'GB1SPD' => '62',
   'GB1SSL' => '66',
   'GB1TDS' => '66',
   'GB2000SET' => '66',
+  'GB200A' => '66',
   'GB200HNT' => '66',
   'GB2AGG' => '64,351',
   'GB2ANG' => '66',
@@ -1039,6 +1040,7 @@
   'GB2LSS' => '64,351',
   'GB2LT' => '64,351',
   'GB2LTN' => '64,351',
+  'GB2MAD' => '61',
   'GB2MAS' => '64,351',
   'GB2MGY' => '62',
   'GB2MIL' => '66',
@@ -1106,6 +1108,7 @@
   'GB4LSG' => '66',
   'GB4MD' => '66',
   'GB4MDI' => '66',
+  'GB4MNH' => '61',
   'GB4NDG' => '66',
   'GB4NFE' => '64,351',
   'GB4PMS' => '64,351',
@@ -1124,6 +1127,7 @@
   'GB50SWL' => '64,351',
   'GB50UN' => '61',
   'GB5AST' => '64,351',
+  'GB5BBS' => '64,351',
   'GB5BIG' => '62',
   'GB5BL' => '62',
   'GB5BS/J' => '66',
@@ -1175,40 +1179,30 @@
   'GJ3DVC/L' => '63',
   'GM' => '64,351',
   'GM/S' => '351',
+  'GM0AVR' => '351',
+  'GM0CXQ' => '351',
+  'GM0CYJ' => '351',
   'GM0DJI' => '351',
   'GM0EKM' => '351',
   'GM0ILB' => '351',
-  'GM0MZD' => '351',
-  'GM0VFA' => '351',
-  'GM1CBQ' => '351',
-  'GM1KKI' => '351',
+  'GM0ULK' => '351',
   'GM1ZNR' => '351',
   'GM3KLA' => '351',
-  'GM3STU' => '351',
-  'GM3WCH' => '351',
   'GM3WHT' => '351',
-  'GM3XPQ' => '351',
   'GM3ZET' => '351',
   'GM3ZNM' => '351',
-  'GM3ZXH' => '351',
-  'GM4AGX' => '351',
-  'GM4CAQ' => '351',
-  'GM4DQD' => '351',
-  'GM4ENK' => '351',
-  'GM4FNA' => '351',
-  'GM4FNE' => '351',
   'GM4GPP' => '351',
-  'GM4GQD' => '351',
   'GM4GQM' => '351',
   'GM4IPK' => '351',
   'GM4LBE' => '351',
   'GM4LER' => '351',
-  'GM4PXG' => '351',
-  'GM4SRU' => '351',
+  'GM4SLV' => '351',
   'GM4SSA' => '351',
   'GM4SWU' => '351',
   'GM4WXQ' => '351',
   'GM4ZHL' => '351',
+  'GM7AFE' => '351',
+  'GM7GWW' => '351',
   'GM8LNH' => '351',
   'GM8MMA' => '351',
   'GM8YEC' => '351',
@@ -1311,6 +1305,7 @@
   'JA' => '92,359,360,361,362',
   'JA3' => '359',
   'JA6' => '360',
+  'JA6GXK/JD1' => '93',
   'JA7' => '361',
   'JA8' => '362',
   'JB' => '92',
@@ -1328,6 +1323,7 @@
   'JD1BJA' => '93',
   'JD1BJE' => '93',
   'JD1BME' => '93',
+  'JD1BMM' => '93',
   'JD1YAA' => '93',
   'JD1YBJ' => '93',
   'JE' => '92',
@@ -1565,6 +1561,7 @@
   'KH6' => '107,387,388',
   'KH6DX' => '220',
   'KH6HHS' => '220',
+  'KH6QAJ' => '220',
   'KH6RW' => '220',
   'KH7' => '387,388',
   'KH7K' => '108',
@@ -1607,6 +1604,7 @@
   'KK9' => '475,476,509',
   'KK9A' => '220',
   'KL' => '392',
+  'KL0LN' => '220',
   'KL1IF' => '220',
   'KL2A/7' => '220',
   'KL7' => '112,389,390,391,392',
@@ -1993,12 +1991,13 @@
   'MI' => '62',
   'MJ' => '63',
   'MM' => '64',
-  'MM/DL1CW/P' => '351',
-  'MM/DL4BQE/P' => '351',
-  'MM/DL5BUT/P' => '351',
   'MM/DL6MHW' => '64,351',
-  'MM/DM4VDE/P' => '351',
+  'MM0LSM' => '351',
   'MM0XAU' => '351',
+  'MM0ZAL' => '351',
+  'MM1FJM' => '351',
+  'MM3VQO' => '351',
+  'MM5PSL' => '351',
   'MN' => '62',
   'MP' => '65',
   'MS' => '64',
@@ -2507,6 +2506,7 @@
   'R60A' => '175',
   'R60F' => '175',
   'R7' => '176,425,430',
+  'R70PW' => '176,425,430',
   'R750' => '175',
   'R7C' => '173,418,419,420,421',
   'R7C/1' => '173,418,419,420,421',
@@ -3025,6 +3025,8 @@
   'TO0P' => '46',
   'TO1A' => '46',
   'TO1T' => '43',
+  'TO1USB' => '43',
+  'TO1YR' => '46',
   'TO2ANT' => '43',
   'TO2DX' => '46',
   'TO2FG' => '43',
@@ -3043,6 +3045,7 @@
   'TO5D' => '54',
   'TO5G' => '43',
   'TO5GI' => '43',
+  'TO5J' => '46',
   'TO5MM' => '46',
   'TO5R' => '50,51,52,53',
   'TO5ROM' => '43',
@@ -3447,11 +3450,14 @@
   'VK9AA' => '195',
   'VK9AE' => '193',
   'VK9C' => '195',
+  'VK9CL' => '193',
+  'VK9CN' => '197',
   'VK9FC' => '195',
   'VK9FL' => '193',
   'VK9FM' => '196',
   'VK9FW' => '198',
   'VK9FX' => '194',
+  'VK9GL' => '193',
   'VK9KC' => '195',
   'VK9KL' => '193',
   'VK9KM' => '196',
@@ -3520,6 +3526,7 @@
   'VP6/D' => '331',
   'VP6D' => '331',
   'VP6DI' => '331',
+  'VP6DX' => '331',
   'VP8' => '205,206,207,208,228',
   'VP8/F' => '228',
   'VP8/G' => '205',

diff --git a/perl/Version.pm b/perl/Version.pm
index 726260065e08cc37644810c870f9822af1331fef..7a61dacd4d62c1c173d758d8e5a0a5c541f8ca9e 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,6 +11,6 @@ use vars qw($version $subversion $build);
 
 $version = '1.54';
 $subversion = '0';
-$build = '133';
+$build = '134';
 
 1;