done
authorMichael Andres <ma@suse.de>
Mon, 19 Dec 2005 09:54:14 +0000 (09:54 +0000)
committerMichael Andres <ma@suse.de>
Mon, 19 Dec 2005 09:54:14 +0000 (09:54 +0000)
zypp/@Review/ISOCountry.cc [deleted file]
zypp/@Review/ISOCountry.h [deleted file]
zypp/@Review/ISOLanguage.cc [deleted file]
zypp/@Review/ISOLanguage.h [deleted file]

diff --git a/zypp/@Review/ISOCountry.cc b/zypp/@Review/ISOCountry.cc
deleted file mode 100644 (file)
index 54c914a..0000000
+++ /dev/null
@@ -1,452 +0,0 @@
-/*---------------------------------------------------------------------\
-|                                                                      |
-|                      __   __    ____ _____ ____                      |
-|                      \ \ / /_ _/ ___|_   _|___ \                     |
-|                       \ V / _` \___ \ | |   __) |                    |
-|                        | | (_| |___) || |  / __/                     |
-|                        |_|\__,_|____/ |_| |_____|                    |
-|                                                                      |
-|                               core system                            |
-|                                                    (C) SuSE Linux AG |
-\----------------------------------------------------------------------/
-
-  File:       ISOCountry.cc
-
-  Author:     Michael Andres <ma@suse.de>
-  Maintainer: Michael Andres <ma@suse.de>
-
-  Textdomain "iso-countries"
-
-/-*/
-
-// Using dgettext() to avoid interfering with a previously set textdomain
-#define TEXTDOMAIN "iso-countries"
-#define _(MSG)  dgettext(TEXTDOMAIN, (MSG))
-#define __(MSG) MSG
-
-
-#include <iostream>
-#include <map>
-#include <libintl.h>
-
-#include <y2util/Y2SLog.h>
-#include <y2util/stringutil.h>
-
-#include <y2util/ISOCountry.h>
-
-using namespace std;
-
-///////////////////////////////////////////////////////////////////
-//
-//     CLASS NAME : ISOCountry::_D
-/**
- *
- **/
-struct ISOCountry::_D : public Rep {
-
-  typedef map<string,string> CodeMap;
-
-  static CodeMap _defCodeMap;
-  static CodeMap _altCodeMap;
-
-  static const string _noCode;
-  static const string _noName;
-
-  static CodeMap defaultCodeMap();
-
-  typedef CodeMap::const_iterator Index;
-
-  Index _index;
-
-  Index _assert( const std::string & code_r ) {
-    if ( _defCodeMap.empty() ) {
-      _defCodeMap = defaultCodeMap();
-    }
-    CodeMap::iterator dit = _defCodeMap.find( code_r );
-    if ( dit != _defCodeMap.end() ) {
-      return dit;
-    }
-    CodeMap::iterator ait = _altCodeMap.find( code_r );
-    if ( ait != _altCodeMap.end() ) {
-      return ait;
-    }
-
-    // remember a new code
-    CodeMap::value_type nval( code_r, string() );
-
-    if ( code_r.size() != 2 ) {
-      WAR << "Malformed ISOCountry code '" << code_r << "' (size != 2)" << endl;
-    }
-
-    string lcode( stringutil::toUpper( code_r ) );
-    if ( lcode != code_r ) {
-      WAR << "Malformed ISOCountry code '" << code_r << "' (not upper case)" << endl;
-      // but maybe we're lucky with the upper case code
-      // and find a country name.
-      dit = _defCodeMap.find( lcode );
-      if ( dit != _defCodeMap.end() ) {
-       nval.second = dit->second;
-      }
-    }
-
-    if ( ! nval.second.size() ) {
-      nval.second = string( "Unknown country '" ) + code_r + "'";
-    }
-
-    MIL << "Remember country code '" << code_r << "': " << nval.second << endl;
-    return _altCodeMap.insert( nval ).first;
-  }
-
-  _D( const std::string & code_r )
-    : _index( _assert(code_r) )
-  {}
-
-  string code() const {
-    return _index->first;
-  }
-
-  string name() const {
-    return _( _index->second.c_str() );
-  }
-};
-
-ISOCountry::_D::CodeMap ISOCountry::_D::_defCodeMap;
-ISOCountry::_D::CodeMap ISOCountry::_D::_altCodeMap;
-
-const string ISOCountry::_D::_noCode( "" );
-const string ISOCountry::_D::_noName( "default" );
-
-///////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////
-//
-//
-//     METHOD NAME : ISOCountry::ISOCountry
-//     METHOD TYPE : Constructor
-//
-ISOCountry::ISOCountry()
-{
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-//     METHOD NAME : ISOCountry::ISOCountry
-//     METHOD TYPE : Constructor
-//
-ISOCountry::ISOCountry( const std::string & code_r )
-{
-  if ( code_r.size() ) {
-    _d = makeVarPtr( new _D( code_r ) );
-  }
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-//     METHOD NAME : ISOCountry::~ISOCountry
-//     METHOD TYPE : Destructor
-//
-ISOCountry::~ISOCountry()
-{
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-//     METHOD NAME : ISOCountry::isSet
-//     METHOD TYPE : bool
-//
-bool ISOCountry::isSet() const
-{
-  return _d;
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-//     METHOD NAME : ISOCountry::code
-//     METHOD TYPE : std::string
-//
-std::string ISOCountry::code() const
-{
-  return _d ? _d->code() : _D::_noCode;
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-//     METHOD NAME : ISOCountry::name
-//     METHOD TYPE : std::string
-//
-std::string ISOCountry::name() const
-{
-  return _d ? _d->name() : _D::_noName;
-}
-
-/******************************************************************
-**
-**
-**     FUNCTION NAME : operator<<
-**     FUNCTION TYPE : ostream &
-*/
-ostream & operator<<( ostream & str, const ISOCountry & obj )
-{
-  return str << obj.code();
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-//     METHOD NAME : ISOCountry::_D::defaultCodeMap
-//     METHOD TYPE : ISOCountry::_D::CodeMap
-//
-ISOCountry::_D::CodeMap ISOCountry:: _D::defaultCodeMap()
-{
-  bindtextdomain( TEXTDOMAIN, LOCALEDIR );
-  bind_textdomain_codeset( TEXTDOMAIN, "UTF-8" );
-
-  CodeMap cm;
-  cm["AD"] = __( "Andorra" );                          // :AND:020:
-  cm["AE"] = __( "United Arab Emirates" );             // :ARE:784:
-  cm["AF"] = __( "Afghanistan" );                      // :AFG:004:
-  cm["AG"] = __( "Antigua and Barbuda" );              // :ATG:028:
-  cm["AI"] = __( "Anguilla" );                                 // :AIA:660:
-  cm["AL"] = __( "Albania" );                          // :ALB:008:
-  cm["AM"] = __( "Armenia" );                          // :ARM:051:
-  cm["AN"] = __( "Netherlands Antilles" );             // :ANT:530:
-  cm["AO"] = __( "Angola" );                           // :AGO:024:
-  cm["AQ"] = __( "Antarctica" );                       // :ATA:010:
-  cm["AR"] = __( "Argentina" );                        // :ARG:032:
-  cm["AS"] = __( "American Samoa" );                   // :ASM:016:
-  cm["AT"] = __( "Austria" );                          // :AUT:040:
-  cm["AU"] = __( "Australia" );                        // :AUS:036:
-  cm["AW"] = __( "Aruba" );                            // :ABW:533:
-  cm["AX"] = __( "Aland Islands" );                    // :ALA:248:
-  cm["AZ"] = __( "Azerbaijan" );                       // :AZE:031:
-  cm["BA"] = __( "Bosnia and Herzegovina" );           // :BIH:070:
-  cm["BB"] = __( "Barbados" );                                 // :BRB:052:
-  cm["BD"] = __( "Bangladesh" );                       // :BGD:050:
-  cm["BE"] = __( "Belgium" );                          // :BEL:056:
-  cm["BF"] = __( "Burkina Faso" );                     // :BFA:854:
-  cm["BG"] = __( "Bulgaria" );                                 // :BGR:100:
-  cm["BH"] = __( "Bahrain" );                          // :BHR:048:
-  cm["BI"] = __( "Burundi" );                          // :BDI:108:
-  cm["BJ"] = __( "Benin" );                            // :BEN:204:
-  cm["BM"] = __( "Bermuda" );                          // :BMU:060:
-  cm["BN"] = __( "Brunei Darussalam" );                // :BRN:096:
-  cm["BO"] = __( "Bolivia" );                          // :BOL:068:
-  cm["BR"] = __( "Brazil" );                           // :BRA:076:
-  cm["BS"] = __( "Bahamas" );                          // :BHS:044:
-  cm["BT"] = __( "Bhutan" );                           // :BTN:064:
-  cm["BV"] = __( "Bouvet Island" );                    // :BVT:074:
-  cm["BW"] = __( "Botswana" );                                 // :BWA:072:
-  cm["BY"] = __( "Belarus" );                          // :BLR:112:
-  cm["BZ"] = __( "Belize" );                           // :BLZ:084:
-  cm["CA"] = __( "Canada" );                           // :CAN:124:
-  cm["CC"] = __( "Cocos (Keeling) Islands" );          // :CCK:166:
-  cm["CD"] = __( "Congo" );                            // :COD:180:
-  cm["CF"] = __( "Centruual African Republic" );       // :CAF:140:
-  cm["CG"] = __( "Congo" );                            // :COG:178:
-  cm["CH"] = __( "Switzerland" );                      // :CHE:756:
-  cm["CI"] = __( "Cote D'Ivoire" );                    // :CIV:384:
-  cm["CK"] = __( "Cook Islands" );                     // :COK:184:
-  cm["CL"] = __( "Chile" );                            // :CHL:152:
-  cm["CM"] = __( "Cameroon" );                                 // :CMR:120:
-  cm["CN"] = __( "China" );                            // :CHN:156:
-  cm["CO"] = __( "Colombia" );                                 // :COL:170:
-  cm["CR"] = __( "Costa Rica" );                       // :CRI:188:
-  cm["CS"] = __( "Serbia and Montenegro" );            // :SCG:891:
-  cm["CU"] = __( "Cuba" );                             // :CUB:192:
-  cm["CV"] = __( "Cape Verde" );                       // :CPV:132:
-  cm["CX"] = __( "Christmas Island" );                         // :CXR:162:
-  cm["CY"] = __( "Cyprus" );                           // :CYP:196:
-  cm["CZ"] = __( "Czech Republic" );                   // :CZE:203:
-  cm["DE"] = __( "Germany" );                          // :DEU:276:
-  cm["DJ"] = __( "Djibouti" );                                 // :DJI:262:
-  cm["DK"] = __( "Denmark" );                          // :DNK:208:
-  cm["DM"] = __( "Dominica" );                                 // :DMA:212:
-  cm["DO"] = __( "Dominican Republic" );               // :DOM:214:
-  cm["DZ"] = __( "Algeria" );                          // :DZA:012:
-  cm["EC"] = __( "Ecuador" );                          // :ECU:218:
-  cm["EE"] = __( "Estonia" );                          // :EST:233:
-  cm["EG"] = __( "Egypt" );                            // :EGY:818:
-  cm["EH"] = __( "Western Sahara" );                   // :ESH:732:
-  cm["ER"] = __( "Eritrea" );                          // :ERI:232:
-  cm["ES"] = __( "Spain" );                            // :ESP:724:
-  cm["ET"] = __( "Ethiopia" );                                 // :ETH:231:
-  cm["FI"] = __( "Finland" );                          // :FIN:246:
-  cm["FJ"] = __( "Fiji" );                             // :FJI:242:
-  cm["FK"] = __( "Falkland Islands (Malvinas)" );      // :FLK:238:
-  cm["FM"] = __( "Federated States of Micronesia" );   // :FSM:583:
-  cm["FO"] = __( "Faroe Islands" );                    // :FRO:234:
-  cm["FR"] = __( "France" );                           // :FRA:250:
-  cm["FX"] = __( "Metropolitan France" );              // :FXX:249:
-  cm["GA"] = __( "Gabon" );                            // :GAB:266:
-  cm["GB"] = __( "United Kingdom" );                   // :GBR:826:
-  cm["GD"] = __( "Grenada" );                          // :GRD:308:
-  cm["GE"] = __( "Georgia" );                          // :GEO:268:
-  cm["GF"] = __( "French Guiana" );                    // :GUF:254:
-  cm["GH"] = __( "Ghana" );                            // :GHA:288:
-  cm["GI"] = __( "Gibraltar" );                        // :GIB:292:
-  cm["GL"] = __( "Greenland" );                        // :GRL:304:
-  cm["GM"] = __( "Gambia" );                           // :GMB:270:
-  cm["GN"] = __( "Guinea" );                           // :GIN:324:
-  cm["GP"] = __( "Guadeloupe" );                       // :GLP:312:
-  cm["GQ"] = __( "Equatorial Guinea" );                // :GNQ:226:
-  cm["GR"] = __( "Greece" );                           // :GRC:300:
-  cm["GS"] = __( "South Georgia and the South Sandwich Islands" );     // :SGS:239:
-  cm["GT"] = __( "Guatemala" );                        // :GTM:320:
-  cm["GU"] = __( "Guam" );                             // :GUM:316:
-  cm["GW"] = __( "Guinea-Bissau" );                    // :GNB:624:
-  cm["GY"] = __( "Guyana" );                           // :GUY:328:
-  cm["HK"] = __( "Hong Kong" );                        // :HKG:344:
-  cm["HM"] = __( "Heard Island and McDonald Islands" ); // :HMD:334:
-  cm["HN"] = __( "Honduras" );                                 // :HND:340:
-  cm["HR"] = __( "Croatia" );                          // :HRV:191:
-  cm["HT"] = __( "Haiti" );                            // :HTI:332:
-  cm["HU"] = __( "Hungary" );                          // :HUN:348:
-  cm["ID"] = __( "Indonesia" );                        // :IDN:360:
-  cm["IE"] = __( "Ireland" );                          // :IRL:372:
-  cm["IL"] = __( "Israel" );                           // :ISR:376:
-  cm["IN"] = __( "India" );                            // :IND:356:
-  cm["IO"] = __( "British Indian Ocean Territory" );   // :IOT:086:
-  cm["IQ"] = __( "Iraq" );                             // :IRQ:368:
-  cm["IR"] = __( "Iran" );                             // :IRN:364:
-  cm["IS"] = __( "Iceland" );                          // :ISL:352:
-  cm["IT"] = __( "Italy" );                            // :ITA:380:
-  cm["JM"] = __( "Jamaica" );                          // :JAM:388:
-  cm["JO"] = __( "Jordan" );                           // :JOR:400:
-  cm["JP"] = __( "Japan" );                            // :JPN:392:
-  cm["KE"] = __( "Kenya" );                            // :KEN:404:
-  cm["KG"] = __( "Kyrgyzstan" );                       // :KGZ:417:
-  cm["KH"] = __( "Cambodia" );                                 // :KHM:116:
-  cm["KI"] = __( "Kiribati" );                                 // :KIR:296:
-  cm["KM"] = __( "Comoros" );                          // :COM:174:
-  cm["KN"] = __( "Saint Kitts and Nevis" );            // :KNA:659:
-  cm["KP"] = __( "North Korea" );                      // :PRK:408:
-  cm["KR"] = __( "South Korea" );                      // :KOR:410:
-  cm["KW"] = __( "Kuwait" );                           // :KWT:414:
-  cm["KY"] = __( "Cayman Islands" );                   // :CYM:136:
-  cm["KZ"] = __( "Kazakhstan" );                       // :KAZ:398:
-  cm["LA"] = __( "Lao People's Democratic Republic" );         // :LAO:418:
-  cm["LB"] = __( "Lebanon" );                          // :LBN:422:
-  cm["LC"] = __( "Saint Lucia" );                      // :LCA:662:
-  cm["LI"] = __( "Liechtenstein" );                    // :LIE:438:
-  cm["LK"] = __( "Sri Lanka" );                        // :LKA:144:
-  cm["LR"] = __( "Liberia" );                          // :LBR:430:
-  cm["LS"] = __( "Lesotho" );                          // :LSO:426:
-  cm["LT"] = __( "Lithuania" );                        // :LTU:440:
-  cm["LU"] = __( "Luxembourg" );                       // :LUX:442:
-  cm["LV"] = __( "Latvia" );                           // :LVA:428:
-  cm["LY"] = __( "Libya" );                            // :LBY:434:
-  cm["MA"] = __( "Morocco" );                          // :MAR:504:
-  cm["MC"] = __( "Monaco" );                           // :MCO:492:
-  cm["MD"] = __( "Moldova" );                          // :MDA:498:
-  cm["MG"] = __( "Madagascar" );                       // :MDG:450:
-  cm["MH"] = __( "Marshall Islands" );                         // :MHL:584:
-  cm["MK"] = __( "Macedonia" );                        // :MKD:807:
-  cm["ML"] = __( "Mali" );                             // :MLI:466:
-  cm["MM"] = __( "Myanmar" );                          // :MMR:104:
-  cm["MN"] = __( "Mongolia" );                                 // :MNG:496:
-  cm["MO"] = __( "Macao" );                            // :MAC:446:
-  cm["MP"] = __( "Northern Mariana Islands" );                 // :MNP:580:
-  cm["MQ"] = __( "Martinique" );                       // :MTQ:474:
-  cm["MR"] = __( "Mauritania" );                       // :MRT:478:
-  cm["MS"] = __( "Montserrat" );                       // :MSR:500:
-  cm["MT"] = __( "Malta" );                            // :MLT:470:
-  cm["MU"] = __( "Mauritius" );                        // :MUS:480:
-  cm["MV"] = __( "Maldives" );                                 // :MDV:462:
-  cm["MW"] = __( "Malawi" );                           // :MWI:454:
-  cm["MX"] = __( "Mexico" );                           // :MEX:484:
-  cm["MY"] = __( "Malaysia" );                                 // :MYS:458:
-  cm["MZ"] = __( "Mozambique" );                       // :MOZ:508:
-  cm["NA"] = __( "Namibia" );                          // :NAM:516:
-  cm["NC"] = __( "New Caledonia" );                    // :NCL:540:
-  cm["NE"] = __( "Niger" );                            // :NER:562:
-  cm["NF"] = __( "Norfolk Island" );                   // :NFK:574:
-  cm["NG"] = __( "Nigeria" );                          // :NGA:566:
-  cm["NI"] = __( "Nicaragua" );                        // :NIC:558:
-  cm["NL"] = __( "Netherlands" );                      // :NLD:528:
-  cm["NO"] = __( "Norway" );                           // :NOR:578:
-  cm["NP"] = __( "Nepal" );                            // :NPL:524:
-  cm["NR"] = __( "Nauru" );                            // :NRU:520:
-  cm["NU"] = __( "Niue" );                             // :NIU:570:
-  cm["NZ"] = __( "New Zealand" );                      // :NZL:554:
-  cm["OM"] = __( "Oman" );                             // :OMN:512:
-  cm["PA"] = __( "Panama" );                           // :PAN:591:
-  cm["PE"] = __( "Peru" );                             // :PER:604:
-  cm["PF"] = __( "French Polynesia" );                         // :PYF:258:
-  cm["PG"] = __( "Papua New Guinea" );                         // :PNG:598:
-  cm["PH"] = __( "Philippines" );                      // :PHL:608:
-  cm["PK"] = __( "Pakistan" );                                 // :PAK:586:
-  cm["PL"] = __( "Poland" );                           // :POL:616:
-  cm["PM"] = __( "Saint Pierre and Miquelon" );        // :SPM:666:
-  cm["PN"] = __( "Pitcairn" );                                 // :PCN:612:
-  cm["PR"] = __( "Puerto Rico" );                      // :PRI:630:
-  cm["PS"] = __( "Palestinian Territory" );            // :PSE:275:
-  cm["PT"] = __( "Portugal" );                                 // :PRT:620:
-  cm["PW"] = __( "Palau" );                            // :PLW:585:
-  cm["PY"] = __( "Paraguay" );                                 // :PRY:600:
-  cm["QA"] = __( "Qatar" );                            // :QAT:634:
-  cm["RE"] = __( "Reunion" );                          // :REU:638:
-  cm["RO"] = __( "Romania" );                          // :ROU:642:
-  cm["RU"] = __( "Russian Federation" );               // :RUS:643:
-  cm["RW"] = __( "Rwanda" );                           // :RWA:646:
-  cm["SA"] = __( "Saudi Arabia" );                     // :SAU:682:
-  cm["SB"] = __( "Solomon Islands" );                  // :SLB:090:
-  cm["SC"] = __( "Seychelles" );                       // :SYC:690:
-  cm["SD"] = __( "Sudan" );                            // :SDN:736:
-  cm["SE"] = __( "Sweden" );                           // :SWE:752:
-  cm["SG"] = __( "Singapore" );                        // :SGP:702:
-  cm["SH"] = __( "Saint Helena" );                     // :SHN:654:
-  cm["SI"] = __( "Slovenia" );                                 // :SVN:705:
-  cm["SJ"] = __( "Svalbard and Jan Mayen" );           // :SJM:744:
-  cm["SK"] = __( "Slovakia" );                                 // :SVK:703:
-  cm["SL"] = __( "Sierra Leone" );                     // :SLE:694:
-  cm["SM"] = __( "San Marino" );                       // :SMR:674:
-  cm["SN"] = __( "Senegal" );                          // :SEN:686:
-  cm["SO"] = __( "Somalia" );                          // :SOM:706:
-  cm["SR"] = __( "Suriname" );                                 // :SUR:740:
-  cm["ST"] = __( "Sao Tome and Principe" );            // :STP:678:
-  cm["SV"] = __( "El Salvador" );                      // :SLV:222:
-  cm["SY"] = __( "Syria" );                            // :SYR:760:
-  cm["SZ"] = __( "Swaziland" );                        // :SWZ:748:
-  cm["TC"] = __( "Turks and Caicos Islands" );                 // :TCA:796:
-  cm["TD"] = __( "Chad" );                             // :TCD:148:
-  cm["TF"] = __( "French Southern Territories" );      // :ATF:260:
-  cm["TG"] = __( "Togo" );                             // :TGO:768:
-  cm["TH"] = __( "Thailand" );                                 // :THA:764:
-  cm["TJ"] = __( "Tajikistan" );                       // :TJK:762:
-  cm["TK"] = __( "Tokelau" );                          // :TKL:772:
-  cm["TM"] = __( "Turkmenistan" );                     // :TKM:795:
-  cm["TN"] = __( "Tunisia" );                          // :TUN:788:
-  cm["TO"] = __( "Tonga" );                            // :TON:776:
-  cm["TL"] = __( "East Timor" );                       // :TLS:626:
-  cm["TR"] = __( "Turkey" );                           // :TUR:792:
-  cm["TT"] = __( "Trinidad and Tobago" );              // :TTO:780:
-  cm["TV"] = __( "Tuvalu" );                           // :TUV:798:
-  cm["TW"] = __( "Taiwan" );                           // :TWN:158:
-  cm["TZ"] = __( "Tanzania" );                                 // :TZA:834:
-  cm["UA"] = __( "Ukraine" );                          // :UKR:804:
-  cm["UG"] = __( "Uganda" );                           // :UGA:800:
-  cm["UM"] = __( "United States Minor Outlying Islands" );     // :UMI:581:
-  cm["US"] = __( "United States" );                    // :USA:840:
-  cm["UY"] = __( "Uruguay" );                          // :URY:858:
-  cm["UZ"] = __( "Uzbekistan" );                       // :UZB:860:
-  cm["VA"] = __( "Holy See (Vatican City State)" );    // :VAT:336:
-  cm["VC"] = __( "Saint Vincent and the Grenadines" );         // :VCT:670:
-  cm["VE"] = __( "Venezuela" );                        // :VEN:862:
-  cm["VG"] = __( "British Virgin Islands" );           // :VGB:092:
-  cm["VI"] = __( "Virgin Islands, U.S." );             // :VIR:850:
-  cm["VN"] = __( "Vietnam" );                          // :VNM:704:
-  cm["VU"] = __( "Vanuatu" );                          // :VUT:548:
-  cm["WF"] = __( "Wallis and Futuna" );                // :WLF:876:
-  cm["WS"] = __( "Samoa" );                            // :WSM:882:
-  cm["YE"] = __( "Yemen" );                            // :YEM:887:
-  cm["YT"] = __( "Mayotte" );                          // :MYT:175:
-  cm["ZA"] = __( "South Africa" );                     // :ZAF:710:
-  cm["ZM"] = __( "Zambia" );                           // :ZMB:894:
-  cm["ZW"] = __( "Zimbabwe" );                                 // :ZWE:716:
-  return cm;
-}
diff --git a/zypp/@Review/ISOCountry.h b/zypp/@Review/ISOCountry.h
deleted file mode 100644 (file)
index 74a6fd1..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/*---------------------------------------------------------------------\
-|                                                                      |
-|                      __   __    ____ _____ ____                      |
-|                      \ \ / /_ _/ ___|_   _|___ \                     |
-|                       \ V / _` \___ \ | |   __) |                    |
-|                        | | (_| |___) || |  / __/                     |
-|                        |_|\__,_|____/ |_| |_____|                    |
-|                                                                      |
-|                               core system                            |
-|                                                    (C) SuSE Linux AG |
-\----------------------------------------------------------------------/
-
-  File:       ISOCountry.h
-
-  Author:     Michael Andres <ma@suse.de>
-  Maintainer: Michael Andres <ma@suse.de>
-
-  Purpose:
-
-/-*/
-#ifndef ISOCountry_h
-#define ISOCountry_h
-
-#include <iosfwd>
-#include <string>
-
-#include <y2util/Rep.h>
-
-///////////////////////////////////////////////////////////////////
-//
-//     CLASS NAME : ISOCountry
-/**
- *
- **/
-class ISOCountry {
-
-  public:
-  private:
-
-    struct _D;
-    VarPtr<_D> _d;
-
-  public:
-
-    ISOCountry();
-    explicit ISOCountry( const std::string & code_r );
-    ~ISOCountry();
-
-    bool isSet() const;
-
-    std::string code() const;
-    std::string name() const;
-};
-
-///////////////////////////////////////////////////////////////////
-
-std::ostream & operator<<( std::ostream & str, const ISOCountry & obj );
-
-///////////////////////////////////////////////////////////////////
-
-inline bool operator==( const ISOCountry & lhs, const ISOCountry & rhs ) {
-  return( lhs.code() == rhs.code() );
-}
-inline bool operator==( const std::string & lhs, const ISOCountry & rhs ) {
-  return( lhs == rhs.code() );
-}
-inline bool operator==( const ISOCountry & lhs, const std::string & rhs ) {
-  return( lhs.code() == rhs );
-}
-
-inline bool operator!=( const ISOCountry & lhs, const ISOCountry & rhs ) {
-  return( ! operator==( lhs, rhs ) );
-}
-inline bool operator!=( const std::string & lhs, const ISOCountry & rhs ) {
-  return( ! operator==( lhs, rhs ) );
-}
-inline bool operator!=( const ISOCountry & lhs, const std::string & rhs ) {
-  return( ! operator==( lhs, rhs ) );
-}
-
-///////////////////////////////////////////////////////////////////
-
-namespace std {
-  template<>
-    inline bool less<ISOCountry>::operator()( const ISOCountry & lhs,
-                                              const ISOCountry & rhs ) const
-    {
-      return( lhs.code() < rhs.code() );
-    }
-}
-
-///////////////////////////////////////////////////////////////////
-
-#endif // ISOCountry_h
diff --git a/zypp/@Review/ISOLanguage.cc b/zypp/@Review/ISOLanguage.cc
deleted file mode 100644 (file)
index 3d34024..0000000
+++ /dev/null
@@ -1,1193 +0,0 @@
-/*---------------------------------------------------------------------\
-|                                                                      |
-|                      __   __    ____ _____ ____                      |
-|                      \ \ / /_ _/ ___|_   _|___ \                     |
-|                       \ V / _` \___ \ | |   __) |                    |
-|                        | | (_| |___) || |  / __/                     |
-|                        |_|\__,_|____/ |_| |_____|                    |
-|                                                                      |
-|                               core system                            |
-|                                                    (C) SuSE Linux AG |
-\----------------------------------------------------------------------/
-
-  File:       ISOLanguage.cc
-
-  Author:     Michael Andres <ma@suse.de>
-  Maintainer: Michael Andres <ma@suse.de>
-
-  Textdomain "iso-languages"
-
-/-*/
-
-#define TEXTDOMAIN "iso-languages"
-#define _(MSG)  dgettext(TEXTDOMAIN, (MSG))
-#define __(MSG) MSG
-
-#include <iostream>
-#include <map>
-#include <libintl.h>
-
-#include <y2util/Y2SLog.h>
-#include <y2util/stringutil.h>
-
-#include <y2util/ISOLanguage.h>
-
-using namespace std;
-
-///////////////////////////////////////////////////////////////////
-//
-//     CLASS NAME : ISOLanguage::_D
-/**
- *
- **/
-struct ISOLanguage::_D : public Rep {
-
-  typedef map<string,string>      CodeMap;
-  typedef CodeMap::const_iterator Index;
-
-  // CodeMap[code] = untranslated language name
-  // Translation is done in name().
-  static CodeMap _iso639_1_CodeMap;
-  static CodeMap _iso639_2_CodeMap;
-  static CodeMap _others_CodeMap;
-
-  static void setDefaultCodeMaps( CodeMap & iso639_1,
-                                  CodeMap & iso639_2,
-                                  CodeMap & others );
-
-  static const string _noCode;
-  static const string _noName;
-
-  Index _index;
-
-  void _assertInitCodemaps() {
-    if ( _others_CodeMap.empty() ) {
-      setDefaultCodeMaps( _iso639_1_CodeMap,
-                          _iso639_2_CodeMap,
-                          _others_CodeMap );
-    }
-  }
-
-  Index _lookupCode( const std::string & code_r ) {
-    _assertInitCodemaps();
-    if ( code_r.size() == 2 )
-      {
-        CodeMap::iterator it = _iso639_1_CodeMap.find( code_r );
-        if ( it != _iso639_1_CodeMap.end() )
-          {
-            return it;
-          }
-        // else check _others_CodeMap
-      }
-    if ( code_r.size() == 3 )
-      {
-        CodeMap::iterator it = _iso639_2_CodeMap.find( code_r );
-        if ( it != _iso639_2_CodeMap.end() )
-          {
-            return it;
-          }
-        // else check _others_CodeMap
-      }
-    return _others_CodeMap.find( code_r );
-  }
-
-  Index _assert( const std::string & code_r ) {
-    Index it = _lookupCode( code_r );
-    if ( it != _others_CodeMap.end() )
-      {
-        return it;
-      }
-
-    // Still here? Remember a new code
-    CodeMap::value_type nval( code_r, string() );
-
-    if ( code_r.size() != 2 && code_r.size() != 3 ) {
-      WAR << "Malformed ISOLanguage code '" << code_r << "' (expect 2 or 3-letter)" << endl;
-    }
-
-    string lcode( stringutil::toLower( code_r ) );
-    if ( lcode != code_r ) {
-      WAR << "Malformed ISOLanguage code '" << code_r << "' (not lower case)" << endl;
-      // but maybe we're lucky with the lower case code
-      // and find a language name.
-      it = _lookupCode( lcode );
-      if ( it != _others_CodeMap.end() ) {
-       nval.second = it->second;
-      }
-    }
-
-    MIL << "Remember language code '" << code_r << "': '" << nval.second << "'" << endl;
-    return _others_CodeMap.insert( nval ).first;
-  }
-
-  _D( const std::string & code_r )
-    : _index( _assert(code_r) )
-  {}
-
-  string code() const {
-    return _index->first;
-  }
-
-  string name() const {
-    if ( _index->second.empty() )
-      {
-        string ret( _("Unknown language: ") );
-        ret += "'";
-        ret += _index->first;
-        ret += "'";
-        return ret;
-      }
-    return _( _index->second.c_str() );
-  }
-};
-
-ISOLanguage::_D::CodeMap ISOLanguage::_D::_iso639_1_CodeMap;
-ISOLanguage::_D::CodeMap ISOLanguage::_D::_iso639_2_CodeMap;
-ISOLanguage::_D::CodeMap ISOLanguage::_D::_others_CodeMap;
-
-const string ISOLanguage::_D::_noCode( "" );
-const string ISOLanguage::_D::_noName( "Default" );
-
-///////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////
-//
-//
-//     METHOD NAME : ISOLanguage::ISOLanguage
-//     METHOD TYPE : Constructor
-//
-ISOLanguage::ISOLanguage()
-{
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-//     METHOD NAME : ISOLanguage::ISOLanguage
-//     METHOD TYPE : Constructor
-//
-ISOLanguage::ISOLanguage( const std::string & code_r )
-{
-  if ( code_r.size() ) {
-    _d = makeVarPtr( new _D( code_r ) );
-  }
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-//     METHOD NAME : ISOLanguage::~ISOLanguage
-//     METHOD TYPE : Destructor
-//
-ISOLanguage::~ISOLanguage()
-{
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-//     METHOD NAME : ISOLanguage::isSet
-//     METHOD TYPE : bool
-//
-bool ISOLanguage::isSet() const
-{
-  return _d;
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-//     METHOD NAME : ISOLanguage::code
-//     METHOD TYPE : std::string
-//
-std::string ISOLanguage::code() const
-{
-  return _d ? _d->code() : _D::_noCode;
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-//     METHOD NAME : ISOLanguage::name
-//     METHOD TYPE : std::string
-//
-std::string ISOLanguage::name() const
-{
-  return _d ? _d->name() : _D::_noName;
-}
-
-/******************************************************************
-**
-**
-**     FUNCTION NAME : operator<<
-**     FUNCTION TYPE : ostream &
-*/
-ostream & operator<<( ostream & str, const ISOLanguage & obj )
-{
-  return str << obj.code();
-}
-
-///////////////////////////////////////////////////////////////////
-//
-//
-//     METHOD NAME : ISOLanguage::_D::setDefaultCodeMaps
-//     METHOD TYPE : void
-//
-//      http://www.loc.gov/standards/iso639-2/ISO-639-2_values_8bits.txt
-//
-void ISOLanguage::_D::setDefaultCodeMaps( ISOLanguage::_D::CodeMap & iso639_1,
-                                          ISOLanguage::_D::CodeMap & iso639_2,
-                                          ISOLanguage::_D::CodeMap & others )
-{
-  bindtextdomain( TEXTDOMAIN, LOCALEDIR );
-  bind_textdomain_codeset( TEXTDOMAIN, "UTF-8" );
-
-  others["default"] = __( "Default" );
-
-  // language code: aar aa
-  iso639_2["aar"]                   = iso639_1["aa"] = __( "Afar" );
-  // language code: abk ab
-  iso639_2["abk"]                   = iso639_1["ab"] = __( "Abkhazian" );
-  // language code: ace
-  iso639_2["ace"]                                    = __( "Achinese" );
-  // language code: ach
-  iso639_2["ach"]                                    = __( "Acoli" );
-  // language code: ada
-  iso639_2["ada"]                                    = __( "Adangme" );
-  // language code: ady
-  iso639_2["ady"]                                    = __( "Adyghe" );
-  // language code: afa
-  iso639_2["afa"]                                    = __( "Afro-Asiatic (Other)" );
-  // language code: afh
-  iso639_2["afh"]                                    = __( "Afrihili" );
-  // language code: afr af
-  iso639_2["afr"]                   = iso639_1["af"] = __( "Afrikaans" );
-  // language code: ain
-  iso639_2["ain"]                                    = __( "Ainu" );
-  // language code: aka ak
-  iso639_2["aka"]                   = iso639_1["ak"] = __( "Akan" );
-  // language code: akk
-  iso639_2["akk"]                                    = __( "Akkadian" );
-  // language code: alb sqi sq
-  iso639_2["alb"] = iso639_2["sqi"] = iso639_1["sq"] = __( "Albanian" );
-  // language code: ale
-  iso639_2["ale"]                                    = __( "Aleut" );
-  // language code: alg
-  iso639_2["alg"]                                    = __( "Algonquian languages" );
-  // language code: alt
-  iso639_2["alt"]                                    = __( "Southern Altai" );
-  // language code: amh am
-  iso639_2["amh"]                   = iso639_1["am"] = __( "Amharic" );
-  // language code: ang
-  iso639_2["ang"]                                    = __( "English, Old (ca.450-1100)" );
-  // language code: apa
-  iso639_2["apa"]                                    = __( "Apache languages" );
-  // language code: ara ar
-  iso639_2["ara"]                   = iso639_1["ar"] = __( "Arabic" );
-  // language code: arc
-  iso639_2["arc"]                                    = __( "Aramaic" );
-  // language code: arg an
-  iso639_2["arg"]                   = iso639_1["an"] = __( "Aragonese" );
-  // language code: arm hye hy
-  iso639_2["arm"] = iso639_2["hye"] = iso639_1["hy"] = __( "Armenian" );
-  // language code: arn
-  iso639_2["arn"]                                    = __( "Araucanian" );
-  // language code: arp
-  iso639_2["arp"]                                    = __( "Arapaho" );
-  // language code: art
-  iso639_2["art"]                                    = __( "Artificial (Other)" );
-  // language code: arw
-  iso639_2["arw"]                                    = __( "Arawak" );
-  // language code: asm as
-  iso639_2["asm"]                   = iso639_1["as"] = __( "Assamese" );
-  // language code: ast
-  iso639_2["ast"]                                    = __( "Asturian" );
-  // language code: ath
-  iso639_2["ath"]                                    = __( "Athapascan languages" );
-  // language code: aus
-  iso639_2["aus"]                                    = __( "Australian languages" );
-  // language code: ava av
-  iso639_2["ava"]                   = iso639_1["av"] = __( "Avaric" );
-  // language code: ave ae
-  iso639_2["ave"]                   = iso639_1["ae"] = __( "Avestan" );
-  // language code: awa
-  iso639_2["awa"]                                    = __( "Awadhi" );
-  // language code: aym ay
-  iso639_2["aym"]                   = iso639_1["ay"] = __( "Aymara" );
-  // language code: aze az
-  iso639_2["aze"]                   = iso639_1["az"] = __( "Azerbaijani" );
-  // language code: bad
-  iso639_2["bad"]                                    = __( "Banda" );
-  // language code: bai
-  iso639_2["bai"]                                    = __( "Bamileke languages" );
-  // language code: bak ba
-  iso639_2["bak"]                   = iso639_1["ba"] = __( "Bashkir" );
-  // language code: bal
-  iso639_2["bal"]                                    = __( "Baluchi" );
-  // language code: bam bm
-  iso639_2["bam"]                   = iso639_1["bm"] = __( "Bambara" );
-  // language code: ban
-  iso639_2["ban"]                                    = __( "Balinese" );
-  // language code: baq eus eu
-  iso639_2["baq"] = iso639_2["eus"] = iso639_1["eu"] = __( "Basque" );
-  // language code: bas
-  iso639_2["bas"]                                    = __( "Basa" );
-  // language code: bat
-  iso639_2["bat"]                                    = __( "Baltic (Other)" );
-  // language code: bej
-  iso639_2["bej"]                                    = __( "Beja" );
-  // language code: bel be
-  iso639_2["bel"]                   = iso639_1["be"] = __( "Belarusian" );
-  // language code: bem
-  iso639_2["bem"]                                    = __( "Bemba" );
-  // language code: ben bn
-  iso639_2["ben"]                   = iso639_1["bn"] = __( "Bengali" );
-  // language code: ber
-  iso639_2["ber"]                                    = __( "Berber (Other)" );
-  // language code: bho
-  iso639_2["bho"]                                    = __( "Bhojpuri" );
-  // language code: bih bh
-  iso639_2["bih"]                   = iso639_1["bh"] = __( "Bihari" );
-  // language code: bik
-  iso639_2["bik"]                                    = __( "Bikol" );
-  // language code: bin
-  iso639_2["bin"]                                    = __( "Bini" );
-  // language code: bis bi
-  iso639_2["bis"]                   = iso639_1["bi"] = __( "Bislama" );
-  // language code: bla
-  iso639_2["bla"]                                    = __( "Siksika" );
-  // language code: bnt
-  iso639_2["bnt"]                                    = __( "Bantu (Other)" );
-  // language code: bos bs
-  iso639_2["bos"]                   = iso639_1["bs"] = __( "Bosnian" );
-  // language code: bra
-  iso639_2["bra"]                                    = __( "Braj" );
-  // language code: bre br
-  iso639_2["bre"]                   = iso639_1["br"] = __( "Breton" );
-  // language code: btk
-  iso639_2["btk"]                                    = __( "Batak (Indonesia)" );
-  // language code: bua
-  iso639_2["bua"]                                    = __( "Buriat" );
-  // language code: bug
-  iso639_2["bug"]                                    = __( "Buginese" );
-  // language code: bul bg
-  iso639_2["bul"]                   = iso639_1["bg"] = __( "Bulgarian" );
-  // language code: bur mya my
-  iso639_2["bur"] = iso639_2["mya"] = iso639_1["my"] = __( "Burmese" );
-  // language code: byn
-  iso639_2["byn"]                                    = __( "Blin" );
-  // language code: cad
-  iso639_2["cad"]                                    = __( "Caddo" );
-  // language code: cai
-  iso639_2["cai"]                                    = __( "Central American Indian (Other)" );
-  // language code: car
-  iso639_2["car"]                                    = __( "Carib" );
-  // language code: cat ca
-  iso639_2["cat"]                   = iso639_1["ca"] = __( "Catalan" );
-  // language code: cau
-  iso639_2["cau"]                                    = __( "Caucasian (Other)" );
-  // language code: ceb
-  iso639_2["ceb"]                                    = __( "Cebuano" );
-  // language code: cel
-  iso639_2["cel"]                                    = __( "Celtic (Other)" );
-  // language code: cha ch
-  iso639_2["cha"]                   = iso639_1["ch"] = __( "Chamorro" );
-  // language code: chb
-  iso639_2["chb"]                                    = __( "Chibcha" );
-  // language code: che ce
-  iso639_2["che"]                   = iso639_1["ce"] = __( "Chechen" );
-  // language code: chg
-  iso639_2["chg"]                                    = __( "Chagatai" );
-  // language code: chi zho zh
-  iso639_2["chi"] = iso639_2["zho"] = iso639_1["zh"] = __( "Chinese" );
-  // language code: chk
-  iso639_2["chk"]                                    = __( "Chuukese" );
-  // language code: chm
-  iso639_2["chm"]                                    = __( "Mari" );
-  // language code: chn
-  iso639_2["chn"]                                    = __( "Chinook jargon" );
-  // language code: cho
-  iso639_2["cho"]                                    = __( "Choctaw" );
-  // language code: chp
-  iso639_2["chp"]                                    = __( "Chipewyan" );
-  // language code: chr
-  iso639_2["chr"]                                    = __( "Cherokee" );
-  // language code: chu cu
-  iso639_2["chu"]                   = iso639_1["cu"] = __( "Church Slavic" );
-  // language code: chv cv
-  iso639_2["chv"]                   = iso639_1["cv"] = __( "Chuvash" );
-  // language code: chy
-  iso639_2["chy"]                                    = __( "Cheyenne" );
-  // language code: cmc
-  iso639_2["cmc"]                                    = __( "Chamic languages" );
-  // language code: cop
-  iso639_2["cop"]                                    = __( "Coptic" );
-  // language code: cor kw
-  iso639_2["cor"]                   = iso639_1["kw"] = __( "Cornish" );
-  // language code: cos co
-  iso639_2["cos"]                   = iso639_1["co"] = __( "Corsican" );
-  // language code: cpe
-  iso639_2["cpe"]                                    = __( "Creoles and pidgins, English based (Other)" );
-  // language code: cpf
-  iso639_2["cpf"]                                    = __( "Creoles and pidgins, French-based (Other)" );
-  // language code: cpp
-  iso639_2["cpp"]                                    = __( "Creoles and pidgins, Portuguese-based (Other)" );
-  // language code: cre cr
-  iso639_2["cre"]                   = iso639_1["cr"] = __( "Cree" );
-  // language code: crh
-  iso639_2["crh"]                                    = __( "Crimean Tatar" );
-  // language code: crp
-  iso639_2["crp"]                                    = __( "Creoles and pidgins (Other)" );
-  // language code: csb
-  iso639_2["csb"]                                    = __( "Kashubian" );
-  // language code: cus
-  iso639_2["cus"]                                    = __( "Cushitic (Other)" );
-  // language code: cze ces cs
-  iso639_2["cze"] = iso639_2["ces"] = iso639_1["cs"] = __( "Czech" );
-  // language code: dak
-  iso639_2["dak"]                                    = __( "Dakota" );
-  // language code: dan da
-  iso639_2["dan"]                   = iso639_1["da"] = __( "Danish" );
-  // language code: dar
-  iso639_2["dar"]                                    = __( "Dargwa" );
-  // language code: day
-  iso639_2["day"]                                    = __( "Dayak" );
-  // language code: del
-  iso639_2["del"]                                    = __( "Delaware" );
-  // language code: den
-  iso639_2["den"]                                    = __( "Slave (Athapascan)" );
-  // language code: dgr
-  iso639_2["dgr"]                                    = __( "Dogrib" );
-  // language code: din
-  iso639_2["din"]                                    = __( "Dinka" );
-  // language code: div dv
-  iso639_2["div"]                   = iso639_1["dv"] = __( "Divehi" );
-  // language code: doi
-  iso639_2["doi"]                                    = __( "Dogri" );
-  // language code: dra
-  iso639_2["dra"]                                    = __( "Dravidian (Other)" );
-  // language code: dsb
-  iso639_2["dsb"]                                    = __( "Lower Sorbian" );
-  // language code: dua
-  iso639_2["dua"]                                    = __( "Duala" );
-  // language code: dum
-  iso639_2["dum"]                                    = __( "Dutch, Middle (ca.1050-1350)" );
-  // language code: dut nld nl
-  iso639_2["dut"] = iso639_2["nld"] = iso639_1["nl"] = __( "Dutch" );
-  // language code: dyu
-  iso639_2["dyu"]                                    = __( "Dyula" );
-  // language code: dzo dz
-  iso639_2["dzo"]                   = iso639_1["dz"] = __( "Dzongkha" );
-  // language code: efi
-  iso639_2["efi"]                                    = __( "Efik" );
-  // language code: egy
-  iso639_2["egy"]                                    = __( "Egyptian (Ancient)" );
-  // language code: eka
-  iso639_2["eka"]                                    = __( "Ekajuk" );
-  // language code: elx
-  iso639_2["elx"]                                    = __( "Elamite" );
-  // language code: eng en
-  iso639_2["eng"]                   = iso639_1["en"] = __( "English" );
-  // language code: enm
-  iso639_2["enm"]                                    = __( "English, Middle (1100-1500)" );
-  // language code: epo eo
-  iso639_2["epo"]                   = iso639_1["eo"] = __( "Esperanto" );
-  // language code: est et
-  iso639_2["est"]                   = iso639_1["et"] = __( "Estonian" );
-  // language code: ewe ee
-  iso639_2["ewe"]                   = iso639_1["ee"] = __( "Ewe" );
-  // language code: ewo
-  iso639_2["ewo"]                                    = __( "Ewondo" );
-  // language code: fan
-  iso639_2["fan"]                                    = __( "Fang" );
-  // language code: fao fo
-  iso639_2["fao"]                   = iso639_1["fo"] = __( "Faroese" );
-  // language code: fat
-  iso639_2["fat"]                                    = __( "Fanti" );
-  // language code: fij fj
-  iso639_2["fij"]                   = iso639_1["fj"] = __( "Fijian" );
-  // language code: fil
-  iso639_2["fil"]                                    = __( "Filipino" );
-  // language code: fin fi
-  iso639_2["fin"]                   = iso639_1["fi"] = __( "Finnish" );
-  // language code: fiu
-  iso639_2["fiu"]                                    = __( "Finno-Ugrian (Other)" );
-  // language code: fon
-  iso639_2["fon"]                                    = __( "Fon" );
-  // language code: fre fra fr
-  iso639_2["fre"] = iso639_2["fra"] = iso639_1["fr"] = __( "French" );
-  // language code: frm
-  iso639_2["frm"]                                    = __( "French, Middle (ca.1400-1600)" );
-  // language code: fro
-  iso639_2["fro"]                                    = __( "French, Old (842-ca.1400)" );
-  // language code: fry fy
-  iso639_2["fry"]                   = iso639_1["fy"] = __( "Frisian" );
-  // language code: ful ff
-  iso639_2["ful"]                   = iso639_1["ff"] = __( "Fulah" );
-  // language code: fur
-  iso639_2["fur"]                                    = __( "Friulian" );
-  // language code: gaa
-  iso639_2["gaa"]                                    = __( "Ga" );
-  // language code: gay
-  iso639_2["gay"]                                    = __( "Gayo" );
-  // language code: gba
-  iso639_2["gba"]                                    = __( "Gbaya" );
-  // language code: gem
-  iso639_2["gem"]                                    = __( "Germanic (Other)" );
-  // language code: geo kat ka
-  iso639_2["geo"] = iso639_2["kat"] = iso639_1["ka"] = __( "Georgian" );
-  // language code: ger deu de
-  iso639_2["ger"] = iso639_2["deu"] = iso639_1["de"] = __( "German" );
-  // language code: gez
-  iso639_2["gez"]                                    = __( "Geez" );
-  // language code: gil
-  iso639_2["gil"]                                    = __( "Gilbertese" );
-  // language code: gla gd
-  iso639_2["gla"]                   = iso639_1["gd"] = __( "Gaelic" );
-  // language code: gle ga
-  iso639_2["gle"]                   = iso639_1["ga"] = __( "Irish" );
-  // language code: glg gl
-  iso639_2["glg"]                   = iso639_1["gl"] = __( "Galician" );
-  // language code: glv gv
-  iso639_2["glv"]                   = iso639_1["gv"] = __( "Manx" );
-  // language code: gmh
-  iso639_2["gmh"]                                    = __( "German, Middle High (ca.1050-1500)" );
-  // language code: goh
-  iso639_2["goh"]                                    = __( "German, Old High (ca.750-1050)" );
-  // language code: gon
-  iso639_2["gon"]                                    = __( "Gondi" );
-  // language code: gor
-  iso639_2["gor"]                                    = __( "Gorontalo" );
-  // language code: got
-  iso639_2["got"]                                    = __( "Gothic" );
-  // language code: grb
-  iso639_2["grb"]                                    = __( "Grebo" );
-  // language code: grc
-  iso639_2["grc"]                                    = __( "Greek, Ancient (to 1453)" );
-  // language code: gre ell el
-  iso639_2["gre"] = iso639_2["ell"] = iso639_1["el"] = __( "Greek, Modern (1453-)" );
-  // language code: grn gn
-  iso639_2["grn"]                   = iso639_1["gn"] = __( "Guarani" );
-  // language code: guj gu
-  iso639_2["guj"]                   = iso639_1["gu"] = __( "Gujarati" );
-  // language code: gwi
-  iso639_2["gwi"]                                    = __( "Gwich'in" );
-  // language code: hai
-  iso639_2["hai"]                                    = __( "Haida" );
-  // language code: hat ht
-  iso639_2["hat"]                   = iso639_1["ht"] = __( "Haitian" );
-  // language code: hau ha
-  iso639_2["hau"]                   = iso639_1["ha"] = __( "Hausa" );
-  // language code: haw
-  iso639_2["haw"]                                    = __( "Hawaiian" );
-  // language code: heb he
-  iso639_2["heb"]                   = iso639_1["he"] = __( "Hebrew" );
-  // language code: her hz
-  iso639_2["her"]                   = iso639_1["hz"] = __( "Herero" );
-  // language code: hil
-  iso639_2["hil"]                                    = __( "Hiligaynon" );
-  // language code: him
-  iso639_2["him"]                                    = __( "Himachali" );
-  // language code: hin hi
-  iso639_2["hin"]                   = iso639_1["hi"] = __( "Hindi" );
-  // language code: hit
-  iso639_2["hit"]                                    = __( "Hittite" );
-  // language code: hmn
-  iso639_2["hmn"]                                    = __( "Hmong" );
-  // language code: hmo ho
-  iso639_2["hmo"]                   = iso639_1["ho"] = __( "Hiri Motu" );
-  // language code: hsb
-  iso639_2["hsb"]                                    = __( "Upper Sorbian" );
-  // language code: hun hu
-  iso639_2["hun"]                   = iso639_1["hu"] = __( "Hungarian" );
-  // language code: hup
-  iso639_2["hup"]                                    = __( "Hupa" );
-  // language code: iba
-  iso639_2["iba"]                                    = __( "Iban" );
-  // language code: ibo ig
-  iso639_2["ibo"]                   = iso639_1["ig"] = __( "Igbo" );
-  // language code: ice isl is
-  iso639_2["ice"] = iso639_2["isl"] = iso639_1["is"] = __( "Icelandic" );
-  // language code: ido io
-  iso639_2["ido"]                   = iso639_1["io"] = __( "Ido" );
-  // language code: iii ii
-  iso639_2["iii"]                   = iso639_1["ii"] = __( "Sichuan Yi" );
-  // language code: ijo
-  iso639_2["ijo"]                                    = __( "Ijo" );
-  // language code: iku iu
-  iso639_2["iku"]                   = iso639_1["iu"] = __( "Inuktitut" );
-  // language code: ile ie
-  iso639_2["ile"]                   = iso639_1["ie"] = __( "Interlingue" );
-  // language code: ilo
-  iso639_2["ilo"]                                    = __( "Iloko" );
-  // language code: ina ia
-  iso639_2["ina"]                   = iso639_1["ia"] = __( "Interlingua (International Auxiliary Language Association)" );
-  // language code: inc
-  iso639_2["inc"]                                    = __( "Indic (Other)" );
-  // language code: ind id
-  iso639_2["ind"]                   = iso639_1["id"] = __( "Indonesian" );
-  // language code: ine
-  iso639_2["ine"]                                    = __( "Indo-European (Other)" );
-  // language code: inh
-  iso639_2["inh"]                                    = __( "Ingush" );
-  // language code: ipk ik
-  iso639_2["ipk"]                   = iso639_1["ik"] = __( "Inupiaq" );
-  // language code: ira
-  iso639_2["ira"]                                    = __( "Iranian (Other)" );
-  // language code: iro
-  iso639_2["iro"]                                    = __( "Iroquoian languages" );
-  // language code: ita it
-  iso639_2["ita"]                   = iso639_1["it"] = __( "Italian" );
-  // language code: jav jv
-  iso639_2["jav"]                   = iso639_1["jv"] = __( "Javanese" );
-  // language code: jbo
-  iso639_2["jbo"]                                    = __( "Lojban" );
-  // language code: jpn ja
-  iso639_2["jpn"]                   = iso639_1["ja"] = __( "Japanese" );
-  // language code: jpr
-  iso639_2["jpr"]                                    = __( "Judeo-Persian" );
-  // language code: jrb
-  iso639_2["jrb"]                                    = __( "Judeo-Arabic" );
-  // language code: kaa
-  iso639_2["kaa"]                                    = __( "Kara-Kalpak" );
-  // language code: kab
-  iso639_2["kab"]                                    = __( "Kabyle" );
-  // language code: kac
-  iso639_2["kac"]                                    = __( "Kachin" );
-  // language code: kal kl
-  iso639_2["kal"]                   = iso639_1["kl"] = __( "Kalaallisut" );
-  // language code: kam
-  iso639_2["kam"]                                    = __( "Kamba" );
-  // language code: kan kn
-  iso639_2["kan"]                   = iso639_1["kn"] = __( "Kannada" );
-  // language code: kar
-  iso639_2["kar"]                                    = __( "Karen" );
-  // language code: kas ks
-  iso639_2["kas"]                   = iso639_1["ks"] = __( "Kashmiri" );
-  // language code: kau kr
-  iso639_2["kau"]                   = iso639_1["kr"] = __( "Kanuri" );
-  // language code: kaw
-  iso639_2["kaw"]                                    = __( "Kawi" );
-  // language code: kaz kk
-  iso639_2["kaz"]                   = iso639_1["kk"] = __( "Kazakh" );
-  // language code: kbd
-  iso639_2["kbd"]                                    = __( "Kabardian" );
-  // language code: kha
-  iso639_2["kha"]                                    = __( "Khasi" );
-  // language code: khi
-  iso639_2["khi"]                                    = __( "Khoisan (Other)" );
-  // language code: khm km
-  iso639_2["khm"]                   = iso639_1["km"] = __( "Khmer" );
-  // language code: kho
-  iso639_2["kho"]                                    = __( "Khotanese" );
-  // language code: kik ki
-  iso639_2["kik"]                   = iso639_1["ki"] = __( "Kikuyu" );
-  // language code: kin rw
-  iso639_2["kin"]                   = iso639_1["rw"] = __( "Kinyarwanda" );
-  // language code: kir ky
-  iso639_2["kir"]                   = iso639_1["ky"] = __( "Kirghiz" );
-  // language code: kmb
-  iso639_2["kmb"]                                    = __( "Kimbundu" );
-  // language code: kok
-  iso639_2["kok"]                                    = __( "Konkani" );
-  // language code: kom kv
-  iso639_2["kom"]                   = iso639_1["kv"] = __( "Komi" );
-  // language code: kon kg
-  iso639_2["kon"]                   = iso639_1["kg"] = __( "Kongo" );
-  // language code: kor ko
-  iso639_2["kor"]                   = iso639_1["ko"] = __( "Korean" );
-  // language code: kos
-  iso639_2["kos"]                                    = __( "Kosraean" );
-  // language code: kpe
-  iso639_2["kpe"]                                    = __( "Kpelle" );
-  // language code: krc
-  iso639_2["krc"]                                    = __( "Karachay-Balkar" );
-  // language code: kro
-  iso639_2["kro"]                                    = __( "Kru" );
-  // language code: kru
-  iso639_2["kru"]                                    = __( "Kurukh" );
-  // language code: kua kj
-  iso639_2["kua"]                   = iso639_1["kj"] = __( "Kuanyama" );
-  // language code: kum
-  iso639_2["kum"]                                    = __( "Kumyk" );
-  // language code: kur ku
-  iso639_2["kur"]                   = iso639_1["ku"] = __( "Kurdish" );
-  // language code: kut
-  iso639_2["kut"]                                    = __( "Kutenai" );
-  // language code: lad
-  iso639_2["lad"]                                    = __( "Ladino" );
-  // language code: lah
-  iso639_2["lah"]                                    = __( "Lahnda" );
-  // language code: lam
-  iso639_2["lam"]                                    = __( "Lamba" );
-  // language code: lao lo
-  iso639_2["lao"]                   = iso639_1["lo"] = __( "Lao" );
-  // language code: lat la
-  iso639_2["lat"]                   = iso639_1["la"] = __( "Latin" );
-  // language code: lav lv
-  iso639_2["lav"]                   = iso639_1["lv"] = __( "Latvian" );
-  // language code: lez
-  iso639_2["lez"]                                    = __( "Lezghian" );
-  // language code: lim li
-  iso639_2["lim"]                   = iso639_1["li"] = __( "Limburgan" );
-  // language code: lin ln
-  iso639_2["lin"]                   = iso639_1["ln"] = __( "Lingala" );
-  // language code: lit lt
-  iso639_2["lit"]                   = iso639_1["lt"] = __( "Lithuanian" );
-  // language code: lol
-  iso639_2["lol"]                                    = __( "Mongo" );
-  // language code: loz
-  iso639_2["loz"]                                    = __( "Lozi" );
-  // language code: ltz lb
-  iso639_2["ltz"]                   = iso639_1["lb"] = __( "Luxembourgish" );
-  // language code: lua
-  iso639_2["lua"]                                    = __( "Luba-Lulua" );
-  // language code: lub lu
-  iso639_2["lub"]                   = iso639_1["lu"] = __( "Luba-Katanga" );
-  // language code: lug lg
-  iso639_2["lug"]                   = iso639_1["lg"] = __( "Ganda" );
-  // language code: lui
-  iso639_2["lui"]                                    = __( "Luiseno" );
-  // language code: lun
-  iso639_2["lun"]                                    = __( "Lunda" );
-  // language code: luo
-  iso639_2["luo"]                                    = __( "Luo (Kenya and Tanzania)" );
-  // language code: lus
-  iso639_2["lus"]                                    = __( "lushai" );
-  // language code: mac mkd mk
-  iso639_2["mac"] = iso639_2["mkd"] = iso639_1["mk"] = __( "Macedonian" );
-  // language code: mad
-  iso639_2["mad"]                                    = __( "Madurese" );
-  // language code: mag
-  iso639_2["mag"]                                    = __( "Magahi" );
-  // language code: mah mh
-  iso639_2["mah"]                   = iso639_1["mh"] = __( "Marshallese" );
-  // language code: mai
-  iso639_2["mai"]                                    = __( "Maithili" );
-  // language code: mak
-  iso639_2["mak"]                                    = __( "Makasar" );
-  // language code: mal ml
-  iso639_2["mal"]                   = iso639_1["ml"] = __( "Malayalam" );
-  // language code: man
-  iso639_2["man"]                                    = __( "Mandingo" );
-  // language code: mao mri mi
-  iso639_2["mao"] = iso639_2["mri"] = iso639_1["mi"] = __( "Maori" );
-  // language code: map
-  iso639_2["map"]                                    = __( "Austronesian (Other)" );
-  // language code: mar mr
-  iso639_2["mar"]                   = iso639_1["mr"] = __( "Marathi" );
-  // language code: mas
-  iso639_2["mas"]                                    = __( "Masai" );
-  // language code: may msa ms
-  iso639_2["may"] = iso639_2["msa"] = iso639_1["ms"] = __( "Malay" );
-  // language code: mdf
-  iso639_2["mdf"]                                    = __( "Moksha" );
-  // language code: mdr
-  iso639_2["mdr"]                                    = __( "Mandar" );
-  // language code: men
-  iso639_2["men"]                                    = __( "Mende" );
-  // language code: mga
-  iso639_2["mga"]                                    = __( "Irish, Middle (900-1200)" );
-  // language code: mic
-  iso639_2["mic"]                                    = __( "Mi'kmaq" );
-  // language code: min
-  iso639_2["min"]                                    = __( "Minangkabau" );
-  // language code: mis
-  iso639_2["mis"]                                    = __( "Miscellaneous languages" );
-  // language code: mkh
-  iso639_2["mkh"]                                    = __( "Mon-Khmer (Other)" );
-  // language code: mlg mg
-  iso639_2["mlg"]                   = iso639_1["mg"] = __( "Malagasy" );
-  // language code: mlt mt
-  iso639_2["mlt"]                   = iso639_1["mt"] = __( "Maltese" );
-  // language code: mnc
-  iso639_2["mnc"]                                    = __( "Manchu" );
-  // language code: mni
-  iso639_2["mni"]                                    = __( "Manipuri" );
-  // language code: mno
-  iso639_2["mno"]                                    = __( "Manobo languages" );
-  // language code: moh
-  iso639_2["moh"]                                    = __( "Mohawk" );
-  // language code: mol mo
-  iso639_2["mol"]                   = iso639_1["mo"] = __( "Moldavian" );
-  // language code: mon mn
-  iso639_2["mon"]                   = iso639_1["mn"] = __( "Mongolian" );
-  // language code: mos
-  iso639_2["mos"]                                    = __( "Mossi" );
-  // language code: mul
-  iso639_2["mul"]                                    = __( "Multiple languages" );
-  // language code: mun
-  iso639_2["mun"]                                    = __( "Munda languages" );
-  // language code: mus
-  iso639_2["mus"]                                    = __( "Creek" );
-  // language code: mwl
-  iso639_2["mwl"]                                    = __( "Mirandese" );
-  // language code: mwr
-  iso639_2["mwr"]                                    = __( "Marwari" );
-  // language code: myn
-  iso639_2["myn"]                                    = __( "Mayan languages" );
-  // language code: myv
-  iso639_2["myv"]                                    = __( "Erzya" );
-  // language code: nah
-  iso639_2["nah"]                                    = __( "Nahuatl" );
-  // language code: nai
-  iso639_2["nai"]                                    = __( "North American Indian" );
-  // language code: nap
-  iso639_2["nap"]                                    = __( "Neapolitan" );
-  // language code: nau na
-  iso639_2["nau"]                   = iso639_1["na"] = __( "Nauru" );
-  // language code: nav nv
-  iso639_2["nav"]                   = iso639_1["nv"] = __( "Navajo" );
-  // language code: nbl nr
-  iso639_2["nbl"]                   = iso639_1["nr"] = __( "Ndebele, South" );
-  // language code: nde nd
-  iso639_2["nde"]                   = iso639_1["nd"] = __( "Ndebele, North" );
-  // language code: ndo ng
-  iso639_2["ndo"]                   = iso639_1["ng"] = __( "Ndonga" );
-  // language code: nds
-  iso639_2["nds"]                                    = __( "Low German" );
-  // language code: nep ne
-  iso639_2["nep"]                   = iso639_1["ne"] = __( "Nepali" );
-  // language code: new
-  iso639_2["new"]                                    = __( "Nepal Bhasa" );
-  // language code: nia
-  iso639_2["nia"]                                    = __( "Nias" );
-  // language code: nic
-  iso639_2["nic"]                                    = __( "Niger-Kordofanian (Other)" );
-  // language code: niu
-  iso639_2["niu"]                                    = __( "Niuean" );
-  // language code: nno nn
-  iso639_2["nno"]                   = iso639_1["nn"] = __( "Norwegian Nynorsk" );
-  // language code: nob nb
-  iso639_2["nob"]                   = iso639_1["nb"] = __( "Norwegian Bokmal" );
-  // language code: nog
-  iso639_2["nog"]                                    = __( "Nogai" );
-  // language code: non
-  iso639_2["non"]                                    = __( "Norse, Old" );
-  // language code: nor no
-  iso639_2["nor"]                   = iso639_1["no"] = __( "Norwegian" );
-  // language code: nso
-  iso639_2["nso"]                                    = __( "Northern Sotho" );
-  // language code: nub
-  iso639_2["nub"]                                    = __( "Nubian languages" );
-  // language code: nwc
-  iso639_2["nwc"]                                    = __( "Classical Newari" );
-  // language code: nya ny
-  iso639_2["nya"]                   = iso639_1["ny"] = __( "Chichewa" );
-  // language code: nym
-  iso639_2["nym"]                                    = __( "Nyamwezi" );
-  // language code: nyn
-  iso639_2["nyn"]                                    = __( "Nyankole" );
-  // language code: nyo
-  iso639_2["nyo"]                                    = __( "Nyoro" );
-  // language code: nzi
-  iso639_2["nzi"]                                    = __( "Nzima" );
-  // language code: oci oc
-  iso639_2["oci"]                   = iso639_1["oc"] = __( "Occitan (post 1500)" );
-  // language code: oji oj
-  iso639_2["oji"]                   = iso639_1["oj"] = __( "Ojibwa" );
-  // language code: ori or
-  iso639_2["ori"]                   = iso639_1["or"] = __( "Oriya" );
-  // language code: orm om
-  iso639_2["orm"]                   = iso639_1["om"] = __( "Oromo" );
-  // language code: osa
-  iso639_2["osa"]                                    = __( "Osage" );
-  // language code: oss os
-  iso639_2["oss"]                   = iso639_1["os"] = __( "Ossetian" );
-  // language code: ota
-  iso639_2["ota"]                                    = __( "Turkish, Ottoman (1500-1928)" );
-  // language code: oto
-  iso639_2["oto"]                                    = __( "Otomian languages" );
-  // language code: paa
-  iso639_2["paa"]                                    = __( "Papuan (Other)" );
-  // language code: pag
-  iso639_2["pag"]                                    = __( "Pangasinan" );
-  // language code: pal
-  iso639_2["pal"]                                    = __( "Pahlavi" );
-  // language code: pam
-  iso639_2["pam"]                                    = __( "Pampanga" );
-  // language code: pan pa
-  iso639_2["pan"]                   = iso639_1["pa"] = __( "Panjabi" );
-  // language code: pap
-  iso639_2["pap"]                                    = __( "Papiamento" );
-  // language code: pau
-  iso639_2["pau"]                                    = __( "Palauan" );
-  // language code: peo
-  iso639_2["peo"]                                    = __( "Persian, Old (ca.600-400 B.C.)" );
-  // language code: per fas fa
-  iso639_2["per"] = iso639_2["fas"] = iso639_1["fa"] = __( "Persian" );
-  // language code: phi
-  iso639_2["phi"]                                    = __( "Philippine (Other)" );
-  // language code: phn
-  iso639_2["phn"]                                    = __( "Phoenician" );
-  // language code: pli pi
-  iso639_2["pli"]                   = iso639_1["pi"] = __( "Pali" );
-  // language code: pol pl
-  iso639_2["pol"]                   = iso639_1["pl"] = __( "Polish" );
-  // language code: pon
-  iso639_2["pon"]                                    = __( "Pohnpeian" );
-  // language code: por pt
-  iso639_2["por"]                   = iso639_1["pt"] = __( "Portuguese" );
-  // language code: pra
-  iso639_2["pra"]                                    = __( "Prakrit languages" );
-  // language code: pro
-  iso639_2["pro"]                                    = __( "Provencal, Old (to 1500)" );
-  // language code: pus ps
-  iso639_2["pus"]                   = iso639_1["ps"] = __( "Pushto" );
-  // language code: que qu
-  iso639_2["que"]                   = iso639_1["qu"] = __( "Quechua" );
-  // language code: raj
-  iso639_2["raj"]                                    = __( "Rajasthani" );
-  // language code: rap
-  iso639_2["rap"]                                    = __( "Rapanui" );
-  // language code: rar
-  iso639_2["rar"]                                    = __( "Rarotongan" );
-  // language code: roa
-  iso639_2["roa"]                                    = __( "Romance (Other)" );
-  // language code: roh rm
-  iso639_2["roh"]                   = iso639_1["rm"] = __( "Raeto-Romance" );
-  // language code: rom
-  iso639_2["rom"]                                    = __( "Romany" );
-  // language code: rum ron ro
-  iso639_2["rum"] = iso639_2["ron"] = iso639_1["ro"] = __( "Romanian" );
-  // language code: run rn
-  iso639_2["run"]                   = iso639_1["rn"] = __( "Rundi" );
-  // language code: rus ru
-  iso639_2["rus"]                   = iso639_1["ru"] = __( "Russian" );
-  // language code: sad
-  iso639_2["sad"]                                    = __( "Sandawe" );
-  // language code: sag sg
-  iso639_2["sag"]                   = iso639_1["sg"] = __( "Sango" );
-  // language code: sah
-  iso639_2["sah"]                                    = __( "Yakut" );
-  // language code: sai
-  iso639_2["sai"]                                    = __( "South American Indian (Other)" );
-  // language code: sal
-  iso639_2["sal"]                                    = __( "Salishan languages" );
-  // language code: sam
-  iso639_2["sam"]                                    = __( "Samaritan Aramaic" );
-  // language code: san sa
-  iso639_2["san"]                   = iso639_1["sa"] = __( "Sanskrit" );
-  // language code: sas
-  iso639_2["sas"]                                    = __( "Sasak" );
-  // language code: sat
-  iso639_2["sat"]                                    = __( "Santali" );
-  // language code: scc srp sr
-  iso639_2["scc"] = iso639_2["srp"] = iso639_1["sr"] = __( "Serbian" );
-  // language code: scn
-  iso639_2["scn"]                                    = __( "Sicilian" );
-  // language code: sco
-  iso639_2["sco"]                                    = __( "Scots" );
-  // language code: scr hrv hr
-  iso639_2["scr"] = iso639_2["hrv"] = iso639_1["hr"] = __( "Croatian" );
-  // language code: sel
-  iso639_2["sel"]                                    = __( "Selkup" );
-  // language code: sem
-  iso639_2["sem"]                                    = __( "Semitic (Other)" );
-  // language code: sga
-  iso639_2["sga"]                                    = __( "Irish, Old (to 900)" );
-  // language code: sgn
-  iso639_2["sgn"]                                    = __( "Sign Languages" );
-  // language code: shn
-  iso639_2["shn"]                                    = __( "Shan" );
-  // language code: sid
-  iso639_2["sid"]                                    = __( "Sidamo" );
-  // language code: sin si
-  iso639_2["sin"]                   = iso639_1["si"] = __( "Sinhala" );
-  // language code: sio
-  iso639_2["sio"]                                    = __( "Siouan languages" );
-  // language code: sit
-  iso639_2["sit"]                                    = __( "Sino-Tibetan (Other)" );
-  // language code: sla
-  iso639_2["sla"]                                    = __( "Slavic (Other)" );
-  // language code: slo slk sk
-  iso639_2["slo"] = iso639_2["slk"] = iso639_1["sk"] = __( "Slovak" );
-  // language code: slv sl
-  iso639_2["slv"]                   = iso639_1["sl"] = __( "Slovenian" );
-  // language code: sma
-  iso639_2["sma"]                                    = __( "Southern Sami" );
-  // language code: sme se
-  iso639_2["sme"]                   = iso639_1["se"] = __( "Northern Sami" );
-  // language code: smi
-  iso639_2["smi"]                                    = __( "Sami languages (Other)" );
-  // language code: smj
-  iso639_2["smj"]                                    = __( "Lule Sami" );
-  // language code: smn
-  iso639_2["smn"]                                    = __( "Inari Sami" );
-  // language code: smo sm
-  iso639_2["smo"]                   = iso639_1["sm"] = __( "Samoan" );
-  // language code: sms
-  iso639_2["sms"]                                    = __( "Skolt Sami" );
-  // language code: sna sn
-  iso639_2["sna"]                   = iso639_1["sn"] = __( "Shona" );
-  // language code: snd sd
-  iso639_2["snd"]                   = iso639_1["sd"] = __( "Sindhi" );
-  // language code: snk
-  iso639_2["snk"]                                    = __( "Soninke" );
-  // language code: sog
-  iso639_2["sog"]                                    = __( "Sogdian" );
-  // language code: som so
-  iso639_2["som"]                   = iso639_1["so"] = __( "Somali" );
-  // language code: son
-  iso639_2["son"]                                    = __( "Songhai" );
-  // language code: sot st
-  iso639_2["sot"]                   = iso639_1["st"] = __( "Sotho, Southern" );
-  // language code: spa es
-  iso639_2["spa"]                   = iso639_1["es"] = __( "Spanish" );
-  // language code: srd sc
-  iso639_2["srd"]                   = iso639_1["sc"] = __( "Sardinian" );
-  // language code: srr
-  iso639_2["srr"]                                    = __( "Serer" );
-  // language code: ssa
-  iso639_2["ssa"]                                    = __( "Nilo-Saharan (Other)" );
-  // language code: ssw ss
-  iso639_2["ssw"]                   = iso639_1["ss"] = __( "Swati" );
-  // language code: suk
-  iso639_2["suk"]                                    = __( "Sukuma" );
-  // language code: sun su
-  iso639_2["sun"]                   = iso639_1["su"] = __( "Sundanese" );
-  // language code: sus
-  iso639_2["sus"]                                    = __( "Susu" );
-  // language code: sux
-  iso639_2["sux"]                                    = __( "Sumerian" );
-  // language code: swa sw
-  iso639_2["swa"]                   = iso639_1["sw"] = __( "Swahili" );
-  // language code: swe sv
-  iso639_2["swe"]                   = iso639_1["sv"] = __( "Swedish" );
-  // language code: syr
-  iso639_2["syr"]                                    = __( "Syriac" );
-  // language code: tah ty
-  iso639_2["tah"]                   = iso639_1["ty"] = __( "Tahitian" );
-  // language code: tai
-  iso639_2["tai"]                                    = __( "Tai (Other)" );
-  // language code: tam ta
-  iso639_2["tam"]                   = iso639_1["ta"] = __( "Tamil" );
-  // language code: tat tt
-  iso639_2["tat"]                   = iso639_1["tt"] = __( "Tatar" );
-  // language code: tel te
-  iso639_2["tel"]                   = iso639_1["te"] = __( "Telugu" );
-  // language code: tem
-  iso639_2["tem"]                                    = __( "Timne" );
-  // language code: ter
-  iso639_2["ter"]                                    = __( "Tereno" );
-  // language code: tet
-  iso639_2["tet"]                                    = __( "Tetum" );
-  // language code: tgk tg
-  iso639_2["tgk"]                   = iso639_1["tg"] = __( "Tajik" );
-  // language code: tgl tl
-  iso639_2["tgl"]                   = iso639_1["tl"] = __( "Tagalog" );
-  // language code: tha th
-  iso639_2["tha"]                   = iso639_1["th"] = __( "Thai" );
-  // language code: tib bod bo
-  iso639_2["tib"] = iso639_2["bod"] = iso639_1["bo"] = __( "Tibetan" );
-  // language code: tig
-  iso639_2["tig"]                                    = __( "Tigre" );
-  // language code: tir ti
-  iso639_2["tir"]                   = iso639_1["ti"] = __( "Tigrinya" );
-  // language code: tiv
-  iso639_2["tiv"]                                    = __( "Tiv" );
-  // language code: tkl
-  iso639_2["tkl"]                                    = __( "Tokelau" );
-  // language code: tlh
-  iso639_2["tlh"]                                    = __( "Klingon" );
-  // language code: tli
-  iso639_2["tli"]                                    = __( "Tlingit" );
-  // language code: tmh
-  iso639_2["tmh"]                                    = __( "Tamashek" );
-  // language code: tog
-  iso639_2["tog"]                                    = __( "Tonga (Nyasa)" );
-  // language code: ton to
-  iso639_2["ton"]                   = iso639_1["to"] = __( "Tonga (Tonga Islands)" );
-  // language code: tpi
-  iso639_2["tpi"]                                    = __( "Tok Pisin" );
-  // language code: tsi
-  iso639_2["tsi"]                                    = __( "Tsimshian" );
-  // language code: tsn tn
-  iso639_2["tsn"]                   = iso639_1["tn"] = __( "Tswana" );
-  // language code: tso ts
-  iso639_2["tso"]                   = iso639_1["ts"] = __( "Tsonga" );
-  // language code: tuk tk
-  iso639_2["tuk"]                   = iso639_1["tk"] = __( "Turkmen" );
-  // language code: tum
-  iso639_2["tum"]                                    = __( "Tumbuka" );
-  // language code: tup
-  iso639_2["tup"]                                    = __( "Tupi languages" );
-  // language code: tur tr
-  iso639_2["tur"]                   = iso639_1["tr"] = __( "Turkish" );
-  // language code: tut
-  iso639_2["tut"]                                    = __( "Altaic (Other)" );
-  // language code: tvl
-  iso639_2["tvl"]                                    = __( "Tuvalu" );
-  // language code: twi tw
-  iso639_2["twi"]                   = iso639_1["tw"] = __( "Twi" );
-  // language code: tyv
-  iso639_2["tyv"]                                    = __( "Tuvinian" );
-  // language code: udm
-  iso639_2["udm"]                                    = __( "Udmurt" );
-  // language code: uga
-  iso639_2["uga"]                                    = __( "Ugaritic" );
-  // language code: uig ug
-  iso639_2["uig"]                   = iso639_1["ug"] = __( "Uighur" );
-  // language code: ukr uk
-  iso639_2["ukr"]                   = iso639_1["uk"] = __( "Ukrainian" );
-  // language code: umb
-  iso639_2["umb"]                                    = __( "Umbundu" );
-  // language code: und
-  iso639_2["und"]                                    = __( "Undetermined" );
-  // language code: urd ur
-  iso639_2["urd"]                   = iso639_1["ur"] = __( "Urdu" );
-  // language code: uzb uz
-  iso639_2["uzb"]                   = iso639_1["uz"] = __( "Uzbek" );
-  // language code: vai
-  iso639_2["vai"]                                    = __( "Vai" );
-  // language code: ven ve
-  iso639_2["ven"]                   = iso639_1["ve"] = __( "Venda" );
-  // language code: vie vi
-  iso639_2["vie"]                   = iso639_1["vi"] = __( "Vietnamese" );
-  // language code: vol vo
-  iso639_2["vol"]                   = iso639_1["vo"] = __( "Volapuk" );
-  // language code: vot
-  iso639_2["vot"]                                    = __( "Votic" );
-  // language code: wak
-  iso639_2["wak"]                                    = __( "Wakashan languages" );
-  // language code: wal
-  iso639_2["wal"]                                    = __( "Walamo" );
-  // language code: war
-  iso639_2["war"]                                    = __( "Waray" );
-  // language code: was
-  iso639_2["was"]                                    = __( "Washo" );
-  // language code: wel cym cy
-  iso639_2["wel"] = iso639_2["cym"] = iso639_1["cy"] = __( "Welsh" );
-  // language code: wen
-  iso639_2["wen"]                                    = __( "Sorbian languages" );
-  // language code: wln wa
-  iso639_2["wln"]                   = iso639_1["wa"] = __( "Walloon" );
-  // language code: wol wo
-  iso639_2["wol"]                   = iso639_1["wo"] = __( "Wolof" );
-  // language code: xal
-  iso639_2["xal"]                                    = __( "Kalmyk" );
-  // language code: xho xh
-  iso639_2["xho"]                   = iso639_1["xh"] = __( "Xhosa" );
-  // language code: yao
-  iso639_2["yao"]                                    = __( "Yao" );
-  // language code: yap
-  iso639_2["yap"]                                    = __( "Yapese" );
-  // language code: yid yi
-  iso639_2["yid"]                   = iso639_1["yi"] = __( "Yiddish" );
-  // language code: yor yo
-  iso639_2["yor"]                   = iso639_1["yo"] = __( "Yoruba" );
-  // language code: ypk
-  iso639_2["ypk"]                                    = __( "Yupik languages" );
-  // language code: zap
-  iso639_2["zap"]                                    = __( "Zapotec" );
-  // language code: zen
-  iso639_2["zen"]                                    = __( "Zenaga" );
-  // language code: zha za
-  iso639_2["zha"]                   = iso639_1["za"] = __( "Zhuang" );
-  // language code: znd
-  iso639_2["znd"]                                    = __( "Zande" );
-  // language code: zul zu
-  iso639_2["zul"]                   = iso639_1["zu"] = __( "Zulu" );
-  // language code: zun
-  iso639_2["zun"]                                    = __( "Zuni" );
-}
diff --git a/zypp/@Review/ISOLanguage.h b/zypp/@Review/ISOLanguage.h
deleted file mode 100644 (file)
index 6b7c498..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-/*---------------------------------------------------------------------\
-|                                                                      |
-|                      __   __    ____ _____ ____                      |
-|                      \ \ / /_ _/ ___|_   _|___ \                     |
-|                       \ V / _` \___ \ | |   __) |                    |
-|                        | | (_| |___) || |  / __/                     |
-|                        |_|\__,_|____/ |_| |_____|                    |
-|                                                                      |
-|                               core system                            |
-|                                                    (C) SuSE Linux AG |
-\----------------------------------------------------------------------/
-
-  File:       ISOLanguage.h
-
-  Author:     Michael Andres <ma@suse.de>
-  Maintainer: Michael Andres <ma@suse.de>
-
-  Purpose:
-
-/-*/
-#ifndef ISOLanguage_h
-#define ISOLanguage_h
-
-#include <iosfwd>
-#include <string>
-
-#include <y2util/Rep.h>
-
-///////////////////////////////////////////////////////////////////
-//
-//     CLASS NAME : ISOLanguage
-/**
- *
- **/
-class ISOLanguage {
-
-  private:
-
-    struct _D;
-    VarPtr<_D> _d;
-
-  public:
-
-    ISOLanguage();
-    explicit ISOLanguage( const std::string & code_r );
-    ~ISOLanguage();
-
-    bool isSet() const;
-
-    std::string code() const;
-    std::string name() const;
-};
-
-///////////////////////////////////////////////////////////////////
-
-std::ostream & operator<<( std::ostream & str, const ISOLanguage & obj );
-
-///////////////////////////////////////////////////////////////////
-
-inline bool operator==( const ISOLanguage & lhs, const ISOLanguage & rhs ) {
-  return( lhs.code() == rhs.code() );
-}
-inline bool operator==( const std::string & lhs, const ISOLanguage & rhs ) {
-  return( lhs == rhs.code() );
-}
-inline bool operator==( const ISOLanguage & lhs, const std::string & rhs ) {
-  return( lhs.code() == rhs );
-}
-
-inline bool operator!=( const ISOLanguage & lhs, const ISOLanguage & rhs ) {
-  return( ! operator==( lhs, rhs ) );
-}
-inline bool operator!=( const std::string & lhs, const ISOLanguage & rhs ) {
-  return( ! operator==( lhs, rhs ) );
-}
-inline bool operator!=( const ISOLanguage & lhs, const std::string & rhs ) {
-  return( ! operator==( lhs, rhs ) );
-}
-
-///////////////////////////////////////////////////////////////////
-
-namespace std {
-  template<>
-    inline bool less<ISOLanguage>::operator()( const ISOLanguage & lhs,
-                                               const ISOLanguage & rhs ) const
-    {
-      return( lhs.code() < rhs.code() );
-    }
-}
-
-///////////////////////////////////////////////////////////////////
-
-#endif // ISOLanguage_h