Bump Locale-Codes from 3.21 to 3.22

31 files changed, 239 insertions, 282 deletions

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index b474a2ecbe..8f94e100d9 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1082,7 +1082,7 @@ use File::Glob qw(:case);
 
     'Locale-Codes' => {
         'MAINTAINER'   => 'sbeck',
-        'DISTRIBUTION' => 'SBECK/Locale-Codes-3.21.tar.gz',
+        'DISTRIBUTION' => 'SBECK/Locale-Codes-3.22.tar.gz',
         'FILES'        => q[cpan/Locale-Codes],
         'EXCLUDED'     => [
             qw( t/pod_coverage.t
diff --git a/cpan/Locale-Codes/lib/Locale/Codes.pm b/cpan/Locale-Codes/lib/Locale/Codes.pm
index c6a8257c37..9b5752e229 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes.pm
@@ -31,7 +31,7 @@ our($VERSION,%Data,%Retired);
 # $Retired{ TYPE }{ CODESET }{ code }{ CODE } = NAME
 #                            { name }{ NAME } = [CODE,NAME]  (the key is lowercase)
 
-$VERSION='3.21';
+$VERSION='3.22';
 
 #=======================================================================
 #
@@ -687,79 +687,6 @@ sub _delete_code_alias {
    return 1;
 }
 
-#=======================================================================
-#
-# alias_code ( ALIAS => CODE [ , CODESET ] )
-#
-# Add an alias for an existing code. If the CODESET isn't specified,
-# then we use the default (currently the alpha-2 codeset).
-#
-#   Locale::Country::alias_code('uk' => 'gb');
-#
-#=======================================================================
-
-# sub alias_code {
-#    my $nowarn   = 0;
-#    $nowarn      = 1, pop  if ($_[$#_] eq "nowarn");
-#    my $alias    = shift;
-#    my $code     = shift;
-#    my $codeset  = @_ > 0 ? shift : LOCALE_CODE_DEFAULT;
-
-#    return 0  if ($codeset !~ /^\d+$/);
-
-#    if      ($codeset == LOCALE_CODE_ALPHA_2) {
-#       $codeset = "alpha2";
-#       $alias   = lc($alias);
-#    } elsif ($codeset == LOCALE_CODE_ALPHA_3) {
-#       $codeset = "alpha3";
-#       $alias   = lc($alias);
-#    } elsif ($codeset == LOCALE_CODE_FIPS) {
-#       $codeset = "fips";
-#       $alias   = uc($alias);
-#    } elsif ($codeset == LOCALE_CODE_NUMERIC) {
-#       $codeset = "num";
-#       return undef if ($alias =~ /\D/);
-#       $alias   = sprintf("%.3d", $alias);
-#    } else {
-#       carp "rename_country(): unknown codeset\n"  unless ($nowarn);
-#       return 0;
-#    }
-
-#    # Check that $code exists in the codeset.
-
-#    my ($id,$i);
-#    if (exists $Data{$type}{'code2id'}{$codeset}{$code}) {
-#       ($id,$i) = @{ $Data{$type}{'code2id'}{$codeset}{$code} };
-#    } else {
-#       carp "alias_code: attempt to alias \"$alias\" to unknown country code \"$code\"\n"
-#       unless ($nowarn);
-#       return 0;
-#    }
-
-#    # Cases:
-#    #   The alias already exists.
-#    #      Error
-#    #
-#    #   It's new
-#    #      Create a new entry in Code2CountryID
-#    #      Replace the entiry in CountryID2Code
-#    #      Regenerate %Codes
-
-#    if (exists $Data{$type}{'code2id'}{$codeset}{$alias}) {
-#       carp "alias_code: attempt to alias \"$alias\" which is already in use\n"
-#       unless ($nowarn);
-#       return 0;
-#    }
-
-#    $Data{$type}{'code2id'}{$codeset}{$alias} = [ $id, $i ];
-#    $Data{$type}{'id2names'}ID2Code{$codeset}{$id} = $alias;
-
-#    my @codes = keys %{ $Data{$type}{'code2id'}{$codeset} };
-#    $Locale::CountryCodes::Codes{$codeset} = [ sort @codes ];
-
-#    return $alias;
-# }
-
 1;
 # Local Variables:
 # mode: cperl
diff --git a/cpan/Locale-Codes/lib/Locale/Codes.pod b/cpan/Locale-Codes/lib/Locale/Codes.pod
index df10c849a1..28bdc53089 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes.pod
+++ b/cpan/Locale-Codes/lib/Locale/Codes.pod
@@ -244,6 +244,18 @@ Codes for identification of scripts.
 
 Codes for identification of currencies and funds.
 
+=item B<Locale::Codes::LangExt>
+
+Codes for identification of language extensions.
+
+=item B<Locale::Codes::LangVar>
+
+Codes for identification of language variations.
+
+=item B<Locale::Codes::LangFam>
+
+Codes for identification of language families.
+
 =item B<Locale::Codes::Changes>
 
 A history of changes made to this distribution.
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/API.pod b/cpan/Locale-Codes/lib/Locale/Codes/API.pod
index 1a566d2b15..42b1cd2463 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/API.pod
+++ b/cpan/Locale-Codes/lib/Locale/Codes/API.pod
@@ -278,7 +278,7 @@ delete the alias.
 
 =over 4
 
-=item B<*>
+=item B<Relationship between code sets>
 
 Because each code set uses a slightly different list of elements, and
 they are not necessarily one-to-one, there may be some confusion
@@ -291,7 +291,7 @@ to different islands (Baker Island, Howland Island, etc.).
 This may cause some confusion... I've done the best that I could do
 to minimize it.
 
-=item B<*>
+=item B<Non-ASCII characters not supported>
 
 Currently all names must be all ASCII. I plan on relaxing that
 limitation in the future.
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Changes.pod b/cpan/Locale-Codes/lib/Locale/Codes/Changes.pod
index 88e91c7848..b7a2ed1e80 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/Changes.pod
+++ b/cpan/Locale-Codes/lib/Locale/Codes/Changes.pod
@@ -22,7 +22,13 @@ September, December). I will also check on request, so if a code
 changes that you use, feel free to contact me.  Any time there are new
 codes, I will add them to the module and release a new version.
 
-=head1 VERSION 3.22  (yyyy-mm-dd; sbeck)
+=head1 VERSION 3.24  (planned 2012-12-01; sbeck)
+
+=head1 VERSION 3.23  (planned 2012-09-01; sbeck)
+
+=head1 VERSION 3.22  (2012-06-01; sbeck)
+
+NEW CODE(s)
 
 =head1 VERSION 3.21  (2012-03-01; sbeck)
 
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Constants.pm b/cpan/Locale-Codes/lib/Locale/Codes/Constants.pm
index 64b96edde7..b0e655a00c 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/Constants.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/Constants.pm
@@ -17,7 +17,7 @@ require Exporter;
 our($VERSION,@ISA,@EXPORT);
 our(%ALL_CODESETS);
 
-$VERSION='3.21';
+$VERSION='3.22';
 @ISA     = qw(Exporter);
 @EXPORT  = qw(LOCALE_CODE_ALPHA_2
               LOCALE_CODE_ALPHA_3
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Country.pm b/cpan/Locale-Codes/lib/Locale/Codes/Country.pm
index 4e0056fa4d..cb7a1a5130 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/Country.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/Country.pm
@@ -22,7 +22,7 @@ use Locale::Codes::Country_Retired;
 
 our($VERSION,@ISA,@EXPORT,@EXPORT_OK);
 
-$VERSION='3.21';
+$VERSION='3.22';
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2country
                 country2code
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Country_Codes.pm b/cpan/Locale-Codes/lib/Locale/Codes/Country_Codes.pm
index 8f172c9a12..aba08f193e 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/Country_Codes.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/Country_Codes.pm
@@ -2,7 +2,7 @@ package Locale::Codes::Country_Codes;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'get_codes' is run.
-#    Generated on: Thu Mar  1 08:06:53 EST 2012
+#    Generated on: Wed May 30 10:13:48 EDT 2012
 
 =pod
 
@@ -34,10 +34,11 @@ modify it under the same terms as Perl itself.
 
 use strict;
 use warnings;
+use utf8;
 require 5.002;
 
 our($VERSION);
-$VERSION='3.21';
+$VERSION='3.22';
 
 $Locale::Codes::Data{'country'}{'id'} = '0282';
 
@@ -5374,7 +5375,7 @@ $Locale::Codes::Data{'country'}{'code2id'} = {
          ],
       q(BO) => [
          q(0027),
-         q(2),
+         q(0),
          ],
       q(BQ) => [
          q(0278),
@@ -6058,7 +6059,7 @@ $Locale::Codes::Data{'country'}{'code2id'} = {
          ],
       q(SH) => [
          q(0186),
-         q(1),
+         q(0),
          ],
       q(SI) => [
          q(0203),
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Country_Retired.pm b/cpan/Locale-Codes/lib/Locale/Codes/Country_Retired.pm
index 55f49e1353..6a21675291 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/Country_Retired.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/Country_Retired.pm
@@ -2,7 +2,7 @@ package Locale::Codes::Country_Retired;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'deprecate_codes' is run.
-#    Generated on: Thu Mar  1 08:11:47 EST 2012
+#    Generated on: Wed May 30 10:22:19 EDT 2012
 
 =pod
 
@@ -34,10 +34,11 @@ modify it under the same terms as Perl itself.
 
 use strict;
 use warnings;
+use utf8;
 require 5.002;
 
 our($VERSION);
-$VERSION='3.21';
+$VERSION='3.22';
 
 $Locale::Codes::Retired{'country'}{'dom'}{'code'} = {
    q(FX) => q(France, Metropolitan),
@@ -47,33 +48,33 @@ $Locale::Codes::Retired{'country'}{'dom'}{'code'} = {
 $Locale::Codes::Retired{'country'}{'alpha-2'}{'code'} = {
    q(zr) => q(Zaire),
    q(yu) => q(Yugoslavia),
-   q(tp) => q(East Timor),
-   q(cs) => q(Serbia and Montenegro),
    q(fx) => q(France, Metropolitan),
+   q(cs) => q(Serbia and Montenegro),
+   q(tp) => q(East Timor),
    q(an) => q(Netherlands Antilles),
 };
 
 $Locale::Codes::Retired{'country'}{'numeric'}{'code'} = {
-   q(074) => q(Bouvet Island),
    q(334) => q(Heard Island and Mcdonald Islands),
+   q(074) => q(Bouvet Island),
    q(010) => q(Antarctica),
-   q(239) => q(South Georgia and the Islands),
    q(086) => q(British Indian Ocean Territory),
+   q(239) => q(South Georgia and the Islands),
    q(249) => q(France, Metropolitan),
    q(581) => q(United States Minor Outlying Islands),
    q(158) => q(Taiwan),
    q(166) => q(Cocos (Keeling) Islands),
-   q(891) => q(Serbia and Montenegro),
-   q(162) => q(Christmas Island),
    q(530) => q(Netherlands Antilles),
+   q(162) => q(Christmas Island),
+   q(891) => q(Serbia and Montenegro),
    q(736) => q(Sudan),
    q(260) => q(French Southern and Antarctic Lands),
 };
 
 $Locale::Codes::Retired{'country'}{'alpha-3'}{'code'} = {
    q(tmp) => q(East Timor),
-   q(sgs) => q(South Georgia and the Islands),
    q(ant) => q(Netherlands Antilles),
+   q(sgs) => q(South Georgia and the Islands),
    q(umi) => q(United States Minor Outlying Islands),
    q(cxr) => q(Christmas Island),
    q(rom) => q(Romania),
@@ -93,9 +94,9 @@ $Locale::Codes::Retired{'country'}{'alpha-3'}{'code'} = {
 $Locale::Codes::Retired{'country'}{'fips-10'}{'code'} = {
    q(RN) => q(Saint Martin),
    q(UC) => q(Curacao),
-   q(RI) => q(Serbia),
-   q(MJ) => q(Montenegro),
    q(KV) => q(Kosovo),
+   q(MJ) => q(Montenegro),
+   q(RI) => q(Serbia),
    q(TB) => q(Saint Barthelemy),
    q(NN) => q(Sint Maarten),
 };
@@ -103,8 +104,8 @@ $Locale::Codes::Retired{'country'}{'fips-10'}{'code'} = {
 $Locale::Codes::Retired{'country'}{'dom'}{'name'} = {
    q(libyan arab jamahiriya) => [ q(LY), q(Libyan Arab Jamahiriya) ],
    q(taiwan) => [ q(TW), q(Taiwan) ],
-   q(yugoslavia ) => [ q(YU), q(Yugoslavia ) ],
    q(soviet union ) => [ q(SU), q(Soviet Union ) ],
+   q(yugoslavia ) => [ q(YU), q(Yugoslavia ) ],
    q(france, metropolitan) => [ q(FX), q(France, Metropolitan) ],
    q(bonaire, saint eustatius and saba) => [ q(BQ), q(Bonaire, Saint Eustatius and Saba) ],
    q(saint helena, ascension and tristan da cunha) => [ q(SH), q(Saint Helena, Ascension and Tristan da Cunha) ],
@@ -114,27 +115,27 @@ $Locale::Codes::Retired{'country'}{'dom'}{'name'} = {
 
 $Locale::Codes::Retired{'country'}{'alpha-2'}{'name'} = {
    q(netherlands antilles) => [ q(an), q(Netherlands Antilles) ],
-   q(east timor) => [ q(tl), q(East Timor) ],
-   q(virgin islands (u.s.)) => [ q(vi), q(Virgin Islands (U.S.)) ],
    q(libyan arab jamahiriya) => [ q(ly), q(Libyan Arab Jamahiriya) ],
+   q(virgin islands (u.s.)) => [ q(vi), q(Virgin Islands (U.S.)) ],
+   q(east timor) => [ q(tl), q(East Timor) ],
    q(venezuela) => [ q(ve), q(Venezuela) ],
    q(kazakstan) => [ q(kz), q(Kazakstan) ],
    q(micronesia (federated states of)) => [ q(fm), q(Micronesia (Federated States of)) ],
-   q(france, metropolitan) => [ q(fx), q(France, Metropolitan) ],
-   q(bosnia and herzegowina) => [ q(ba), q(Bosnia and Herzegowina) ],
    q(svalbard and jan mayen islands) => [ q(sj), q(Svalbard and Jan Mayen Islands) ],
-   q(heard and mc donald islands) => [ q(hm), q(Heard and Mc Donald Islands) ],
-   q(wallis and futuna islands) => [ q(wf), q(Wallis and Futuna Islands) ],
+   q(bosnia and herzegowina) => [ q(ba), q(Bosnia and Herzegowina) ],
+   q(france, metropolitan) => [ q(fx), q(France, Metropolitan) ],
    q(yugoslavia) => [ q(yu), q(Yugoslavia) ],
+   q(wallis and futuna islands) => [ q(wf), q(Wallis and Futuna Islands) ],
+   q(heard and mc donald islands) => [ q(hm), q(Heard and Mc Donald Islands) ],
    q(st. pierre and miquelon) => [ q(pm), q(St. Pierre and Miquelon) ],
    q(zaire) => [ q(zr), q(Zaire) ],
    q(virgin islands (british)) => [ q(vg), q(Virgin Islands (British)) ],
    q(serbia and montenegro) => [ q(cs), q(Serbia and Montenegro) ],
    q(vatican city state (holy see)) => [ q(va), q(Vatican City State (Holy See)) ],
-   q(macau) => [ q(mo), q(Macau) ],
    q(st. helena) => [ q(sh), q(St. Helena) ],
-   q(vietnam) => [ q(vn), q(Vietnam) ],
+   q(macau) => [ q(mo), q(Macau) ],
    q(bolivia) => [ q(bo), q(Bolivia) ],
+   q(vietnam) => [ q(vn), q(Vietnam) ],
    q(saint helena) => [ q(sh), q(Saint Helena) ],
    q(saint martin) => [ q(mf), q(Saint Martin) ],
    q(iran (islamic republic of)) => [ q(ir), q(Iran (Islamic Republic of)) ],
@@ -142,27 +143,27 @@ $Locale::Codes::Retired{'country'}{'alpha-2'}{'name'} = {
 
 $Locale::Codes::Retired{'country'}{'numeric'}{'name'} = {
    q(netherlands antilles) => [ q(530), q(Netherlands Antilles) ],
-   q(united kingdom) => [ q(826), q(United Kingdom) ],
-   q(east timor) => [ q(626), q(East Timor) ],
    q(libyan arab jamahiriya) => [ q(434), q(Libyan Arab Jamahiriya) ],
-   q(antarctica) => [ q(010), q(Antarctica) ],
-   q(taiwan) => [ q(158), q(Taiwan) ],
+   q(east timor) => [ q(626), q(East Timor) ],
+   q(united kingdom) => [ q(826), q(United Kingdom) ],
    q(venezuela) => [ q(862), q(Venezuela) ],
+   q(taiwan) => [ q(158), q(Taiwan) ],
+   q(antarctica) => [ q(010), q(Antarctica) ],
    q(taiwan, province of china) => [ q(158), q(Taiwan, Province of China) ],
    q(south georgia and the south sandwich islands) => [ q(239), q(South Georgia and the South Sandwich Islands) ],
-   q(korea, democratic people's republic of) => [ q(408), q(Korea, Democratic People's Republic of) ],
    q(christmas island) => [ q(162), q(Christmas Island) ],
+   q(korea, democratic people's republic of) => [ q(408), q(Korea, Democratic People's Republic of) ],
    q(heard island and mcdonald islands) => [ q(334), q(Heard Island and Mcdonald Islands) ],
    q(yugoslavia) => [ q(891), q(Yugoslavia) ],
-   q(cocos (keeling) islands) => [ q(166), q(Cocos (Keeling) Islands) ],
    q(hong kong special administrative region of china) => [ q(344), q(Hong Kong Special Administrative Region of China) ],
-   q(british indian ocean territory) => [ q(086), q(British Indian Ocean Territory) ],
-   q(virgin islands, british) => [ q(092), q(Virgin Islands, British) ],
+   q(cocos (keeling) islands) => [ q(166), q(Cocos (Keeling) Islands) ],
    q(french southern territories) => [ q(260), q(French Southern Territories) ],
+   q(virgin islands, british) => [ q(092), q(Virgin Islands, British) ],
+   q(british indian ocean territory) => [ q(086), q(British Indian Ocean Territory) ],
    q(faroe islands) => [ q(234), q(Faroe Islands) ],
    q(zaire) => [ q(180), q(Zaire) ],
-   q(united states minor outlying islands) => [ q(581), q(United States Minor Outlying Islands) ],
    q(congo, the democratic republic of the) => [ q(180), q(Congo, The Democratic Republic of the) ],
+   q(united states minor outlying islands) => [ q(581), q(United States Minor Outlying Islands) ],
    q(iran, islamic republic of) => [ q(364), q(Iran, Islamic Republic of) ],
    q(serbia and montenegro) => [ q(891), q(Serbia and Montenegro) ],
    q(macedonia, the former yugoslav republic of) => [ q(807), q(Macedonia, the Former Yugoslav Republic of) ],
@@ -177,13 +178,13 @@ $Locale::Codes::Retired{'country'}{'numeric'}{'name'} = {
    q(tanzania, united republic of) => [ q(834), q(Tanzania, United Republic of) ],
    q(bouvet island) => [ q(074), q(Bouvet Island) ],
    q(holy see (vatican city state)) => [ q(336), q(Holy See (Vatican City State)) ],
-   q(micronesia, federated states of) => [ q(583), q(Micronesia, Federated States of) ],
    q(moldova, republic of) => [ q(498), q(Moldova, Republic of) ],
-   q(virgin islands, u.s.) => [ q(850), q(Virgin Islands, U.S.) ],
+   q(micronesia, federated states of) => [ q(583), q(Micronesia, Federated States of) ],
    q(united states) => [ q(840), q(United States) ],
+   q(virgin islands, u.s.) => [ q(850), q(Virgin Islands, U.S.) ],
    q(korea, republic of) => [ q(410), q(Korea, Republic of) ],
-   q(vietnam) => [ q(704), q(Vietnam) ],
    q(bolivia) => [ q(068), q(Bolivia) ],
+   q(vietnam) => [ q(704), q(Vietnam) ],
    q(south georgia and the islands) => [ q(239), q(South Georgia and the Islands) ],
    q(svalbard and jan mayen) => [ q(744), q(Svalbard and Jan Mayen) ],
    q(wallis and futuna) => [ q(876), q(Wallis and Futuna) ],
@@ -191,27 +192,27 @@ $Locale::Codes::Retired{'country'}{'numeric'}{'name'} = {
 
 $Locale::Codes::Retired{'country'}{'alpha-3'}{'name'} = {
    q(netherlands antilles) => [ q(ant), q(Netherlands Antilles) ],
-   q(united kingdom) => [ q(gbr), q(United Kingdom) ],
-   q(east timor) => [ q(tls), q(East Timor) ],
    q(libyan arab jamahiriya) => [ q(lby), q(Libyan Arab Jamahiriya) ],
-   q(antarctica) => [ q(ata), q(Antarctica) ],
-   q(taiwan) => [ q(twn), q(Taiwan) ],
+   q(east timor) => [ q(tls), q(East Timor) ],
+   q(united kingdom) => [ q(gbr), q(United Kingdom) ],
    q(venezuela) => [ q(ven), q(Venezuela) ],
+   q(taiwan) => [ q(twn), q(Taiwan) ],
+   q(antarctica) => [ q(ata), q(Antarctica) ],
    q(taiwan, province of china) => [ q(twn), q(Taiwan, Province of China) ],
    q(south georgia and the south sandwich islands) => [ q(sgs), q(South Georgia and the South Sandwich Islands) ],
-   q(korea, democratic people's republic of) => [ q(prk), q(Korea, Democratic People's Republic of) ],
    q(christmas island) => [ q(cxr), q(Christmas Island) ],
+   q(korea, democratic people's republic of) => [ q(prk), q(Korea, Democratic People's Republic of) ],
    q(heard island and mcdonald islands) => [ q(hmd), q(Heard Island and Mcdonald Islands) ],
    q(yugoslavia) => [ q(yug), q(Yugoslavia) ],
-   q(cocos (keeling) islands) => [ q(cck), q(Cocos (Keeling) Islands) ],
    q(hong kong special administrative region of china) => [ q(hkg), q(Hong Kong Special Administrative Region of China) ],
-   q(british indian ocean territory) => [ q(iot), q(British Indian Ocean Territory) ],
-   q(virgin islands, british) => [ q(vgb), q(Virgin Islands, British) ],
+   q(cocos (keeling) islands) => [ q(cck), q(Cocos (Keeling) Islands) ],
    q(french southern territories) => [ q(atf), q(French Southern Territories) ],
+   q(virgin islands, british) => [ q(vgb), q(Virgin Islands, British) ],
+   q(british indian ocean territory) => [ q(iot), q(British Indian Ocean Territory) ],
    q(faroe islands) => [ q(fro), q(Faroe Islands) ],
    q(zaire) => [ q(zar), q(Zaire) ],
-   q(united states minor outlying islands) => [ q(umi), q(United States Minor Outlying Islands) ],
    q(congo, the democratic republic of the) => [ q(cod), q(Congo, The Democratic Republic of the) ],
+   q(united states minor outlying islands) => [ q(umi), q(United States Minor Outlying Islands) ],
    q(iran, islamic republic of) => [ q(irn), q(Iran, Islamic Republic of) ],
    q(serbia and montenegro) => [ q(scg), q(Serbia and Montenegro) ],
    q(macedonia, the former yugoslav republic of) => [ q(mkd), q(Macedonia, the Former Yugoslav Republic of) ],
@@ -226,13 +227,13 @@ $Locale::Codes::Retired{'country'}{'alpha-3'}{'name'} = {
    q(tanzania, united republic of) => [ q(tza), q(Tanzania, United Republic of) ],
    q(bouvet island) => [ q(bvt), q(Bouvet Island) ],
    q(holy see (vatican city state)) => [ q(vat), q(Holy See (Vatican City State)) ],
-   q(micronesia, federated states of) => [ q(fsm), q(Micronesia, Federated States of) ],
    q(moldova, republic of) => [ q(mda), q(Moldova, Republic of) ],
-   q(virgin islands, u.s.) => [ q(vir), q(Virgin Islands, U.S.) ],
+   q(micronesia, federated states of) => [ q(fsm), q(Micronesia, Federated States of) ],
    q(united states) => [ q(usa), q(United States) ],
+   q(virgin islands, u.s.) => [ q(vir), q(Virgin Islands, U.S.) ],
    q(korea, republic of) => [ q(kor), q(Korea, Republic of) ],
-   q(vietnam) => [ q(vnm), q(Vietnam) ],
    q(bolivia) => [ q(bol), q(Bolivia) ],
+   q(vietnam) => [ q(vnm), q(Vietnam) ],
    q(south georgia and the islands) => [ q(sgs), q(South Georgia and the Islands) ],
    q(svalbard and jan mayen) => [ q(sjm), q(Svalbard and Jan Mayen) ],
    q(wallis and futuna) => [ q(wlf), q(Wallis and Futuna) ],
@@ -240,17 +241,17 @@ $Locale::Codes::Retired{'country'}{'alpha-3'}{'name'} = {
 
 $Locale::Codes::Retired{'country'}{'fips-10'}{'name'} = {
    q(islamic state of afghanistan) => [ q(AF), q(Islamic State of Afghanistan) ],
-   q(department of guiana) => [ q(FG), q(Department of Guiana) ],
    q(territorial collectivity of saint pierre and miquelon) => [ q(SB), q(Territorial Collectivity of Saint Pierre and Miquelon) ],
+   q(department of guiana) => [ q(FG), q(Department of Guiana) ],
    q(union of burma) => [ q(BM), q(Union of Burma) ],
    q(republic of iceland) => [ q(IC), q(Republic of Iceland) ],
    q(republic of cote d'ivoire) => [ q(IV), q(Republic of Cote D'Ivoire) ],
-   q(arab republic of egypt) => [ q(EG), q(Arab Republic of Egypt) ],
    q(federal democratic republic of ethiopia) => [ q(ET), q(Federal Democratic Republic of Ethiopia) ],
+   q(arab republic of egypt) => [ q(EG), q(Arab Republic of Egypt) ],
    q(republic of tajikistan) => [ q(TI), q(Republic of Tajikistan) ],
    q(kingdom of bhutan) => [ q(BT), q(Kingdom of Bhutan) ],
-   q(republic of guatemala) => [ q(GT), q(Republic of Guatemala) ],
    q(republic of el salvador) => [ q(ES), q(Republic of El Salvador) ],
+   q(republic of guatemala) => [ q(GT), q(Republic of Guatemala) ],
    q(republic of niger) => [ q(NG), q(Republic of Niger) ],
    q(republic of guinea-bissau) => [ q(PU), q(Republic of Guinea-Bissau) ],
    q(republic of indonesia) => [ q(ID), q(Republic of Indonesia) ],
@@ -276,17 +277,17 @@ $Locale::Codes::Retired{'country'}{'fips-10'}{'name'} = {
    q(republic of djibouti) => [ q(DJ), q(Republic of Djibouti) ],
    q(republic of haiti) => [ q(HA), q(Republic of Haiti) ],
    q(republic of the gambia) => [ q(GA), q(Republic of the Gambia) ],
-   q(state of israel) => [ q(IS), q(State of Israel) ],
    q(islamic republic of mauritania) => [ q(MR), q(Islamic Republic of Mauritania) ],
+   q(state of israel) => [ q(IS), q(State of Israel) ],
    q(united mexican states) => [ q(MX), q(United Mexican States) ],
    q(territory of cocos (keeling) islands) => [ q(CK), q(Territory of Cocos (Keeling) Islands) ],
-   q(republic of malawi) => [ q(MI), q(Republic of Malawi) ],
    q(kingdom of tonga) => [ q(TN), q(Kingdom of Tonga) ],
+   q(republic of malawi) => [ q(MI), q(Republic of Malawi) ],
    q(togolese republic) => [ q(TO), q(Togolese Republic) ],
    q(bolivarian republic of venezuela) => [ q(VE), q(Bolivarian Republic of Venezuela) ],
-   q(republic of albania) => [ q(AL), q(Republic of Albania) ],
-   q(republic of hungary) => [ q(HU), q(Republic of Hungary) ],
    q(republic of namibia) => [ q(WA), q(Republic of Namibia) ],
+   q(republic of hungary) => [ q(HU), q(Republic of Hungary) ],
+   q(republic of albania) => [ q(AL), q(Republic of Albania) ],
    q(commonwealth of puerto rico) => [ q(RQ), q(Commonwealth of Puerto Rico) ],
    q(principality of monaco) => [ q(MN), q(Principality of Monaco) ],
    q(socialist republic of vietnam) => [ q(VM), q(Socialist Republic of Vietnam) ],
@@ -303,27 +304,27 @@ $Locale::Codes::Retired{'country'}{'fips-10'}{'name'} = {
    q(republic of lithuania) => [ q(LH), q(Republic of Lithuania) ],
    q(republic of cape verde) => [ q(CV), q(Republic of Cape Verde) ],
    q(portuguese republic) => [ q(PO), q(Portuguese Republic) ],
-   q(republic of senegal) => [ q(SG), q(Republic of Senegal) ],
    q(principality of andorra) => [ q(AN), q(Principality of Andorra) ],
-   q(great socialist people's libyan arab jamahiriya) => [ q(LY), q(Great Socialist People's Libyan Arab Jamahiriya) ],
-   q(republic of mozambique) => [ q(MZ), q(Republic of Mozambique) ],
-   q(territory of guam) => [ q(GQ), q(Territory of Guam) ],
+   q(republic of senegal) => [ q(SG), q(Republic of Senegal) ],
    q(republic of austria) => [ q(AU), q(Republic of Austria) ],
+   q(territory of guam) => [ q(GQ), q(Territory of Guam) ],
+   q(republic of mozambique) => [ q(MZ), q(Republic of Mozambique) ],
+   q(great socialist people's libyan arab jamahiriya) => [ q(LY), q(Great Socialist People's Libyan Arab Jamahiriya) ],
    q(republic of botswana) => [ q(BC), q(Republic of Botswana) ],
-   q(territory of heard island and mcdonald islands) => [ q(HM), q(Territory of Heard Island and McDonald Islands) ],
    q(republic of bolivia) => [ q(BL), q(Republic of Bolivia) ],
+   q(territory of heard island and mcdonald islands) => [ q(HM), q(Territory of Heard Island and McDonald Islands) ],
    q(republic of kazakhstan) => [ q(KZ), q(Republic of Kazakhstan) ],
    q(department of martinique) => [ q(MB), q(Department of Martinique) ],
    q(oriental republic of uruguay) => [ q(UY), q(Oriental Republic of Uruguay) ],
    q(republic of costa rica) => [ q(CS), q(Republic of Costa Rica) ],
    q(state of eritrea) => [ q(ER), q(State of Eritrea) ],
-   q(republic of belarus) => [ q(BO), q(Republic of Belarus) ],
    q(slovak republic) => [ q(LO), q(Slovak Republic) ],
+   q(republic of belarus) => [ q(BO), q(Republic of Belarus) ],
    q(republic of angola) => [ q(AO), q(Republic of Angola) ],
    q(republic of panama) => [ q(PM), q(Republic of Panama) ],
-   q(territory of new caledonia and dependencies) => [ q(NC), q(Territory of New Caledonia and Dependencies) ],
-   q(state of qatar) => [ q(QA), q(State of Qatar) ],
    q(kingdom of swaziland) => [ q(WZ), q(Kingdom of Swaziland) ],
+   q(state of qatar) => [ q(QA), q(State of Qatar) ],
+   q(territory of new caledonia and dependencies) => [ q(NC), q(Territory of New Caledonia and Dependencies) ],
    q(republic of palau) => [ q(PS), q(Republic of Palau) ],
    q(territory of the french southern and antarctic lands) => [ q(FS), q(Territory of the French Southern and Antarctic Lands) ],
    q(democratic republic of sao tome and principe) => [ q(TP), q(Democratic Republic of Sao Tome and Principe) ],
@@ -371,13 +372,13 @@ $Locale::Codes::Retired{'country'}{'fips-10'}{'name'} = {
    q(state of the vatican city) => [ q(VT), q(State of the Vatican City) ],
    q(people's democratic republic of algeria) => [ q(AG), q(People's Democratic Republic of Algeria) ],
    q(republic of kiribati) => [ q(KR), q(Republic of Kiribati) ],
-   q(kingdom of nepal) => [ q(NP), q(Kingdom of Nepal) ],
    q(republic of cuba) => [ q(CU), q(Republic of Cuba) ],
+   q(kingdom of nepal) => [ q(NP), q(Kingdom of Nepal) ],
    q(saint martin) => [ q(RN), q(Saint Martin) ],
-   q(kingdom of the netherlands) => [ q(NL), q(Kingdom of the Netherlands) ],
    q(republic of the marshall islands) => [ q(RM), q(Republic of the Marshall Islands) ],
-   q(people's republic of bangladesh) => [ q(BG), q(People's Republic of Bangladesh) ],
+   q(kingdom of the netherlands) => [ q(NL), q(Kingdom of the Netherlands) ],
    q(republic of madagascar) => [ q(MA), q(Republic of Madagascar) ],
+   q(people's republic of bangladesh) => [ q(BG), q(People's Republic of Bangladesh) ],
    q(kingdom of morocco) => [ q(MO), q(Kingdom of Morocco) ],
    q(republic of the sudan) => [ q(SU), q(Republic of the Sudan) ],
    q(co-operative republic of guyana) => [ q(GY), q(Co-operative Republic of Guyana) ],
@@ -386,43 +387,43 @@ $Locale::Codes::Retired{'country'}{'fips-10'}{'name'} = {
    q(republic of chad) => [ q(CD), q(Republic of Chad) ],
    q(gabonese republic) => [ q(GB), q(Gabonese Republic) ],
    q(coral sea islands territory) => [ q(CR), q(Coral Sea Islands Territory) ],
-   q(argentine republic) => [ q(AR), q(Argentine Republic) ],
-   q(republic of poland) => [ q(PL), q(Republic of Poland) ],
    q(republic of zimbabwe) => [ q(ZI), q(Republic of Zimbabwe) ],
-   q(kyrgyz republic) => [ q(KG), q(Kyrgyz Republic) ],
-   q(republic of azerbaijan) => [ q(AJ), q(Republic of Azerbaijan) ],
+   q(republic of poland) => [ q(PL), q(Republic of Poland) ],
+   q(argentine republic) => [ q(AR), q(Argentine Republic) ],
    q(republic of malta) => [ q(MT), q(Republic of Malta) ],
+   q(republic of azerbaijan) => [ q(AJ), q(Republic of Azerbaijan) ],
+   q(kyrgyz republic) => [ q(KG), q(Kyrgyz Republic) ],
    q(hellenic republic) => [ q(GR), q(Hellenic Republic) ],
-   q(republic of armenia) => [ q(AM), q(Republic of Armenia) ],
    q(kingdom of saudi arabia) => [ q(SA), q(Kingdom of Saudi Arabia) ],
-   q(curacao) => [ q(UC), q(Curacao) ],
+   q(republic of armenia) => [ q(AM), q(Republic of Armenia) ],
    q(republic of benin) => [ q(BN), q(Republic of Benin) ],
-   q(territory of french polynesia) => [ q(FP), q(Territory of French Polynesia) ],
+   q(curacao) => [ q(UC), q(Curacao) ],
    q(republic of ecuador) => [ q(EC), q(Republic of Ecuador) ],
+   q(territory of french polynesia) => [ q(FP), q(Territory of French Polynesia) ],
    q(republic of lesotho) => [ q(LT), q(Republic of Lesotho) ],
    q(hashemite kingdom of jordan) => [ q(JO), q(Hashemite Kingdom of Jordan) ],
    q(republic of burundi) => [ q(BY), q(Republic of Burundi) ],
    q(republic of uzbekistan) => [ q(UZ), q(Republic of Uzbekistan) ],
    q(territory of the wallis and futuna islands) => [ q(WF), q(Territory of the Wallis and Futuna Islands) ],
    q(sint maarten) => [ q(NN), q(Sint Maarten) ],
-   q(lebanese republic) => [ q(LE), q(Lebanese Republic) ],
    q(state of kuwait) => [ q(KU), q(State of Kuwait) ],
-   q(department of guadeloupe) => [ q(GP), q(Department of Guadeloupe) ],
+   q(lebanese republic) => [ q(LE), q(Lebanese Republic) ],
    q(republic of colombia) => [ q(CO), q(Republic of Colombia) ],
+   q(department of guadeloupe) => [ q(GP), q(Department of Guadeloupe) ],
    q(republic of singapore) => [ q(SN), q(Republic of Singapore) ],
    q(republic of turkey) => [ q(TU), q(Republic of Turkey) ],
-   q(republic of seychelles) => [ q(SE), q(Republic of Seychelles) ],
    q(republic of iraq) => [ q(IZ), q(Republic of Iraq) ],
-   q(republic of india) => [ q(IN), q(Republic of India) ],
+   q(republic of seychelles) => [ q(SE), q(Republic of Seychelles) ],
    q(independent state of samoa) => [ q(WS), q(Independent State of Samoa) ],
-   q(republic of nauru) => [ q(NR), q(Republic of Nauru) ],
+   q(republic of india) => [ q(IN), q(Republic of India) ],
    q(territory of christmas island) => [ q(KT), q(Territory of Christmas Island) ],
+   q(republic of nauru) => [ q(NR), q(Republic of Nauru) ],
    q(negara brunei darussalam) => [ q(BX), q(Negara Brunei Darussalam) ],
-   q(commonwealth of the bahamas) => [ q(BF), q(Commonwealth of the Bahamas) ],
-   q(republic of mauritius) => [ q(MP), q(Republic of Mauritius) ],
    q(federal islamic republic of the comoros) => [ q(CN), q(Federal Islamic Republic of the Comoros) ],
-   q(republic of kenya) => [ q(KE), q(Republic of Kenya) ],
+   q(republic of mauritius) => [ q(MP), q(Republic of Mauritius) ],
+   q(commonwealth of the bahamas) => [ q(BF), q(Commonwealth of the Bahamas) ],
    q(principality of liechtenstein) => [ q(LS), q(Principality of Liechtenstein) ],
+   q(republic of kenya) => [ q(KE), q(Republic of Kenya) ],
 };
 
 
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Currency.pm b/cpan/Locale-Codes/lib/Locale/Codes/Currency.pm
index b6b4e7a144..6113f00913 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/Currency.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/Currency.pm
@@ -22,7 +22,7 @@ use Locale::Codes::Currency_Retired;
 
 our($VERSION,@ISA,@EXPORT,@EXPORT_OK);
 
-$VERSION='3.21';
+$VERSION='3.22';
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2currency
                 currency2code
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Currency_Codes.pm b/cpan/Locale-Codes/lib/Locale/Codes/Currency_Codes.pm
index aaff8601f4..d7477d3544 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/Currency_Codes.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/Currency_Codes.pm
@@ -2,7 +2,7 @@ package Locale::Codes::Currency_Codes;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'get_codes' is run.
-#    Generated on: Thu Mar  1 08:07:11 EST 2012
+#    Generated on: Wed May 30 10:16:44 EDT 2012
 
 =pod
 
@@ -34,10 +34,11 @@ modify it under the same terms as Perl itself.
 
 use strict;
 use warnings;
+use utf8;
 require 5.002;
 
 our($VERSION);
-$VERSION='3.21';
+$VERSION='3.22';
 
 $Locale::Codes::Data{'currency'}{'id'} = '0180';
 
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Currency_Retired.pm b/cpan/Locale-Codes/lib/Locale/Codes/Currency_Retired.pm
index d5c8e174cc..3e0bb71413 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/Currency_Retired.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/Currency_Retired.pm
@@ -2,7 +2,7 @@ package Locale::Codes::Currency_Retired;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'deprecate_codes' is run.
-#    Generated on: Thu Mar  1 08:11:47 EST 2012
+#    Generated on: Wed May 30 10:22:19 EDT 2012
 
 =pod
 
@@ -34,10 +34,11 @@ modify it under the same terms as Perl itself.
 
 use strict;
 use warnings;
+use utf8;
 require 5.002;
 
 our($VERSION);
-$VERSION='3.21';
+$VERSION='3.22';
 
 $Locale::Codes::Retired{'currency'}{'num'}{'code'} = {
 };
@@ -45,27 +46,27 @@ $Locale::Codes::Retired{'currency'}{'num'}{'code'} = {
 $Locale::Codes::Retired{'currency'}{'alpha'}{'code'} = {
    q(YUM) => q(New Dinar),
    q(SKK) => q(Slovak Koruna),
-   q(MTL) => q(Maltese Lira),
    q(BYB) => q(Belarussian Ruble),
-   q(ATS) => q(Schilling),
+   q(MTL) => q(Maltese Lira),
    q(NLG) => q(Netherlands Guilder),
+   q(ATS) => q(Schilling),
    q(XB5) => q(European Unit of Account 17),
    q(CYP) => q(Cyprus Pound),
    q(AFA) => q(Afghani),
    q(ZAL) => q(Financial Rand),
    q(FRF) => q(French Franc),
-   q(EEK) => q(Kroon),
-   q(TMM) => q(Manat),
    q(ZRN) => q(New Zaire),
+   q(TMM) => q(Manat),
+   q(EEK) => q(Kroon),
    q(GHC) => q(Cedi),
-   q(XFU) => q(UIC-Franc),
    q(TJR) => q(Tajik Ruble),
+   q(XFU) => q(UIC-Franc),
    q(AZM) => q(Azerbaijanian Manat),
    q(SRG) => q(Surinam Guilder),
    q(ESP) => q(Spanish Peseta),
    q(TPE) => q(Timor Escudo),
-   q(LUF) => q(Luxembourg Franc),
    q(GWP) => q(Guinea-Bissau Peso),
+   q(LUF) => q(Luxembourg Franc),
    q(BGL) => q(Lev),
    q(ECV) => q(Unidad de Valor Constante (UVC)),
    q(PTE) => q(Portuguese Escudo),
@@ -75,19 +76,19 @@ $Locale::Codes::Retired{'currency'}{'alpha'}{'code'} = {
    q(MZM) => q(Metical),
    q(RUR) => q(Russian Ruble),
    q(XFO) => q(Gold-Franc),
-   q(MGF) => q(Malagasy Franc),
-   q(ROL) => q(Leu),
    q(BEF) => q(Belgian Franc),
+   q(ROL) => q(Leu),
+   q(MGF) => q(Malagasy Franc),
    q(AON) => q(New Kwanza),
    q(ZWD) => q(Zimbabwe Dollar),
    q(FIM) => q(Markka),
-   q(SIT) => q(Tolar),
-   q(GRD) => q(Drachma),
    q(SDD) => q(Sudanese Dinar),
-   q(AOR) => q(Kwanza Reajustado),
+   q(GRD) => q(Drachma),
+   q(SIT) => q(Tolar),
    q(VEB) => q(Bolivar),
-   q(TRL) => q(Turkish Lira),
+   q(AOR) => q(Kwanza Reajustado),
    q(ITL) => q(Italian Lira),
+   q(TRL) => q(Turkish Lira),
    q(DEM) => q(German Mark),
    q(XEU) => q(ECU (until 1998-12-31)),
    q(ADP) => q(Andorran Peseta),
@@ -101,68 +102,68 @@ $Locale::Codes::Retired{'currency'}{'num'}{'name'} = {
 };
 
 $Locale::Codes::Retired{'currency'}{'alpha'}{'name'} = {
-   q(irish pound) => [ q(IEP), q(Irish Pound) ],
-   q(netherlands antillian guilder) => [ q(ANG), q(Netherlands Antillian Guilder) ],
+   q(unidades de formento) => [ q(CLF), q(Unidades de Formento) ],
+   q(new leu) => [ q(RON), q(New Leu) ],
    q(schilling) => [ q(ATS), q(Schilling) ],
+   q(netherlands antillian guilder) => [ q(ANG), q(Netherlands Antillian Guilder) ],
+   q(irish pound) => [ q(IEP), q(Irish Pound) ],
    q(uic-franc) => [ q(XFU), q(UIC-Franc) ],
-   q(netherlands guilder) => [ q(NLG), q(Netherlands Guilder) ],
-   q(mexican nuevo peso) => [ q(MXN), q(Mexican Nuevo Peso) ],
    q(new kwanza) => [ q(AON), q(New Kwanza) ],
+   q(mexican nuevo peso) => [ q(MXN), q(Mexican Nuevo Peso) ],
+   q(netherlands guilder) => [ q(NLG), q(Netherlands Guilder) ],
+   q(cedi) => [ q(GHS), q(Cedi) ],
+   q(unidad de valor constante (uvc)) => [ q(ECV), q(Unidad de Valor Constante (UVC)) ],
    q(karbovanets) => [ q(UAK), q(Karbovanets) ],
    q(european composite unit) => [ q(XBA), q(European Composite Unit) ],
+   q(st. helena pound) => [ q(SHP), q(St. Helena Pound) ],
+   q(ecu (until 1998-12-31)) => [ q(XEU), q(ECU (until 1998-12-31)) ],
    q(new manat) => [ q(TMT), q(New Manat) ],
    q(malagasy franc) => [ q(MGF), q(Malagasy Franc) ],
-   q(ecu (until 1998-12-31)) => [ q(XEU), q(ECU (until 1998-12-31)) ],
    q(kuna) => [ q(HRK), q(Kuna) ],
+   q(european unit of account 17(e.u.a.-17)) => [ q(XBD), q(European Unit of Account 17(E.U.A.-17)) ],
+   q(uruguay peso en unidades indexadas) => [ q(UYI), q(Uruguay Peso en Unidades Indexadas) ],
    q(german mark) => [ q(DEM), q(German Mark) ],
+   q(timor escudo) => [ q(TPE), q(Timor Escudo) ],
    q(convertible marks) => [ q(BAM), q(Convertible Marks) ],
    q(lev) => [ q(BGL), q(Lev) ],
+   q(candian dollar) => [ q(CAD), q(Candian Dollar) ],
    q(drachma) => [ q(GRD), q(Drachma) ],
+   q(italian lira) => [ q(ITL), q(Italian Lira) ],
+   q(european unit of account 17) => [ q(XB5), q(European Unit of Account 17) ],
+   q(luxembourg franc) => [ q(LUF), q(Luxembourg Franc) ],
+   q(french franc) => [ q(FRF), q(French Franc) ],
    q(sdr) => [ q(XDR), q(SDR) ],
    q(bolivar) => [ q(VEB), q(Bolivar) ],
    q(dinar) => [ q(BHD), q(Dinar) ],
+   q(maltese lira) => [ q(MTL), q(Maltese Lira) ],
    q(tunisian dollar) => [ q(TND), q(Tunisian Dollar) ],
+   q(markka) => [ q(FIM), q(Markka) ],
    q(andorran peseta) => [ q(ADP), q(Andorran Peseta) ],
    q(tajik ruble) => [ q(TJR), q(Tajik Ruble) ],
+   q(tolar) => [ q(SIT), q(Tolar) ],
    q(metical) => [ q(MZN), q(Metical) ],
    q(aruban guilder) => [ q(AWG), q(Aruban Guilder) ],
    q(gold-franc) => [ q(XFO), q(Gold-Franc) ],
    q(cyprus pound) => [ q(CYP), q(Cyprus Pound) ],
+   q(european monetary unit (e.m.u.-6)) => [ q(XBB), q(European Monetary Unit (E.M.U.-6)) ],
    q(kwanza reajustado) => [ q(AOR), q(Kwanza Reajustado) ],
    q(new zaire) => [ q(ZRN), q(New Zaire) ],
+   q(kroon) => [ q(EEK), q(Kroon) ],
    q(belgian franc) => [ q(BEF), q(Belgian Franc) ],
    q(sudanese dinar) => [ q(SDD), q(Sudanese Dinar) ],
+   q(spanish peseta) => [ q(ESP), q(Spanish Peseta) ],
+   q(financial rand) => [ q(ZAL), q(Financial Rand) ],
    q(manat) => [ q(TMT), q(Manat) ],
    q(guinea-bissau peso) => [ q(GWP), q(Guinea-Bissau Peso) ],
    q(european unit of account 9) => [ q(XBC), q(European Unit of Account 9) ],
    q(european unit of account 9(e.u.a.-9)) => [ q(XBC), q(European Unit of Account 9(E.U.A.-9)) ],
-   q(shekel) => [ q(ILS), q(Shekel) ],
    q(slovak koruna) => [ q(SKK), q(Slovak Koruna) ],
+   q(shekel) => [ q(ILS), q(Shekel) ],
    q(portuguese escudo) => [ q(PTE), q(Portuguese Escudo) ],
    q(bond markets units european composite unit (eurco)) => [ q(XBA), q(Bond Markets Units European Composite Unit (EURCO)) ],
-   q(new dinar) => [ q(YUM), q(New Dinar) ],
-   q(unidades de formento) => [ q(CLF), q(Unidades de Formento) ],
-   q(new leu) => [ q(RON), q(New Leu) ],
-   q(cedi) => [ q(GHS), q(Cedi) ],
-   q(unidad de valor constante (uvc)) => [ q(ECV), q(Unidad de Valor Constante (UVC)) ],
-   q(st. helena pound) => [ q(SHP), q(St. Helena Pound) ],
-   q(european unit of account 17(e.u.a.-17)) => [ q(XBD), q(European Unit of Account 17(E.U.A.-17)) ],
-   q(uruguay peso en unidades indexadas) => [ q(UYI), q(Uruguay Peso en Unidades Indexadas) ],
-   q(timor escudo) => [ q(TPE), q(Timor Escudo) ],
-   q(candian dollar) => [ q(CAD), q(Candian Dollar) ],
-   q(italian lira) => [ q(ITL), q(Italian Lira) ],
-   q(european unit of account 17) => [ q(XB5), q(European Unit of Account 17) ],
-   q(luxembourg franc) => [ q(LUF), q(Luxembourg Franc) ],
-   q(french franc) => [ q(FRF), q(French Franc) ],
-   q(maltese lira) => [ q(MTL), q(Maltese Lira) ],
-   q(markka) => [ q(FIM), q(Markka) ],
-   q(tolar) => [ q(SIT), q(Tolar) ],
-   q(european monetary unit (e.m.u.-6)) => [ q(XBB), q(European Monetary Unit (E.M.U.-6)) ],
-   q(kroon) => [ q(EEK), q(Kroon) ],
-   q(spanish peseta) => [ q(ESP), q(Spanish Peseta) ],
-   q(financial rand) => [ q(ZAL), q(Financial Rand) ],
-   q(bermudian dollar (customarily known as bermuda dollar)) => [ q(BMD), q(Bermudian Dollar (customarily known as Bermuda Dollar)) ],
    q(surinam guilder) => [ q(SRG), q(Surinam Guilder) ],
+   q(bermudian dollar (customarily known as bermuda dollar)) => [ q(BMD), q(Bermudian Dollar (customarily known as Bermuda Dollar)) ],
+   q(new dinar) => [ q(YUM), q(New Dinar) ],
    q(franc congolais) => [ q(CDF), q(Franc Congolais) ],
    q(european monetary unit) => [ q(XBB), q(European Monetary Unit) ],
    q(leu) => [ q(RON), q(Leu) ],
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/LangExt.pm b/cpan/Locale-Codes/lib/Locale/Codes/LangExt.pm
index 2817fa7fc5..c7a4e1c8f8 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/LangExt.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/LangExt.pm
@@ -20,7 +20,7 @@ use Locale::Codes::LangExt_Retired;
 
 our($VERSION,@ISA,@EXPORT,@EXPORT_OK);
 
-$VERSION='3.21';
+$VERSION='3.22';
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2langext
                 langext2code
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/LangExt_Codes.pm b/cpan/Locale-Codes/lib/Locale/Codes/LangExt_Codes.pm
index a26c9c8674..d6098bb9ee 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/LangExt_Codes.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/LangExt_Codes.pm
@@ -2,7 +2,7 @@ package Locale::Codes::LangExt_Codes;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'get_codes' is run.
-#    Generated on: Thu Mar  1 08:07:43 EST 2012
+#    Generated on: Wed May 30 10:16:55 EDT 2012
 
 =pod
 
@@ -34,10 +34,11 @@ modify it under the same terms as Perl itself.
 
 use strict;
 use warnings;
+use utf8;
 require 5.002;
 
 our($VERSION);
-$VERSION='3.21';
+$VERSION='3.22';
 
 $Locale::Codes::Data{'langext'}{'id'} = '0226';
 
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/LangExt_Retired.pm b/cpan/Locale-Codes/lib/Locale/Codes/LangExt_Retired.pm
index 06d5c98d43..13caa45f3d 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/LangExt_Retired.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/LangExt_Retired.pm
@@ -2,7 +2,7 @@ package Locale::Codes::LangExt_Retired;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'deprecate_codes' is run.
-#    Generated on: Thu Mar  1 08:11:47 EST 2012
+#    Generated on: Wed May 30 10:22:19 EDT 2012
 
 =pod
 
@@ -34,10 +34,11 @@ modify it under the same terms as Perl itself.
 
 use strict;
 use warnings;
+use utf8;
 require 5.002;
 
 our($VERSION);
-$VERSION='3.21';
+$VERSION='3.22';
 
 $Locale::Codes::Retired{'langext'}{'alpha'}{'code'} = {
 };
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/LangFam.pm b/cpan/Locale-Codes/lib/Locale/Codes/LangFam.pm
index 66eed230cf..96c8eccc8f 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/LangFam.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/LangFam.pm
@@ -20,7 +20,7 @@ use Locale::Codes::LangFam_Retired;
 
 our($VERSION,@ISA,@EXPORT,@EXPORT_OK);
 
-$VERSION='3.21';
+$VERSION='3.22';
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2langfam
                 langfam2code
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/LangFam_Codes.pm b/cpan/Locale-Codes/lib/Locale/Codes/LangFam_Codes.pm
index 9f361424d7..88c8bd7778 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/LangFam_Codes.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/LangFam_Codes.pm
@@ -2,7 +2,7 @@ package Locale::Codes::LangFam_Codes;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'get_codes' is run.
-#    Generated on: Thu Mar  1 08:08:02 EST 2012
+#    Generated on: Wed May 30 10:16:58 EDT 2012
 
 =pod
 
@@ -34,10 +34,11 @@ modify it under the same terms as Perl itself.
 
 use strict;
 use warnings;
+use utf8;
 require 5.002;
 
 our($VERSION);
-$VERSION='3.21';
+$VERSION='3.22';
 
 $Locale::Codes::Data{'langfam'}{'id'} = '0115';
 
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/LangFam_Retired.pm b/cpan/Locale-Codes/lib/Locale/Codes/LangFam_Retired.pm
index 940e7bef98..1bd0ee4479 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/LangFam_Retired.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/LangFam_Retired.pm
@@ -37,7 +37,7 @@ use warnings;
 require 5.002;
 
 our($VERSION);
-$VERSION='3.21';
+$VERSION='3.22';
 
 $Locale::Codes::Retired{'langfam'}{'alpha'}{'code'} = {
 };
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/LangVar.pm b/cpan/Locale-Codes/lib/Locale/Codes/LangVar.pm
index e3ec0b69d4..3b406e4f52 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/LangVar.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/LangVar.pm
@@ -20,7 +20,7 @@ use Locale::Codes::LangVar_Retired;
 
 our($VERSION,@ISA,@EXPORT,@EXPORT_OK);
 
-$VERSION='3.21';
+$VERSION='3.22';
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2langvar
                 langvar2code
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/LangVar_Codes.pm b/cpan/Locale-Codes/lib/Locale/Codes/LangVar_Codes.pm
index 38531b74db..a25928c098 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/LangVar_Codes.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/LangVar_Codes.pm
@@ -2,7 +2,7 @@ package Locale::Codes::LangVar_Codes;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'get_codes' is run.
-#    Generated on: Thu Mar  1 08:07:50 EST 2012
+#    Generated on: Wed May 30 10:16:58 EDT 2012
 
 =pod
 
@@ -34,10 +34,11 @@ modify it under the same terms as Perl itself.
 
 use strict;
 use warnings;
+use utf8;
 require 5.002;
 
 our($VERSION);
-$VERSION='3.21';
+$VERSION='3.22';
 
 $Locale::Codes::Data{'langvar'}{'id'} = '0057';
 
@@ -146,13 +147,13 @@ $Locale::Codes::Data{'langvar'}{'id2names'} = {
       q(The Njiva dialect of Resian),
       ],
    q(0033) => [
-      q(Volapük nulik),
-      q(Volapük perevidöl),
-      q(Volapük nulädik),
-      q(de Jong's Volapük),
-      q(New Volapük),
-      q(Revised Volapük),
-      q(Modern Volapük),
+      q(Volapuk nulik),
+      q(Volapuk perevidol),
+      q(Volapuk nuladik),
+      q(de Jong's Volapuk),
+      q(New Volapuk),
+      q(Revised Volapuk),
+      q(Modern Volapuk),
       ],
    q(0034) => [
       q(The Oseacco dialect of Resian),
@@ -174,10 +175,10 @@ $Locale::Codes::Data{'langvar'}{'id2names'} = {
       q(Puter idiom of Romansh),
       ],
    q(0040) => [
-      q(Volapük rigik),
-      q(Schleyer's Volapük),
-      q(Original Volapük),
-      q(Classic Volapük),
+      q(Volapuk rigik),
+      q(Schleyer's Volapuk),
+      q(Original Volapuk),
+      q(Classic Volapuk),
       ],
    q(0041) => [
       q(Resian),
@@ -269,7 +270,7 @@ $Locale::Codes::Data{'langvar'}{'alias2id'} = {
       q(0012),
       q(0),
       ],
-   q(classic volapük) => [
+   q(classic volapuk) => [
       q(0040),
       q(0),
       ],
@@ -281,7 +282,7 @@ $Locale::Codes::Data{'langvar'}{'alias2id'} = {
       q(0025),
       q(0),
       ],
-   q(de jong's volapük) => [
+   q(de jong's volapuk) => [
       q(0033),
       q(0),
       ],
@@ -325,7 +326,7 @@ $Locale::Codes::Data{'langvar'}{'alias2id'} = {
       q(0001),
       q(0),
       ],
-   q(modern volapük) => [
+   q(modern volapuk) => [
       q(0033),
       q(0),
       ],
@@ -345,7 +346,7 @@ $Locale::Codes::Data{'langvar'}{'alias2id'} = {
       q(0030),
       q(0),
       ],
-   q(new volapük) => [
+   q(new volapuk) => [
       q(0033),
       q(0),
       ],
@@ -353,7 +354,7 @@ $Locale::Codes::Data{'langvar'}{'alias2id'} = {
       q(0021),
       q(0),
       ],
-   q(original volapük) => [
+   q(original volapuk) => [
       q(0040),
       q(0),
       ],
@@ -389,7 +390,7 @@ $Locale::Codes::Data{'langvar'}{'alias2id'} = {
       q(0041),
       q(0),
       ],
-   q(revised volapük) => [
+   q(revised volapuk) => [
       q(0033),
       q(0),
       ],
@@ -401,7 +402,7 @@ $Locale::Codes::Data{'langvar'}{'alias2id'} = {
       q(0042),
       q(0),
       ],
-   q(schleyer's volapük) => [
+   q(schleyer's volapuk) => [
       q(0040),
       q(0),
       ],
@@ -505,19 +506,19 @@ $Locale::Codes::Data{'langvar'}{'alias2id'} = {
       q(0053),
       q(0),
       ],
-   q(volapük nulik) => [
+   q(volapuk nuladik) => [
       q(0033),
       q(0),
       ],
-   q(volapük nulädik) => [
+   q(volapuk nulik) => [
       q(0033),
       q(0),
       ],
-   q(volapük perevidöl) => [
+   q(volapuk perevidol) => [
       q(0033),
       q(0),
       ],
-   q(volapük rigik) => [
+   q(volapuk rigik) => [
       q(0040),
       q(0),
       ],
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/LangVar_Retired.pm b/cpan/Locale-Codes/lib/Locale/Codes/LangVar_Retired.pm
index 447325b992..bac3b0030b 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/LangVar_Retired.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/LangVar_Retired.pm
@@ -2,7 +2,7 @@ package Locale::Codes::LangVar_Retired;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'deprecate_codes' is run.
-#    Generated on: Thu Mar  1 08:11:47 EST 2012
+#    Generated on: Wed May 30 10:22:19 EDT 2012
 
 =pod
 
@@ -34,10 +34,11 @@ modify it under the same terms as Perl itself.
 
 use strict;
 use warnings;
+use utf8;
 require 5.002;
 
 our($VERSION);
-$VERSION='3.21';
+$VERSION='3.22';
 
 $Locale::Codes::Retired{'langvar'}{'alpha'}{'code'} = {
 };
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Language.pm b/cpan/Locale-Codes/lib/Locale/Codes/Language.pm
index b23242ce91..2fe0d92bd0 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/Language.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/Language.pm
@@ -22,7 +22,7 @@ use Locale::Codes::Language_Retired;
 
 our($VERSION,@ISA,@EXPORT,@EXPORT_OK);
 
-$VERSION='3.21';
+$VERSION='3.22';
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2language
                 language2code
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Language_Codes.pm b/cpan/Locale-Codes/lib/Locale/Codes/Language_Codes.pm
index 7b156fbe36..3e1fdce8d3 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/Language_Codes.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/Language_Codes.pm
@@ -2,7 +2,7 @@ package Locale::Codes::Language_Codes;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'get_codes' is run.
-#    Generated on: Thu Mar  1 08:07:05 EST 2012
+#    Generated on: Wed May 30 10:16:41 EDT 2012
 
 =pod
 
@@ -34,10 +34,11 @@ modify it under the same terms as Perl itself.
 
 use strict;
 use warnings;
+use utf8;
 require 5.002;
 
 our($VERSION);
-$VERSION='3.21';
+$VERSION='3.22';
 
 $Locale::Codes::Data{'language'}{'id'} = '7819';
 
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Language_Retired.pm b/cpan/Locale-Codes/lib/Locale/Codes/Language_Retired.pm
index d256d3a21a..ff85e4baa5 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/Language_Retired.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/Language_Retired.pm
@@ -2,7 +2,7 @@ package Locale::Codes::Language_Retired;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'deprecate_codes' is run.
-#    Generated on: Thu Mar  1 08:11:47 EST 2012
+#    Generated on: Wed May 30 10:22:19 EDT 2012
 
 =pod
 
@@ -34,26 +34,27 @@ modify it under the same terms as Perl itself.
 
 use strict;
 use warnings;
+use utf8;
 require 5.002;
 
 our($VERSION);
-$VERSION='3.21';
+$VERSION='3.22';
 
 $Locale::Codes::Retired{'language'}{'alpha-2'}{'code'} = {
    q(jw) => q(Javanese),
    q(in) => q(Indonesian),
-   q(iw) => q(Hebrew),
    q(mo) => q(Moldavian),
+   q(iw) => q(Hebrew),
    q(ji) => q(Yiddish),
 };
 
 $Locale::Codes::Retired{'language'}{'alpha-3'}{'code'} = {
    q(bjq) => q(Southern Betsimisaraka Malagasy),
-   q(dha) => q(Dhanwar (India)),
    q(dkl) => q(Kolum So Dogon),
+   q(dha) => q(Dhanwar (India)),
    q(nbf) => q(Naxi),
-   q(tie) => q(Tingal),
    q(mja) => q(Mahei),
+   q(tie) => q(Tingal),
    q(tkk) => q(Takpa),
    q(ayx) => q(Ayi (China)),
    q(noo) => q(Nootka),
@@ -65,9 +66,8 @@ $Locale::Codes::Retired{'language'}{'term'}{'code'} = {
 $Locale::Codes::Retired{'language'}{'alpha-2'}{'name'} = {
    q(kirundi) => [ q(rn), q(Kirundi) ],
    q(latvian, lettish) => [ q(lv), q(Latvian, Lettish) ],
-   q(moldavian) => [ q(mo), q(Moldavian) ],
    q(greek, modern (1453-)) => [ q(el), q(Greek, Modern (1453-)) ],
-   q(volapük) => [ q(vo), q(Volapük) ],
+   q(moldavian) => [ q(mo), q(Moldavian) ],
    q(frisian) => [ q(fy), q(Frisian) ],
    q(bihari) => [ q(bh), q(Bihari) ],
    q(malay) => [ q(ms), q(Malay) ],
@@ -79,9 +79,8 @@ $Locale::Codes::Retired{'language'}{'alpha-2'}{'name'} = {
    q((afan) oromo) => [ q(om), q((Afan) Oromo) ],
    q(laothian) => [ q(lo), q(Laothian) ],
    q(khmer) => [ q(km), q(Khmer) ],
-   q(norwegian bokmål) => [ q(nb), q(Norwegian Bokmål) ],
-   q(marshall) => [ q(mh), q(Marshall) ],
    q(scots gaelic) => [ q(gd), q(Scots Gaelic) ],
+   q(marshall) => [ q(mh), q(Marshall) ],
    q(bhutani) => [ q(dz), q(Bhutani) ],
    q(singhalese) => [ q(si), q(Singhalese) ],
    q(bengali; bangla) => [ q(bn), q(Bengali; Bangla) ],
@@ -98,34 +97,35 @@ $Locale::Codes::Retired{'language'}{'alpha-2'}{'name'} = {
    q(cambodian) => [ q(km), q(Cambodian) ],
    q(tonga) => [ q(to), q(Tonga) ],
    q(interlingua) => [ q(ia), q(Interlingua) ],
-   q(sinhalese) => [ q(si), q(Sinhalese) ],
    q(rhaeto-romance) => [ q(rm), q(Rhaeto-Romance) ],
+   q(sinhalese) => [ q(si), q(Sinhalese) ],
    q(gallegan) => [ q(gl), q(Gallegan) ],
-   q(swahili) => [ q(sw), q(Swahili) ],
    q(occitan) => [ q(oc), q(Occitan) ],
+   q(swahili) => [ q(sw), q(Swahili) ],
    q(gaelic (scots)) => [ q(gd), q(Gaelic (Scots)) ],
-   q(letzeburgesch) => [ q(lb), q(Letzeburgesch) ],
+   q(volapuk) => [ q(vo), q(Volapuk) ],
    q(siswati) => [ q(ss), q(Siswati) ],
+   q(letzeburgesch) => [ q(lb), q(Letzeburgesch) ],
    q(pashto, pushto) => [ q(ps), q(Pashto, Pushto) ],
-   q(fiji) => [ q(fj), q(Fiji) ],
    q(sesotho) => [ q(st), q(Sesotho) ],
+   q(fiji) => [ q(fj), q(Fiji) ],
 };
 
 $Locale::Codes::Retired{'language'}{'alpha-3'}{'name'} = {
    q(dhanwar (india)) => [ q(dha), q(Dhanwar (India)) ],
    q(ayi (china)) => [ q(ayx), q(Ayi (China)) ],
-   q(dutch, middle (ca.1050-1350)) => [ q(dum), q(Dutch, Middle (ca.1050-1350)) ],
    q(hainyaxo bozo) => [ q(bzx), q(Hainyaxo Bozo) ],
+   q(dutch, middle (ca.1050-1350)) => [ q(dum), q(Dutch, Middle (ca.1050-1350)) ],
    q(dogri) => [ q(doi), q(Dogri) ],
-   q(waray) => [ q(war), q(Waray) ],
    q(kumak) => [ q(nee), q(Kumak) ],
-   q(kwato) => [ q(kop), q(Kwato) ],
+   q(waray) => [ q(war), q(Waray) ],
    q(creoles and pidgins ) => [ q(crp), q(Creoles and pidgins ) ],
-   q(nung (myanmar)) => [ q(nun), q(Nung (Myanmar)) ],
+   q(kwato) => [ q(kop), q(Kwato) ],
    q(mende) => [ q(men), q(Mende) ],
+   q(nung (myanmar)) => [ q(nun), q(Nung (Myanmar)) ],
    q(english, middle (1100-1500)) => [ q(enm), q(English, Middle (1100-1500)) ],
-   q(ounge) => [ q(oue), q(Ounge) ],
    q(dumpu) => [ q(wtf), q(Dumpu) ],
+   q(ounge) => [ q(oue), q(Ounge) ],
    q(turkish, ottoman (1500-1928)) => [ q(ota), q(Turkish, Ottoman (1500-1928)) ],
    q(kag-fer-jiir-koor-ror-us-zuksun) => [ q(gel), q(Kag-Fer-Jiir-Koor-Ror-Us-Zuksun) ],
    q(creoles and pidgins, portuguese-based ) => [ q(cpp), q(Creoles and pidgins, Portuguese-based ) ],
@@ -135,31 +135,31 @@ $Locale::Codes::Retired{'language'}{'alpha-3'}{'name'} = {
    q(yonggom) => [ q(yon), q(Yonggom) ],
    q(bemba) => [ q(bem), q(Bemba) ],
    q(kamba) => [ q(kam), q(Kamba) ],
-   q(konkani) => [ q(kok), q(Konkani) ],
    q(south american indian (other)) => [ q(sai), q(South American Indian (Other)) ],
+   q(konkani) => [ q(kok), q(Konkani) ],
    q(creoles and pidgins, english based) => [ q(cpe), q(Creoles and pidgins, English based) ],
-   q(basa) => [ q(bas), q(Basa) ],
-   q(german, old high (ca.750-1050)) => [ q(goh), q(German, Old High (ca.750-1050)) ],
    q(nakama) => [ q(nib), q(Nakama) ],
+   q(german, old high (ca.750-1050)) => [ q(goh), q(German, Old High (ca.750-1050)) ],
+   q(basa) => [ q(bas), q(Basa) ],
    q(norse, old) => [ q(non), q(Norse, Old) ],
    q(gbaya) => [ q(gba), q(Gbaya) ],
    q(mahei) => [ q(mja), q(Mahei) ],
    q(german, middle high (ca.1050-1500)) => [ q(gmh), q(German, Middle High (ca.1050-1500)) ],
-   q(french, middle (ca.1400-1600)) => [ q(frm), q(French, Middle (ca.1400-1600)) ],
    q(duduela) => [ q(duk), q(Duduela) ],
+   q(french, middle (ca.1400-1600)) => [ q(frm), q(French, Middle (ca.1400-1600)) ],
    q(burum-mindik) => [ q(bmu), q(Burum-Mindik) ],
    q(mbedam) => [ q(xmd), q(Mbedam) ],
-   q(kolum so dogon) => [ q(dkl), q(Kolum So Dogon) ],
    q(tingal) => [ q(tie), q(Tingal) ],
-   q(ainu) => [ q(ain), q(Ainu) ],
+   q(kolum so dogon) => [ q(dkl), q(Kolum So Dogon) ],
    q(french, old (842-ca.1400)) => [ q(fro), q(French, Old (842-ca.1400)) ],
+   q(ainu) => [ q(ain), q(Ainu) ],
    q(nootka) => [ q(noo), q(Nootka) ],
    q(irish, middle (900-1200)) => [ q(mga), q(Irish, Middle (900-1200)) ],
    q(irish, old (to 900)) => [ q(sga), q(Irish, Old (to 900)) ],
    q(mari) => [ q(chm), q(Mari) ],
    q(bekwil) => [ q(bkw), q(Bekwil) ],
-   q(walamo) => [ q(wal), q(Walamo) ],
    q(greek, ancient (to 1453)) => [ q(grc), q(Greek, Ancient (to 1453)) ],
+   q(walamo) => [ q(wal), q(Walamo) ],
    q(bantu (other)) => [ q(bnt), q(Bantu (Other)) ],
    q(apalik) => [ q(apo), q(Apalik) ],
    q(creoles and pidgins, french-based ) => [ q(cpf), q(Creoles and pidgins, French-based ) ],
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Script.pm b/cpan/Locale-Codes/lib/Locale/Codes/Script.pm
index 0f098c5f33..61eda921e7 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/Script.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/Script.pm
@@ -22,7 +22,7 @@ use Locale::Codes::Script_Retired;
 
 our($VERSION,@ISA,@EXPORT,@EXPORT_OK);
 
-$VERSION='3.21';
+$VERSION='3.22';
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2script
                 script2code
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Script_Codes.pm b/cpan/Locale-Codes/lib/Locale/Codes/Script_Codes.pm
index 24708058ea..2d07af4784 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/Script_Codes.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/Script_Codes.pm
@@ -2,7 +2,7 @@ package Locale::Codes::Script_Codes;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'get_codes' is run.
-#    Generated on: Thu Mar  1 08:07:26 EST 2012
+#    Generated on: Wed May 30 10:16:52 EDT 2012
 
 =pod
 
@@ -34,10 +34,11 @@ modify it under the same terms as Perl itself.
 
 use strict;
 use warnings;
+use utf8;
 require 5.002;
 
 our($VERSION);
-$VERSION='3.21';
+$VERSION='3.22';
 
 $Locale::Codes::Data{'script'}{'id'} = '0159';
 
diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Script_Retired.pm b/cpan/Locale-Codes/lib/Locale/Codes/Script_Retired.pm
index 5a0fc77529..c8d1701a17 100644
--- a/cpan/Locale-Codes/lib/Locale/Codes/Script_Retired.pm
+++ b/cpan/Locale-Codes/lib/Locale/Codes/Script_Retired.pm
@@ -2,7 +2,7 @@ package Locale::Codes::Script_Retired;
 
 # This file was automatically generated.  Any changes to this file will
 # be lost the next time 'deprecate_codes' is run.
-#    Generated on: Thu Mar  1 08:11:47 EST 2012
+#    Generated on: Wed May 30 10:22:19 EDT 2012
 
 =pod
 
@@ -34,10 +34,11 @@ modify it under the same terms as Perl itself.
 
 use strict;
 use warnings;
+use utf8;
 require 5.002;
 
 our($VERSION);
-$VERSION='3.21';
+$VERSION='3.22';
 
 $Locale::Codes::Retired{'script'}{'num'}{'code'} = {
 };
@@ -51,8 +52,8 @@ $Locale::Codes::Retired{'script'}{'num'}{'name'} = {
 
 $Locale::Codes::Retired{'script'}{'alpha'}{'name'} = {
    q(sindhi) => [ q(Sind), q(Sindhi) ],
-   q(miao (pollard)) => [ q(Plrd), q(Miao (Pollard)) ],
    q(ol chiki (ol cemet, ol, santali)) => [ q(Olck), q(Ol Chiki (Ol Cemet, Ol, Santali)) ],
+   q(miao (pollard)) => [ q(Plrd), q(Miao (Pollard)) ],
    q(hangul (hangul, hangeul)) => [ q(Hang), q(Hangul (Hangul, Hangeul)) ],
    q(sharada, sarada) => [ q(Shrd), q(Sharada, Sarada) ],
    q(khudawadi, sindhi) => [ q(Sind), q(Khudawadi, Sindhi) ],
@@ -60,14 +61,14 @@ $Locale::Codes::Retired{'script'}{'alpha'}{'name'} = {
    q(tifinagh (berber)) => [ q(Tfng), q(Tifinagh (Berber)) ],
    q(moon (moon code, moon script, moon type)) => [ q(Moon), q(Moon (Moon code, Moon script, Moon type)) ],
    q(cuneiform, sumero-akkadian) => [ q(Xsux), q(Cuneiform, Sumero-Akkadian) ],
-   q(warang citi (varang kshiti)) => [ q(Wara), q(Warang Citi (Varang Kshiti)) ],
    q(ethiopic (geez)) => [ q(Ethi), q(Ethiopic (Geez)) ],
+   q(warang citi (varang kshiti)) => [ q(Wara), q(Warang Citi (Varang Kshiti)) ],
    q(tagalog (baybayin, alibata)) => [ q(Tglg), q(Tagalog (Baybayin, Alibata)) ],
    q(deseret (mormon)) => [ q(Dsrt), q(Deseret (Mormon)) ],
    q((alias for hiragana + katakana)) => [ q(Hrkt), q((alias for Hiragana + Katakana)) ],
    q(mandaic, mandaean) => [ q(Mand), q(Mandaic, Mandaean) ],
-   q(devanagari (nagari)) => [ q(Deva), q(Devanagari (Nagari)) ],
    q(tai tham (lanna)) => [ q(Lana), q(Tai Tham (Lanna)) ],
+   q(devanagari (nagari)) => [ q(Deva), q(Devanagari (Nagari)) ],
    q(shavian (shaw)) => [ q(Shaw), q(Shavian (Shaw)) ],
    q(indus (harappan)) => [ q(Inds), q(Indus (Harappan)) ],
    q(lisu (fraser)) => [ q(Lisu), q(Lisu (Fraser)) ],
diff --git a/cpan/Locale-Codes/lib/Locale/Country.pm b/cpan/Locale-Codes/lib/Locale/Country.pm
index 761043ed41..1a285da964 100644
--- a/cpan/Locale-Codes/lib/Locale/Country.pm
+++ b/cpan/Locale-Codes/lib/Locale/Country.pm
@@ -10,7 +10,7 @@ use warnings;
 use Exporter;
 
 our $VERSION;
-$VERSION='3.21';
+$VERSION='3.22';
 
 our (@ISA,@EXPORT);
 
diff --git a/cpan/Locale-Codes/lib/Locale/Currency.pm b/cpan/Locale-Codes/lib/Locale/Currency.pm
index 0169e25b9d..c012ed0f87 100644
--- a/cpan/Locale-Codes/lib/Locale/Currency.pm
+++ b/cpan/Locale-Codes/lib/Locale/Currency.pm
@@ -10,7 +10,7 @@ use warnings;
 use Exporter;
 
 our $VERSION;
-$VERSION='3.21';
+$VERSION='3.22';
 
 our (@ISA,@EXPORT);
 
diff --git a/cpan/Locale-Codes/lib/Locale/Language.pm b/cpan/Locale-Codes/lib/Locale/Language.pm
index 1daced1beb..e9a2379d97 100644
--- a/cpan/Locale-Codes/lib/Locale/Language.pm
+++ b/cpan/Locale-Codes/lib/Locale/Language.pm
@@ -10,7 +10,7 @@ use warnings;
 use Exporter;
 
 our $VERSION;
-$VERSION='3.21';
+$VERSION='3.22';
 
 our (@ISA,@EXPORT);
 
diff --git a/cpan/Locale-Codes/lib/Locale/Script.pm b/cpan/Locale-Codes/lib/Locale/Script.pm
index d389149fd9..e24f59a286 100644
--- a/cpan/Locale-Codes/lib/Locale/Script.pm
+++ b/cpan/Locale-Codes/lib/Locale/Script.pm
@@ -10,7 +10,7 @@ use warnings;
 use Exporter;
 
 our $VERSION;
-$VERSION='3.21';
+$VERSION='3.22';
 
 our (@ISA,@EXPORT);