Author: matz Date: Thu Mar 20 02:52:35 2008 New Revision: 9219 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9219&view=rev Log: Let's not waste code-size for called-once functions, these are nontrivial accessors. Modified: trunk/libzypp/zypp/CountryCode.cc trunk/libzypp/zypp/LanguageCode.cc Modified: trunk/libzypp/zypp/CountryCode.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CountryCode.cc?rev=9219&r1=9218&r2=9219&view=diff ============================================================================== --- trunk/libzypp/zypp/CountryCode.cc (original) +++ trunk/libzypp/zypp/CountryCode.cc Thu Mar 20 02:52:35 2008 @@ -214,247 +214,260 @@ // Defined CountryCode constants others[""] = N_( "No Code" ); - iso3166["AD"] = N_( "Andorra" ); // :AND:020: - iso3166["AE"] = N_( "United Arab Emirates" ); // :ARE:784: - iso3166["AF"] = N_( "Afghanistan" ); // :AFG:004: - iso3166["AG"] = N_( "Antigua and Barbuda" ); // :ATG:028: - iso3166["AI"] = N_( "Anguilla" ); // :AIA:660: - iso3166["AL"] = N_( "Albania" ); // :ALB:008: - iso3166["AM"] = N_( "Armenia" ); // :ARM:051: - iso3166["AN"] = N_( "Netherlands Antilles" ); // :ANT:530: - iso3166["AO"] = N_( "Angola" ); // :AGO:024: - iso3166["AQ"] = N_( "Antarctica" ); // :ATA:010: - iso3166["AR"] = N_( "Argentina" ); // :ARG:032: - iso3166["AS"] = N_( "American Samoa" ); // :ASM:016: - iso3166["AT"] = N_( "Austria" ); // :AUT:040: - iso3166["AU"] = N_( "Australia" ); // :AUS:036: - iso3166["AW"] = N_( "Aruba" ); // :ABW:533: - iso3166["AX"] = N_( "Aland Islands" ); // :ALA:248: - iso3166["AZ"] = N_( "Azerbaijan" ); // :AZE:031: - iso3166["BA"] = N_( "Bosnia and Herzegovina" ); // :BIH:070: - iso3166["BB"] = N_( "Barbados" ); // :BRB:052: - iso3166["BD"] = N_( "Bangladesh" ); // :BGD:050: - iso3166["BE"] = N_( "Belgium" ); // :BEL:056: - iso3166["BF"] = N_( "Burkina Faso" ); // :BFA:854: - iso3166["BG"] = N_( "Bulgaria" ); // :BGR:100: - iso3166["BH"] = N_( "Bahrain" ); // :BHR:048: - iso3166["BI"] = N_( "Burundi" ); // :BDI:108: - iso3166["BJ"] = N_( "Benin" ); // :BEN:204: - iso3166["BM"] = N_( "Bermuda" ); // :BMU:060: - iso3166["BN"] = N_( "Brunei Darussalam" ); // :BRN:096: - iso3166["BO"] = N_( "Bolivia" ); // :BOL:068: - iso3166["BR"] = N_( "Brazil" ); // :BRA:076: - iso3166["BS"] = N_( "Bahamas" ); // :BHS:044: - iso3166["BT"] = N_( "Bhutan" ); // :BTN:064: - iso3166["BV"] = N_( "Bouvet Island" ); // :BVT:074: - iso3166["BW"] = N_( "Botswana" ); // :BWA:072: - iso3166["BY"] = N_( "Belarus" ); // :BLR:112: - iso3166["BZ"] = N_( "Belize" ); // :BLZ:084: - iso3166["CA"] = N_( "Canada" ); // :CAN:124: - iso3166["CC"] = N_( "Cocos (Keeling) Islands" ); // :CCK:166: - iso3166["CD"] = N_( "Congo" ); // :COD:180: - iso3166["CF"] = N_( "Central African Republic" ); // :CAF:140: - iso3166["CG"] = N_( "Congo" ); // :COG:178: - iso3166["CH"] = N_( "Switzerland" ); // :CHE:756: - iso3166["CI"] = N_( "Cote D'Ivoire" ); // :CIV:384: - iso3166["CK"] = N_( "Cook Islands" ); // :COK:184: - iso3166["CL"] = N_( "Chile" ); // :CHL:152: - iso3166["CM"] = N_( "Cameroon" ); // :CMR:120: - iso3166["CN"] = N_( "China" ); // :CHN:156: - iso3166["CO"] = N_( "Colombia" ); // :COL:170: - iso3166["CR"] = N_( "Costa Rica" ); // :CRI:188: - iso3166["CS"] = N_( "Serbia and Montenegro" ); // :SCG:891: - iso3166["CU"] = N_( "Cuba" ); // :CUB:192: - iso3166["CV"] = N_( "Cape Verde" ); // :CPV:132: - iso3166["CX"] = N_( "Christmas Island" ); // :CXR:162: - iso3166["CY"] = N_( "Cyprus" ); // :CYP:196: - iso3166["CZ"] = N_( "Czech Republic" ); // :CZE:203: - iso3166["DE"] = N_( "Germany" ); // :DEU:276: - iso3166["DJ"] = N_( "Djibouti" ); // :DJI:262: - iso3166["DK"] = N_( "Denmark" ); // :DNK:208: - iso3166["DM"] = N_( "Dominica" ); // :DMA:212: - iso3166["DO"] = N_( "Dominican Republic" ); // :DOM:214: - iso3166["DZ"] = N_( "Algeria" ); // :DZA:012: - iso3166["EC"] = N_( "Ecuador" ); // :ECU:218: - iso3166["EE"] = N_( "Estonia" ); // :EST:233: - iso3166["EG"] = N_( "Egypt" ); // :EGY:818: - iso3166["EH"] = N_( "Western Sahara" ); // :ESH:732: - iso3166["ER"] = N_( "Eritrea" ); // :ERI:232: - iso3166["ES"] = N_( "Spain" ); // :ESP:724: - iso3166["ET"] = N_( "Ethiopia" ); // :ETH:231: - iso3166["FI"] = N_( "Finland" ); // :FIN:246: - iso3166["FJ"] = N_( "Fiji" ); // :FJI:242: - iso3166["FK"] = N_( "Falkland Islands (Malvinas)" ); // :FLK:238: - iso3166["FM"] = N_( "Federated States of Micronesia" ); // :FSM:583: - iso3166["FO"] = N_( "Faroe Islands" ); // :FRO:234: - iso3166["FR"] = N_( "France" ); // :FRA:250: - iso3166["FX"] = N_( "Metropolitan France" ); // :FXX:249: - iso3166["GA"] = N_( "Gabon" ); // :GAB:266: - iso3166["GB"] = N_( "United Kingdom" ); // :GBR:826: - iso3166["GD"] = N_( "Grenada" ); // :GRD:308: - iso3166["GE"] = N_( "Georgia" ); // :GEO:268: - iso3166["GF"] = N_( "French Guiana" ); // :GUF:254: - iso3166["GH"] = N_( "Ghana" ); // :GHA:288: - iso3166["GI"] = N_( "Gibraltar" ); // :GIB:292: - iso3166["GL"] = N_( "Greenland" ); // :GRL:304: - iso3166["GM"] = N_( "Gambia" ); // :GMB:270: - iso3166["GN"] = N_( "Guinea" ); // :GIN:324: - iso3166["GP"] = N_( "Guadeloupe" ); // :GLP:312: - iso3166["GQ"] = N_( "Equatorial Guinea" ); // :GNQ:226: - iso3166["GR"] = N_( "Greece" ); // :GRC:300: - iso3166["GS"] = N_( "South Georgia and the South Sandwich Islands" ); // :SGS:239: - iso3166["GT"] = N_( "Guatemala" ); // :GTM:320: - iso3166["GU"] = N_( "Guam" ); // :GUM:316: - iso3166["GW"] = N_( "Guinea-Bissau" ); // :GNB:624: - iso3166["GY"] = N_( "Guyana" ); // :GUY:328: - iso3166["HK"] = N_( "Hong Kong" ); // :HKG:344: - iso3166["HM"] = N_( "Heard Island and McDonald Islands" ); // :HMD:334: - iso3166["HN"] = N_( "Honduras" ); // :HND:340: - iso3166["HR"] = N_( "Croatia" ); // :HRV:191: - iso3166["HT"] = N_( "Haiti" ); // :HTI:332: - iso3166["HU"] = N_( "Hungary" ); // :HUN:348: - iso3166["ID"] = N_( "Indonesia" ); // :IDN:360: - iso3166["IE"] = N_( "Ireland" ); // :IRL:372: - iso3166["IL"] = N_( "Israel" ); // :ISR:376: - iso3166["IN"] = N_( "India" ); // :IND:356: - iso3166["IO"] = N_( "British Indian Ocean Territory" ); // :IOT:086: - iso3166["IQ"] = N_( "Iraq" ); // :IRQ:368: - iso3166["IR"] = N_( "Iran" ); // :IRN:364: - iso3166["IS"] = N_( "Iceland" ); // :ISL:352: - iso3166["IT"] = N_( "Italy" ); // :ITA:380: - iso3166["JM"] = N_( "Jamaica" ); // :JAM:388: - iso3166["JO"] = N_( "Jordan" ); // :JOR:400: - iso3166["JP"] = N_( "Japan" ); // :JPN:392: - iso3166["KE"] = N_( "Kenya" ); // :KEN:404: - iso3166["KG"] = N_( "Kyrgyzstan" ); // :KGZ:417: - iso3166["KH"] = N_( "Cambodia" ); // :KHM:116: - iso3166["KI"] = N_( "Kiribati" ); // :KIR:296: - iso3166["KM"] = N_( "Comoros" ); // :COM:174: - iso3166["KN"] = N_( "Saint Kitts and Nevis" ); // :KNA:659: - iso3166["KP"] = N_( "North Korea" ); // :PRK:408: - iso3166["KR"] = N_( "South Korea" ); // :KOR:410: - iso3166["KW"] = N_( "Kuwait" ); // :KWT:414: - iso3166["KY"] = N_( "Cayman Islands" ); // :CYM:136: - iso3166["KZ"] = N_( "Kazakhstan" ); // :KAZ:398: - iso3166["LA"] = N_( "Lao People's Democratic Republic" ); // :LAO:418: - iso3166["LB"] = N_( "Lebanon" ); // :LBN:422: - iso3166["LC"] = N_( "Saint Lucia" ); // :LCA:662: - iso3166["LI"] = N_( "Liechtenstein" ); // :LIE:438: - iso3166["LK"] = N_( "Sri Lanka" ); // :LKA:144: - iso3166["LR"] = N_( "Liberia" ); // :LBR:430: - iso3166["LS"] = N_( "Lesotho" ); // :LSO:426: - iso3166["LT"] = N_( "Lithuania" ); // :LTU:440: - iso3166["LU"] = N_( "Luxembourg" ); // :LUX:442: - iso3166["LV"] = N_( "Latvia" ); // :LVA:428: - iso3166["LY"] = N_( "Libya" ); // :LBY:434: - iso3166["MA"] = N_( "Morocco" ); // :MAR:504: - iso3166["MC"] = N_( "Monaco" ); // :MCO:492: - iso3166["MD"] = N_( "Moldova" ); // :MDA:498: - iso3166["MG"] = N_( "Madagascar" ); // :MDG:450: - iso3166["MH"] = N_( "Marshall Islands" ); // :MHL:584: - iso3166["MK"] = N_( "Macedonia" ); // :MKD:807: - iso3166["ML"] = N_( "Mali" ); // :MLI:466: - iso3166["MM"] = N_( "Myanmar" ); // :MMR:104: - iso3166["MN"] = N_( "Mongolia" ); // :MNG:496: - iso3166["MO"] = N_( "Macao" ); // :MAC:446: - iso3166["MP"] = N_( "Northern Mariana Islands" ); // :MNP:580: - iso3166["MQ"] = N_( "Martinique" ); // :MTQ:474: - iso3166["MR"] = N_( "Mauritania" ); // :MRT:478: - iso3166["MS"] = N_( "Montserrat" ); // :MSR:500: - iso3166["MT"] = N_( "Malta" ); // :MLT:470: - iso3166["MU"] = N_( "Mauritius" ); // :MUS:480: - iso3166["MV"] = N_( "Maldives" ); // :MDV:462: - iso3166["MW"] = N_( "Malawi" ); // :MWI:454: - iso3166["MX"] = N_( "Mexico" ); // :MEX:484: - iso3166["MY"] = N_( "Malaysia" ); // :MYS:458: - iso3166["MZ"] = N_( "Mozambique" ); // :MOZ:508: - iso3166["NA"] = N_( "Namibia" ); // :NAM:516: - iso3166["NC"] = N_( "New Caledonia" ); // :NCL:540: - iso3166["NE"] = N_( "Niger" ); // :NER:562: - iso3166["NF"] = N_( "Norfolk Island" ); // :NFK:574: - iso3166["NG"] = N_( "Nigeria" ); // :NGA:566: - iso3166["NI"] = N_( "Nicaragua" ); // :NIC:558: - iso3166["NL"] = N_( "Netherlands" ); // :NLD:528: - iso3166["NO"] = N_( "Norway" ); // :NOR:578: - iso3166["NP"] = N_( "Nepal" ); // :NPL:524: - iso3166["NR"] = N_( "Nauru" ); // :NRU:520: - iso3166["NU"] = N_( "Niue" ); // :NIU:570: - iso3166["NZ"] = N_( "New Zealand" ); // :NZL:554: - iso3166["OM"] = N_( "Oman" ); // :OMN:512: - iso3166["PA"] = N_( "Panama" ); // :PAN:591: - iso3166["PE"] = N_( "Peru" ); // :PER:604: - iso3166["PF"] = N_( "French Polynesia" ); // :PYF:258: - iso3166["PG"] = N_( "Papua New Guinea" ); // :PNG:598: - iso3166["PH"] = N_( "Philippines" ); // :PHL:608: - iso3166["PK"] = N_( "Pakistan" ); // :PAK:586: - iso3166["PL"] = N_( "Poland" ); // :POL:616: - iso3166["PM"] = N_( "Saint Pierre and Miquelon" ); // :SPM:666: - iso3166["PN"] = N_( "Pitcairn" ); // :PCN:612: - iso3166["PR"] = N_( "Puerto Rico" ); // :PRI:630: - iso3166["PS"] = N_( "Palestinian Territory" ); // :PSE:275: - iso3166["PT"] = N_( "Portugal" ); // :PRT:620: - iso3166["PW"] = N_( "Palau" ); // :PLW:585: - iso3166["PY"] = N_( "Paraguay" ); // :PRY:600: - iso3166["QA"] = N_( "Qatar" ); // :QAT:634: - iso3166["RE"] = N_( "Reunion" ); // :REU:638: - iso3166["RO"] = N_( "Romania" ); // :ROU:642: - iso3166["RU"] = N_( "Russian Federation" ); // :RUS:643: - iso3166["RW"] = N_( "Rwanda" ); // :RWA:646: - iso3166["SA"] = N_( "Saudi Arabia" ); // :SAU:682: - iso3166["SB"] = N_( "Solomon Islands" ); // :SLB:090: - iso3166["SC"] = N_( "Seychelles" ); // :SYC:690: - iso3166["SD"] = N_( "Sudan" ); // :SDN:736: - iso3166["SE"] = N_( "Sweden" ); // :SWE:752: - iso3166["SG"] = N_( "Singapore" ); // :SGP:702: - iso3166["SH"] = N_( "Saint Helena" ); // :SHN:654: - iso3166["SI"] = N_( "Slovenia" ); // :SVN:705: - iso3166["SJ"] = N_( "Svalbard and Jan Mayen" ); // :SJM:744: - iso3166["SK"] = N_( "Slovakia" ); // :SVK:703: - iso3166["SL"] = N_( "Sierra Leone" ); // :SLE:694: - iso3166["SM"] = N_( "San Marino" ); // :SMR:674: - iso3166["SN"] = N_( "Senegal" ); // :SEN:686: - iso3166["SO"] = N_( "Somalia" ); // :SOM:706: - iso3166["SR"] = N_( "Suriname" ); // :SUR:740: - iso3166["ST"] = N_( "Sao Tome and Principe" ); // :STP:678: - iso3166["SV"] = N_( "El Salvador" ); // :SLV:222: - iso3166["SY"] = N_( "Syria" ); // :SYR:760: - iso3166["SZ"] = N_( "Swaziland" ); // :SWZ:748: - iso3166["TC"] = N_( "Turks and Caicos Islands" ); // :TCA:796: - iso3166["TD"] = N_( "Chad" ); // :TCD:148: - iso3166["TF"] = N_( "French Southern Territories" ); // :ATF:260: - iso3166["TG"] = N_( "Togo" ); // :TGO:768: - iso3166["TH"] = N_( "Thailand" ); // :THA:764: - iso3166["TJ"] = N_( "Tajikistan" ); // :TJK:762: - iso3166["TK"] = N_( "Tokelau" ); // :TKL:772: - iso3166["TM"] = N_( "Turkmenistan" ); // :TKM:795: - iso3166["TN"] = N_( "Tunisia" ); // :TUN:788: - iso3166["TO"] = N_( "Tonga" ); // :TON:776: - iso3166["TL"] = N_( "East Timor" ); // :TLS:626: - iso3166["TR"] = N_( "Turkey" ); // :TUR:792: - iso3166["TT"] = N_( "Trinidad and Tobago" ); // :TTO:780: - iso3166["TV"] = N_( "Tuvalu" ); // :TUV:798: - iso3166["TW"] = N_( "Taiwan" ); // :TWN:158: - iso3166["TZ"] = N_( "Tanzania" ); // :TZA:834: - iso3166["UA"] = N_( "Ukraine" ); // :UKR:804: - iso3166["UG"] = N_( "Uganda" ); // :UGA:800: - iso3166["UM"] = N_( "United States Minor Outlying Islands" ); // :UMI:581: - iso3166["US"] = N_( "United States" ); // :USA:840: - iso3166["UY"] = N_( "Uruguay" ); // :URY:858: - iso3166["UZ"] = N_( "Uzbekistan" ); // :UZB:860: - iso3166["VA"] = N_( "Holy See (Vatican City State)" ); // :VAT:336: - iso3166["VC"] = N_( "Saint Vincent and the Grenadines" ); // :VCT:670: - iso3166["VE"] = N_( "Venezuela" ); // :VEN:862: - iso3166["VG"] = N_( "British Virgin Islands" ); // :VGB:092: - iso3166["VI"] = N_( "Virgin Islands, U.S." ); // :VIR:850: - iso3166["VN"] = N_( "Vietnam" ); // :VNM:704: - iso3166["VU"] = N_( "Vanuatu" ); // :VUT:548: - iso3166["WF"] = N_( "Wallis and Futuna" ); // :WLF:876: - iso3166["WS"] = N_( "Samoa" ); // :WSM:882: - iso3166["YE"] = N_( "Yemen" ); // :YEM:887: - iso3166["YT"] = N_( "Mayotte" ); // :MYT:175: - iso3166["ZA"] = N_( "South Africa" ); // :ZAF:710: - iso3166["ZM"] = N_( "Zambia" ); // :ZMB:894: - iso3166["ZW"] = N_( "Zimbabwe" ); // :ZWE:716: + struct Init + { + const char *iso3166; + const char *name; + }; + + const Init init[] = { + {"AD", N_( "Andorra" ) }, // :AND:020: + {"AE", N_( "United Arab Emirates" ) }, // :ARE:784: + {"AF", N_( "Afghanistan" ) }, // :AFG:004: + {"AG", N_( "Antigua and Barbuda" ) }, // :ATG:028: + {"AI", N_( "Anguilla" ) }, // :AIA:660: + {"AL", N_( "Albania" ) }, // :ALB:008: + {"AM", N_( "Armenia" ) }, // :ARM:051: + {"AN", N_( "Netherlands Antilles" ) }, // :ANT:530: + {"AO", N_( "Angola" ) }, // :AGO:024: + {"AQ", N_( "Antarctica" ) }, // :ATA:010: + {"AR", N_( "Argentina" ) }, // :ARG:032: + {"AS", N_( "American Samoa" ) }, // :ASM:016: + {"AT", N_( "Austria" ) }, // :AUT:040: + {"AU", N_( "Australia" ) }, // :AUS:036: + {"AW", N_( "Aruba" ) }, // :ABW:533: + {"AX", N_( "Aland Islands" ) }, // :ALA:248: + {"AZ", N_( "Azerbaijan" ) }, // :AZE:031: + {"BA", N_( "Bosnia and Herzegovina" ) }, // :BIH:070: + {"BB", N_( "Barbados" ) }, // :BRB:052: + {"BD", N_( "Bangladesh" ) }, // :BGD:050: + {"BE", N_( "Belgium" ) }, // :BEL:056: + {"BF", N_( "Burkina Faso" ) }, // :BFA:854: + {"BG", N_( "Bulgaria" ) }, // :BGR:100: + {"BH", N_( "Bahrain" ) }, // :BHR:048: + {"BI", N_( "Burundi" ) }, // :BDI:108: + {"BJ", N_( "Benin" ) }, // :BEN:204: + {"BM", N_( "Bermuda" ) }, // :BMU:060: + {"BN", N_( "Brunei Darussalam" ) }, // :BRN:096: + {"BO", N_( "Bolivia" ) }, // :BOL:068: + {"BR", N_( "Brazil" ) }, // :BRA:076: + {"BS", N_( "Bahamas" ) }, // :BHS:044: + {"BT", N_( "Bhutan" ) }, // :BTN:064: + {"BV", N_( "Bouvet Island" ) }, // :BVT:074: + {"BW", N_( "Botswana" ) }, // :BWA:072: + {"BY", N_( "Belarus" ) }, // :BLR:112: + {"BZ", N_( "Belize" ) }, // :BLZ:084: + {"CA", N_( "Canada" ) }, // :CAN:124: + {"CC", N_( "Cocos (Keeling) Islands" ) }, // :CCK:166: + {"CD", N_( "Congo" ) }, // :COD:180: + {"CF", N_( "Central African Republic" ) }, // :CAF:140: + {"CG", N_( "Congo" ) }, // :COG:178: + {"CH", N_( "Switzerland" ) }, // :CHE:756: + {"CI", N_( "Cote D'Ivoire" ) }, // :CIV:384: + {"CK", N_( "Cook Islands" ) }, // :COK:184: + {"CL", N_( "Chile" ) }, // :CHL:152: + {"CM", N_( "Cameroon" ) }, // :CMR:120: + {"CN", N_( "China" ) }, // :CHN:156: + {"CO", N_( "Colombia" ) }, // :COL:170: + {"CR", N_( "Costa Rica" ) }, // :CRI:188: + {"CS", N_( "Serbia and Montenegro" ) }, // :SCG:891: + {"CU", N_( "Cuba" ) }, // :CUB:192: + {"CV", N_( "Cape Verde" ) }, // :CPV:132: + {"CX", N_( "Christmas Island" ) }, // :CXR:162: + {"CY", N_( "Cyprus" ) }, // :CYP:196: + {"CZ", N_( "Czech Republic" ) }, // :CZE:203: + {"DE", N_( "Germany" ) }, // :DEU:276: + {"DJ", N_( "Djibouti" ) }, // :DJI:262: + {"DK", N_( "Denmark" ) }, // :DNK:208: + {"DM", N_( "Dominica" ) }, // :DMA:212: + {"DO", N_( "Dominican Republic" ) }, // :DOM:214: + {"DZ", N_( "Algeria" ) }, // :DZA:012: + {"EC", N_( "Ecuador" ) }, // :ECU:218: + {"EE", N_( "Estonia" ) }, // :EST:233: + {"EG", N_( "Egypt" ) }, // :EGY:818: + {"EH", N_( "Western Sahara" ) }, // :ESH:732: + {"ER", N_( "Eritrea" ) }, // :ERI:232: + {"ES", N_( "Spain" ) }, // :ESP:724: + {"ET", N_( "Ethiopia" ) }, // :ETH:231: + {"FI", N_( "Finland" ) }, // :FIN:246: + {"FJ", N_( "Fiji" ) }, // :FJI:242: + {"FK", N_( "Falkland Islands (Malvinas)" ) }, // :FLK:238: + {"FM", N_( "Federated States of Micronesia" ) }, // :FSM:583: + {"FO", N_( "Faroe Islands" ) }, // :FRO:234: + {"FR", N_( "France" ) }, // :FRA:250: + {"FX", N_( "Metropolitan France" ) }, // :FXX:249: + {"GA", N_( "Gabon" ) }, // :GAB:266: + {"GB", N_( "United Kingdom" ) }, // :GBR:826: + {"GD", N_( "Grenada" ) }, // :GRD:308: + {"GE", N_( "Georgia" ) }, // :GEO:268: + {"GF", N_( "French Guiana" ) }, // :GUF:254: + {"GH", N_( "Ghana" ) }, // :GHA:288: + {"GI", N_( "Gibraltar" ) }, // :GIB:292: + {"GL", N_( "Greenland" ) }, // :GRL:304: + {"GM", N_( "Gambia" ) }, // :GMB:270: + {"GN", N_( "Guinea" ) }, // :GIN:324: + {"GP", N_( "Guadeloupe" ) }, // :GLP:312: + {"GQ", N_( "Equatorial Guinea" ) }, // :GNQ:226: + {"GR", N_( "Greece" ) }, // :GRC:300: + {"GS", N_( "South Georgia and the South Sandwich Islands" ) }, // :SGS:239: + {"GT", N_( "Guatemala" ) }, // :GTM:320: + {"GU", N_( "Guam" ) }, // :GUM:316: + {"GW", N_( "Guinea-Bissau" ) }, // :GNB:624: + {"GY", N_( "Guyana" ) }, // :GUY:328: + {"HK", N_( "Hong Kong" ) }, // :HKG:344: + {"HM", N_( "Heard Island and McDonald Islands" ) }, // :HMD:334: + {"HN", N_( "Honduras" ) }, // :HND:340: + {"HR", N_( "Croatia" ) }, // :HRV:191: + {"HT", N_( "Haiti" ) }, // :HTI:332: + {"HU", N_( "Hungary" ) }, // :HUN:348: + {"ID", N_( "Indonesia" ) }, // :IDN:360: + {"IE", N_( "Ireland" ) }, // :IRL:372: + {"IL", N_( "Israel" ) }, // :ISR:376: + {"IN", N_( "India" ) }, // :IND:356: + {"IO", N_( "British Indian Ocean Territory" ) }, // :IOT:086: + {"IQ", N_( "Iraq" ) }, // :IRQ:368: + {"IR", N_( "Iran" ) }, // :IRN:364: + {"IS", N_( "Iceland" ) }, // :ISL:352: + {"IT", N_( "Italy" ) }, // :ITA:380: + {"JM", N_( "Jamaica" ) }, // :JAM:388: + {"JO", N_( "Jordan" ) }, // :JOR:400: + {"JP", N_( "Japan" ) }, // :JPN:392: + {"KE", N_( "Kenya" ) }, // :KEN:404: + {"KG", N_( "Kyrgyzstan" ) }, // :KGZ:417: + {"KH", N_( "Cambodia" ) }, // :KHM:116: + {"KI", N_( "Kiribati" ) }, // :KIR:296: + {"KM", N_( "Comoros" ) }, // :COM:174: + {"KN", N_( "Saint Kitts and Nevis" ) }, // :KNA:659: + {"KP", N_( "North Korea" ) }, // :PRK:408: + {"KR", N_( "South Korea" ) }, // :KOR:410: + {"KW", N_( "Kuwait" ) }, // :KWT:414: + {"KY", N_( "Cayman Islands" ) }, // :CYM:136: + {"KZ", N_( "Kazakhstan" ) }, // :KAZ:398: + {"LA", N_( "Lao People's Democratic Republic" ) }, // :LAO:418: + {"LB", N_( "Lebanon" ) }, // :LBN:422: + {"LC", N_( "Saint Lucia" ) }, // :LCA:662: + {"LI", N_( "Liechtenstein" ) }, // :LIE:438: + {"LK", N_( "Sri Lanka" ) }, // :LKA:144: + {"LR", N_( "Liberia" ) }, // :LBR:430: + {"LS", N_( "Lesotho" ) }, // :LSO:426: + {"LT", N_( "Lithuania" ) }, // :LTU:440: + {"LU", N_( "Luxembourg" ) }, // :LUX:442: + {"LV", N_( "Latvia" ) }, // :LVA:428: + {"LY", N_( "Libya" ) }, // :LBY:434: + {"MA", N_( "Morocco" ) }, // :MAR:504: + {"MC", N_( "Monaco" ) }, // :MCO:492: + {"MD", N_( "Moldova" ) }, // :MDA:498: + {"MG", N_( "Madagascar" ) }, // :MDG:450: + {"MH", N_( "Marshall Islands" ) }, // :MHL:584: + {"MK", N_( "Macedonia" ) }, // :MKD:807: + {"ML", N_( "Mali" ) }, // :MLI:466: + {"MM", N_( "Myanmar" ) }, // :MMR:104: + {"MN", N_( "Mongolia" ) }, // :MNG:496: + {"MO", N_( "Macao" ) }, // :MAC:446: + {"MP", N_( "Northern Mariana Islands" ) }, // :MNP:580: + {"MQ", N_( "Martinique" ) }, // :MTQ:474: + {"MR", N_( "Mauritania" ) }, // :MRT:478: + {"MS", N_( "Montserrat" ) }, // :MSR:500: + {"MT", N_( "Malta" ) }, // :MLT:470: + {"MU", N_( "Mauritius" ) }, // :MUS:480: + {"MV", N_( "Maldives" ) }, // :MDV:462: + {"MW", N_( "Malawi" ) }, // :MWI:454: + {"MX", N_( "Mexico" ) }, // :MEX:484: + {"MY", N_( "Malaysia" ) }, // :MYS:458: + {"MZ", N_( "Mozambique" ) }, // :MOZ:508: + {"NA", N_( "Namibia" ) }, // :NAM:516: + {"NC", N_( "New Caledonia" ) }, // :NCL:540: + {"NE", N_( "Niger" ) }, // :NER:562: + {"NF", N_( "Norfolk Island" ) }, // :NFK:574: + {"NG", N_( "Nigeria" ) }, // :NGA:566: + {"NI", N_( "Nicaragua" ) }, // :NIC:558: + {"NL", N_( "Netherlands" ) }, // :NLD:528: + {"NO", N_( "Norway" ) }, // :NOR:578: + {"NP", N_( "Nepal" ) }, // :NPL:524: + {"NR", N_( "Nauru" ) }, // :NRU:520: + {"NU", N_( "Niue" ) }, // :NIU:570: + {"NZ", N_( "New Zealand" ) }, // :NZL:554: + {"OM", N_( "Oman" ) }, // :OMN:512: + {"PA", N_( "Panama" ) }, // :PAN:591: + {"PE", N_( "Peru" ) }, // :PER:604: + {"PF", N_( "French Polynesia" ) }, // :PYF:258: + {"PG", N_( "Papua New Guinea" ) }, // :PNG:598: + {"PH", N_( "Philippines" ) }, // :PHL:608: + {"PK", N_( "Pakistan" ) }, // :PAK:586: + {"PL", N_( "Poland" ) }, // :POL:616: + {"PM", N_( "Saint Pierre and Miquelon" ) }, // :SPM:666: + {"PN", N_( "Pitcairn" ) }, // :PCN:612: + {"PR", N_( "Puerto Rico" ) }, // :PRI:630: + {"PS", N_( "Palestinian Territory" ) }, // :PSE:275: + {"PT", N_( "Portugal" ) }, // :PRT:620: + {"PW", N_( "Palau" ) }, // :PLW:585: + {"PY", N_( "Paraguay" ) }, // :PRY:600: + {"QA", N_( "Qatar" ) }, // :QAT:634: + {"RE", N_( "Reunion" ) }, // :REU:638: + {"RO", N_( "Romania" ) }, // :ROU:642: + {"RU", N_( "Russian Federation" ) }, // :RUS:643: + {"RW", N_( "Rwanda" ) }, // :RWA:646: + {"SA", N_( "Saudi Arabia" ) }, // :SAU:682: + {"SB", N_( "Solomon Islands" ) }, // :SLB:090: + {"SC", N_( "Seychelles" ) }, // :SYC:690: + {"SD", N_( "Sudan" ) }, // :SDN:736: + {"SE", N_( "Sweden" ) }, // :SWE:752: + {"SG", N_( "Singapore" ) }, // :SGP:702: + {"SH", N_( "Saint Helena" ) }, // :SHN:654: + {"SI", N_( "Slovenia" ) }, // :SVN:705: + {"SJ", N_( "Svalbard and Jan Mayen" ) }, // :SJM:744: + {"SK", N_( "Slovakia" ) }, // :SVK:703: + {"SL", N_( "Sierra Leone" ) }, // :SLE:694: + {"SM", N_( "San Marino" ) }, // :SMR:674: + {"SN", N_( "Senegal" ) }, // :SEN:686: + {"SO", N_( "Somalia" ) }, // :SOM:706: + {"SR", N_( "Suriname" ) }, // :SUR:740: + {"ST", N_( "Sao Tome and Principe" ) }, // :STP:678: + {"SV", N_( "El Salvador" ) }, // :SLV:222: + {"SY", N_( "Syria" ) }, // :SYR:760: + {"SZ", N_( "Swaziland" ) }, // :SWZ:748: + {"TC", N_( "Turks and Caicos Islands" ) }, // :TCA:796: + {"TD", N_( "Chad" ) }, // :TCD:148: + {"TF", N_( "French Southern Territories" ) }, // :ATF:260: + {"TG", N_( "Togo" ) }, // :TGO:768: + {"TH", N_( "Thailand" ) }, // :THA:764: + {"TJ", N_( "Tajikistan" ) }, // :TJK:762: + {"TK", N_( "Tokelau" ) }, // :TKL:772: + {"TM", N_( "Turkmenistan" ) }, // :TKM:795: + {"TN", N_( "Tunisia" ) }, // :TUN:788: + {"TO", N_( "Tonga" ) }, // :TON:776: + {"TL", N_( "East Timor" ) }, // :TLS:626: + {"TR", N_( "Turkey" ) }, // :TUR:792: + {"TT", N_( "Trinidad and Tobago" ) }, // :TTO:780: + {"TV", N_( "Tuvalu" ) }, // :TUV:798: + {"TW", N_( "Taiwan" ) }, // :TWN:158: + {"TZ", N_( "Tanzania" ) }, // :TZA:834: + {"UA", N_( "Ukraine" ) }, // :UKR:804: + {"UG", N_( "Uganda" ) }, // :UGA:800: + {"UM", N_( "United States Minor Outlying Islands" ) },// :UMI:581: + {"US", N_( "United States" ) }, // :USA:840: + {"UY", N_( "Uruguay" ) }, // :URY:858: + {"UZ", N_( "Uzbekistan" ) }, // :UZB:860: + {"VA", N_( "Holy See (Vatican City State)" ) }, // :VAT:336: + {"VC", N_( "Saint Vincent and the Grenadines" ) }, // :VCT:670: + {"VE", N_( "Venezuela" ) }, // :VEN:862: + {"VG", N_( "British Virgin Islands" ) }, // :VGB:092: + {"VI", N_( "Virgin Islands, U.S." ) }, // :VIR:850: + {"VN", N_( "Vietnam" ) }, // :VNM:704: + {"VU", N_( "Vanuatu" ) }, // :VUT:548: + {"WF", N_( "Wallis and Futuna" ) }, // :WLF:876: + {"WS", N_( "Samoa" ) }, // :WSM:882: + {"YE", N_( "Yemen" ) }, // :YEM:887: + {"YT", N_( "Mayotte" ) }, // :MYT:175: + {"ZA", N_( "South Africa" ) }, // :ZAF:710: + {"ZM", N_( "Zambia" ) }, // :ZMB:894: + {"ZW", N_( "Zimbabwe" ) }, // :ZWE:716: + + { NULL, NULL } + }; + + for (const Init * i = init; i->iso3166 != NULL; ++i) + iso3166[i->iso3166] = i->name; } ///////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/LanguageCode.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/LanguageCode.cc?rev=9219&r1=9218&r2=9219&view=diff ============================================================================== --- trunk/libzypp/zypp/LanguageCode.cc (original) +++ trunk/libzypp/zypp/LanguageCode.cc Thu Mar 20 02:52:35 2008 @@ -233,7 +233,7 @@ // some languages have more than one iso639_2 code // so there are items with duplicate names - LangInit langInit[] = { + const LangInit langInit[] = { // language code: aar aa { "aar", "aa", N_( "Afar" ) }, // language code: abk ab @@ -1228,7 +1228,7 @@ { NULL, NULL, NULL } }; - for (LangInit * i = langInit; i->iso639_2 != NULL; ++i) + for (const LangInit * i = langInit; i->iso639_2 != NULL; ++i) { iso639_2[i->iso639_2] = i->name; if (i->iso639_1 != NULL) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org