diff --recursive --new-file --unified --exclude=.svn --exclude=.git /ram/gitcmp/localechooser/1.16/svn/debian/countrychooser.templates-in /ram/gitcmp/localechooser/1.16/git/debian/countrychooser.templates-in
--- /ram/gitcmp/localechooser/1.16/svn/debian/countrychooser.templates-in	1970-01-01 01:00:00.000000000 +0100
+++ /ram/gitcmp/localechooser/1.16/git/debian/countrychooser.templates-in	2009-08-06 23:21:29.235660078 +0200
@@ -0,0 +1,39 @@
+Template: countrychooser/country-name
+Type: select
+Choices: @countrylist@
+# Notes to translators
+#  The country names are not part of this package
+#
+#  If the country list is not translated in your language, please
+#  have a look at the "iso-codes" package
+#  You need to create or update the iso-3166/xx.po file of
+#  this package.
+# 
+#  Then file a wishlist bug report to "iso-codes" with tags "patch"
+#  and "l10n"
+#
+#
+# This file MUST use UTF-8 encoding as it is merged with some
+# other translations which use UTF-8
+_Description: Choose a country, territory or area:
+
+Template: countrychooser/shortlist
+Type: select
+__Choices: ${SHORTLIST}, other
+_Description: Choose a country, territory or area:
+ Based on your language, you are probably located in one of these countries
+ or regions.
+
+Template: debian-installer/locale
+Type: string
+Description: Internal use
+
+Template: debian-installer/country
+Type: string
+Description: Internal use
+
+Template: debian-installer/countrychooser/title
+Type: text
+# Main menu entry
+_Description: Choose country or region
+
diff --recursive --new-file --unified --exclude=.svn --exclude=.git /ram/gitcmp/localechooser/1.16/svn/iso-codes.updates/nb.po /ram/gitcmp/localechooser/1.16/git/iso-codes.updates/nb.po
--- /ram/gitcmp/localechooser/1.16/svn/iso-codes.updates/nb.po	1970-01-01 01:00:00.000000000 +0100
+++ /ram/gitcmp/localechooser/1.16/git/iso-codes.updates/nb.po	2009-08-06 23:21:29.243659687 +0200
@@ -0,0 +1,1044 @@
+# translation of iso-codes_iso_3166.po to Norwegian (Nynorsk)
+# Landsnamn på engelsk og norsk
+# Håvard Korsvoll <korsvoll@skulelinux.no>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: iso-codes_iso_3166\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-17 23:46+0100\n"
+"PO-Revision-Date: 2004-04-23 23:37+0200\n"
+"Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
+"Language-Team: Norwegian (Nynorsk) <i18n-nn@lister.ping.uio.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3.1\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. AD
+msgid "Andorra"
+msgstr "Andorra"
+
+#. AE
+msgid "United Arab Emirates"
+msgstr "De forente arabiske emirater"
+
+#. AF
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+#. AG
+msgid "Antigua and Barbuda"
+msgstr "Antigua og Barbuda"
+
+#. AI
+msgid "Anguilla"
+msgstr "Anguilla"
+
+#. AL
+msgid "Albania"
+msgstr "Albania"
+
+#. AM
+msgid "Armenia"
+msgstr "Armenia"
+
+#. AN
+msgid "Netherlands Antilles"
+msgstr "De nederlandske Antillene"
+
+#. AO
+msgid "Angola"
+msgstr "Angola"
+
+#. AQ
+msgid "Antarctica"
+msgstr "Antarktika"
+
+#. AR
+msgid "Argentina"
+msgstr "Argentina"
+
+#. AS
+msgid "American Samoa"
+msgstr "Amerikansk Samoa"
+
+#. AT
+msgid "Austria"
+msgstr "Østerrike"
+
+#. AU
+msgid "Australia"
+msgstr "Australia"
+
+#. AW
+msgid "Aruba"
+msgstr "Aruba"
+
+#. AX
+msgid "Åland Islands"
+msgstr "Åland"
+
+#. AZ
+msgid "Azerbaijan"
+msgstr "Aserbajdsjan"
+
+#. BA
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnia-Hercegovina"
+
+#. BB
+msgid "Barbados"
+msgstr "Barbados"
+
+#. BD
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#. BE
+msgid "Belgium"
+msgstr "Belgia"
+
+#. BF
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+#. BG
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+#. BH
+msgid "Bahrain"
+msgstr "Bahrain"
+
+#. BI
+msgid "Burundi"
+msgstr "Burundi"
+
+#. BJ
+msgid "Benin"
+msgstr "Benin"
+
+#. BM
+msgid "Bermuda"
+msgstr "Bermuda"
+
+#. BN
+msgid "Brunei Darussalam"
+msgstr "Brunei"
+
+#. BO
+msgid "Bolivia"
+msgstr "Bolivia"
+
+#. BR
+msgid "Brazil"
+msgstr "Brasil"
+
+#. BS
+msgid "Bahamas"
+msgstr "Bahamas"
+
+#. BT
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#. BV
+msgid "Bouvet Island"
+msgstr "Bouvetøya"
+
+#. BW
+msgid "Botswana"
+msgstr "Botswana"
+
+#. BY
+msgid "Belarus"
+msgstr "Hviterussland; Kviterussland"
+
+#. BZ
+msgid "Belize"
+msgstr "Belize"
+
+#. CA
+msgid "Canada"
+msgstr "Canada"
+
+#. CC
+msgid "Cocos (Keeling) Islands"
+msgstr "Kokosøyene"
+
+#. CD
+msgid "Congo, The Democratic Republic of"
+msgstr "Kongo"
+
+#. CF
+msgid "Central African Republic"
+msgstr "Den sentralafrikanske republikk"
+
+#. CG
+msgid "Congo"
+msgstr "Kongo-Brazaville"
+
+#. CH
+msgid "Switzerland"
+msgstr "Sveits"
+
+#. CI
+msgid "Côte d'Ivoire"
+msgstr "Elfenbenskysten"
+
+#. CK
+msgid "Cook Islands"
+msgstr "Cookøyene"
+
+#. CL
+msgid "Chile"
+msgstr "Chile"
+
+#. CM
+msgid "Cameroon"
+msgstr "Kamerun"
+
+#. CN
+msgid "China"
+msgstr "Kina"
+
+#. CO
+msgid "Colombia"
+msgstr "Colombia"
+
+#. CR
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#. CS
+msgid "Serbia and Montenegro"
+msgstr "Serbia og Montenegro"
+
+#. CU
+msgid "Cuba"
+msgstr "Cuba"
+
+#. CV
+msgid "Cape Verde"
+msgstr "Kapp Verde"
+
+#. CX
+msgid "Christmas Island"
+msgstr "Christmasøya"
+
+#. CY
+msgid "Cyprus"
+msgstr "Kypros"
+
+#. CZ
+msgid "Czech Republic"
+msgstr "Tsjekkia"
+
+#. DE
+msgid "Germany"
+msgstr "Tyskland"
+
+#. DJ
+msgid "Djibouti"
+msgstr "Djibouti"
+
+#. DK
+msgid "Denmark"
+msgstr "Danmark"
+
+#. DM
+msgid "Dominica"
+msgstr "Dominica"
+
+#. DO
+msgid "Dominican Republic"
+msgstr "Den dominikanske republikk"
+
+#. DZ
+msgid "Algeria"
+msgstr "Algerie"
+
+#. EC
+msgid "Ecuador"
+msgstr "Ecuador"
+
+#. EE
+msgid "Estonia"
+msgstr "Estland"
+
+#. EG
+msgid "Egypt"
+msgstr "Egypt"
+
+#. EH
+msgid "Western Sahara"
+msgstr "Vest-Sahara"
+
+#. ER
+msgid "Eritrea"
+msgstr "Eritrea"
+
+#. ES
+msgid "Spain"
+msgstr "Spania"
+
+#. ET
+msgid "Ethiopia"
+msgstr "Etiopia"
+
+#. FI
+msgid "Finland"
+msgstr "Finland"
+
+#. FJ
+msgid "Fiji"
+msgstr "Fiji"
+
+#. FK
+msgid "Falkland Islands (Malvinas)"
+msgstr "Falklandsøyene"
+
+#. FM
+msgid "Micronesia, Federated States of"
+msgstr "Mikronesiaføderasjonen"
+
+#. FO
+msgid "Faroe Islands"
+msgstr "Færøyene"
+
+#. FR
+msgid "France"
+msgstr "Frankrike"
+
+#. GA
+msgid "Gabon"
+msgstr "Gabon"
+
+#. GB
+msgid "United Kingdom"
+msgstr "Storbritannia"
+
+#. GD
+msgid "Grenada"
+msgstr "Grenada"
+
+#. GE
+msgid "Georgia"
+msgstr "Georgia"
+
+#. GF
+msgid "French Guiana"
+msgstr "Fransk Guyana"
+
+#. GH
+msgid "Ghana"
+msgstr "Ghana"
+
+#. GI
+msgid "Gibraltar"
+msgstr "Gibraltar"
+
+#. GL
+msgid "Greenland"
+msgstr "Grønland"
+
+#. GM
+msgid "Gambia"
+msgstr "Gambia"
+
+#. GN
+msgid "Guinea"
+msgstr "Guinea"
+
+#. GP
+msgid "Guadeloupe"
+msgstr "Guadeloupe"
+
+#. GQ
+msgid "Equatorial Guinea"
+msgstr "Ekvatorial-Guinea"
+
+#. GR
+msgid "Greece"
+msgstr "Hellas"
+
+#. GS
+msgid "South Georgia and the South Sandwich Islands"
+msgstr "Sør-Georgia og de sørlige Sandwichøyene"
+
+#. GT
+msgid "Guatemala"
+msgstr "Guatemala"
+
+#. GU
+msgid "Guam"
+msgstr "Guam"
+
+#. GW
+msgid "Guinea-Bissau"
+msgstr "Guinea-Bissau"
+
+#. GY
+msgid "Guyana"
+msgstr "Guyana"
+
+#. HK
+msgid "Hong Kong"
+msgstr "Hongkong"
+
+#. HM
+msgid "Heard Island and McDonald Islands"
+msgstr "Heard- og McDonaldøyene"
+
+#. HN
+msgid "Honduras"
+msgstr "Honduras"
+
+#. HR
+msgid "Croatia"
+msgstr "Kroatia"
+
+#. HT
+msgid "Haiti"
+msgstr "Haiti"
+
+#. HU
+msgid "Hungary"
+msgstr "Ungarn"
+
+#. ID
+msgid "Indonesia"
+msgstr "Indonesia"
+
+#. IE
+msgid "Ireland"
+msgstr "Irland"
+
+#. IL
+msgid "Israel"
+msgstr "Israel"
+
+#. IN
+msgid "India"
+msgstr "India"
+
+#. IO
+msgid "British Indian Ocean Territory"
+msgstr "Det britiske området i Indiahavet"
+
+#. IQ
+msgid "Iraq"
+msgstr "Irak"
+
+#. IR
+msgid "Iran, Islamic Republic of"
+msgstr "Iran"
+
+#. IS
+msgid "Iceland"
+msgstr "Island"
+
+#. IT
+msgid "Italy"
+msgstr "Italia"
+
+#. JM
+msgid "Jamaica"
+msgstr "Jamaica"
+
+#. JO
+msgid "Jordan"
+msgstr "Jordan"
+
+#. JP
+msgid "Japan"
+msgstr "Japan"
+
+#. KE
+msgid "Kenya"
+msgstr "Kenya"
+
+#. KG
+msgid "Kyrgyzstan"
+msgstr "Kirgisistan"
+
+#. KH
+msgid "Cambodia"
+msgstr "Kambodsja"
+
+#. KI
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#. KM
+msgid "Comoros"
+msgstr "Komorene"
+
+#. KN
+msgid "Saint Kitts and Nevis"
+msgstr "St. Kitts og Nevis; Saint Kitts og Nevis"
+
+#. KP
+msgid "Korea, Democratic People's Republic of"
+msgstr "Nord-Korea"
+
+#. KR
+msgid "Korea, Republic of"
+msgstr "Sør-Korea"
+
+#. KW
+msgid "Kuwait"
+msgstr "Kuwait"
+
+#. KY
+msgid "Cayman Islands"
+msgstr "Caymanøyene"
+
+#. KZ
+msgid "Kazakhstan"
+msgstr "Kasakhstan"
+
+#. LA
+msgid "Lao People's Democratic Republic"
+msgstr "Laos"
+
+#. LB
+msgid "Lebanon"
+msgstr "Libanon"
+
+#. LC
+msgid "Saint Lucia"
+msgstr "St. Lucia; Saint Lucia"
+
+#. LI
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+#. LK
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#. LR
+msgid "Liberia"
+msgstr "Liberia"
+
+#. LS
+msgid "Lesotho"
+msgstr "Lesotho"
+
+#. LT
+msgid "Lithuania"
+msgstr "Litauen"
+
+#. LU
+msgid "Luxembourg"
+msgstr "Luxembourg; Luxemburg"
+
+#. LV
+msgid "Latvia"
+msgstr "Latvia"
+
+#. LY
+msgid "Libyan Arab Jamahiriya"
+msgstr "Libya"
+
+#. MA
+msgid "Morocco"
+msgstr "Marokko"
+
+#. MC
+msgid "Monaco"
+msgstr "Monaco"
+
+#. MD
+msgid "Moldova, Republic of"
+msgstr "Moldova"
+
+#. MG
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#. MH
+msgid "Marshall Islands"
+msgstr "Marshalløyene"
+
+#. MK
+msgid "Macedonia, the former Yugoslavian Republic of"
+msgstr "Makedonia"
+
+#. ML
+msgid "Mali"
+msgstr "Mali"
+
+#. MM
+msgid "Myanmar"
+msgstr "Myanmar; Burma"
+
+#. MN
+msgid "Mongolia"
+msgstr "Mongolia"
+
+#. MO
+msgid "Macao"
+msgstr "Macao"
+
+#. MP
+msgid "Northern Mariana Islands"
+msgstr "Nord-Marianene"
+
+#. MQ
+msgid "Martinique"
+msgstr "Martinique"
+
+#. MR
+msgid "Mauritania"
+msgstr "Mauritania"
+
+#. MS
+msgid "Montserrat"
+msgstr "Montserrat"
+
+#. MT
+msgid "Malta"
+msgstr "Malta"
+
+#. MU
+msgid "Mauritius"
+msgstr "Mauritius"
+
+#. MV
+msgid "Maldives"
+msgstr "Maldivene"
+
+#. MW
+msgid "Malawi"
+msgstr "Malawi"
+
+#. MX
+msgid "Mexico"
+msgstr "Mexico"
+
+#. MY
+msgid "Malaysia"
+msgstr "Malaysia"
+
+#. MZ
+msgid "Mozambique"
+msgstr "Mosambik"
+
+#. NA
+msgid "Namibia"
+msgstr "Namibia"
+
+#. NC
+msgid "New Caledonia"
+msgstr "Ny-Caledonia"
+
+#. NE
+msgid "Niger"
+msgstr "Niger"
+
+#. NF
+msgid "Norfolk Island"
+msgstr "Norfolkøya; Norfolk Island"
+
+#. NG
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#. NI
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+#. NL
+msgid "Netherlands"
+msgstr "Nederland"
+
+#. NO
+msgid "Norway"
+msgstr "Norge"
+
+#. NP
+msgid "Nepal"
+msgstr "Nepal"
+
+#. NR
+msgid "Nauru"
+msgstr "Nauru"
+
+#. NU
+msgid "Niue"
+msgstr "Niue"
+
+#. NZ
+msgid "New Zealand"
+msgstr "New Zealand; Ny-Zealand"
+
+#. OM
+msgid "Oman"
+msgstr "Oman"
+
+#. PA
+msgid "Panama"
+msgstr "Panama"
+
+#. PE
+msgid "Peru"
+msgstr "Peru"
+
+#. PF
+msgid "French Polynesia"
+msgstr "Fransk Polynesia"
+
+#. PG
+msgid "Papua New Guinea"
+msgstr "Papua Ny-Guinea"
+
+#. PH
+msgid "Philippines"
+msgstr "Filippinene"
+
+#. PK
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#. PL
+msgid "Poland"
+msgstr "Polen"
+
+#. PM
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint-Pierre-et-Miquelon"
+
+#. PN
+msgid "Pitcairn"
+msgstr "Pitcairn"
+
+#. PR
+msgid "Puerto Rico"
+msgstr "Puerto Rico"
+
+#. PS
+msgid "Palestinian Territory, occupied"
+msgstr "Palestinske territorier"
+
+#. PT
+msgid "Portugal"
+msgstr "Portugual"
+
+#. PW
+msgid "Palau"
+msgstr "Palau"
+
+#. PY
+msgid "Paraguay"
+msgstr "Paraguay"
+
+#. QA
+msgid "Qatar"
+msgstr "Qatar"
+
+#. RE
+msgid "Reunion"
+msgstr "Réunion"
+
+#. RO
+msgid "Romania"
+msgstr "Romania"
+
+#. RU
+msgid "Russian Federation"
+msgstr "Russland"
+
+#. RW
+msgid "Rwanda"
+msgstr "Rwanda"
+
+#. SA
+msgid "Saudi Arabia"
+msgstr "Saudi-Arabia"
+
+#. SB
+msgid "Solomon Islands"
+msgstr "Salomonøyene"
+
+#. SC
+msgid "Seychelles"
+msgstr "Seychellene"
+
+#. SD
+msgid "Sudan"
+msgstr "Sudan"
+
+#. SE
+msgid "Sweden"
+msgstr "Sverige"
+
+#. SG
+msgid "Singapore"
+msgstr "Singapore"
+
+#. SH
+msgid "Saint Helena"
+msgstr "St. Helena"
+
+#. SI
+msgid "Slovenia"
+msgstr "Slovenia"
+
+#. SJ
+msgid "Svalbard and Jan Mayen"
+msgstr "Svalbard og Jan Mayen"
+
+#. SK
+msgid "Slovakia"
+msgstr "Slovakia"
+
+#. SL
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+#. SM
+msgid "San Marino"
+msgstr "San Marino"
+
+#. SN
+msgid "Senegal"
+msgstr "Senegal"
+
+#. SO
+msgid "Somalia"
+msgstr "Somalia"
+
+#. SR
+msgid "Suriname"
+msgstr "Surinam"
+
+#. ST
+msgid "Sao Tome and Principe"
+msgstr "São Tomé og Príncipe"
+
+#. SV
+msgid "El Salvador"
+msgstr "El Salvador"
+
+#. SY
+msgid "Syrian Arab Republic"
+msgstr "Syria"
+
+#. SZ
+msgid "Swaziland"
+msgstr "Swaziland"
+
+#. TC
+msgid "Turks and Caicos Islands"
+msgstr "Turks- og Caicosøyene"
+
+#. TD
+msgid "Chad"
+msgstr "Tsjad"
+
+#. TF
+msgid "French Southern Territories"
+msgstr "Franske sørlige territorier"
+
+#. TG
+msgid "Togo"
+msgstr "Togo"
+
+#. TH
+msgid "Thailand"
+msgstr "Thailand"
+
+#. TJ
+msgid "Tajikistan"
+msgstr "Tadsjikistan"
+
+#. TK
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#. TL
+msgid "Timor-Leste"
+msgstr "Øst-Timor"
+
+#. TM
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#. TN
+msgid "Tunisia"
+msgstr "Tunisia"
+
+#. TO
+msgid "Tonga"
+msgstr "Tonga"
+
+#. TR
+msgid "Turkey"
+msgstr "Tyrkia"
+
+#. TT
+msgid "Trinidad and Tobago"
+msgstr "Trinidad og Tobago"
+
+#. TV
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+#. TW
+msgid "Taiwan, Province of China"
+msgstr "Taiwan"
+
+#. TZ
+msgid "Tanzania, United Republic of"
+msgstr "Tanzania"
+
+#. UA
+msgid "Ukraine"
+msgstr "Ukraina"
+
+#. UG
+msgid "Uganda"
+msgstr "Uganda"
+
+#. UM
+#, fuzzy
+msgid "United States Minor Outlying Islands"
+msgstr "USA, mindre utenforliggende øyer"
+
+#. US
+msgid "United States"
+msgstr "USA; De forente stater; Sambandsstatene"
+
+#. UY
+msgid "Uruguay"
+msgstr "Uruguay"
+
+#. UZ
+msgid "Uzbekistan"
+msgstr "Usbekistan"
+
+#. VA
+msgid "Holy See (Vatican City State)"
+msgstr "Vatikanstaten"
+
+#. VC
+msgid "Saint Vincent and the Grenadines"
+msgstr "Saint Vincent og Grenadinene"
+
+#. VE
+msgid "Venezuela"
+msgstr "Venezuela"
+
+#. VG
+msgid "Virgin Islands, British"
+msgstr "Jomfruøyene (Storbritannia)"
+
+#. VI
+msgid "Virgin Islands, U.S."
+msgstr "Jomfruøyene (USA)"
+
+#. VN
+msgid "Viet Nam"
+msgstr "Vietnam"
+
+#. VU
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#. WF
+msgid "Wallis and Futuna"
+msgstr "Wallis og Futunaøyene"
+
+#. WS
+msgid "Samoa"
+msgstr "Samoa"
+
+#. YE
+msgid "Yemen"
+msgstr "Jemen"
+
+#. YT
+msgid "Mayotte"
+msgstr "Mayotte"
+
+#. ZA
+msgid "South Africa"
+msgstr "Sør-Afrika"
+
+#. ZM
+msgid "Zambia"
+msgstr "Zambia"
+
+#. ZW
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+#~ msgid "The Democratic Republic of the Congo"
+#~ msgstr "Kongo"
+
+#~ msgid "Iran"
+#~ msgstr "Iran"
+
+#~ msgid "Islamic Republic of Iran"
+#~ msgstr "Iran"
+
+#~ msgid "Korea"
+#~ msgstr "Nord-Korea"
+
+#~ msgid "Democratic People’s Republic of Korea"
+#~ msgstr "Nord-Korea"
+
+#~ msgid "Republic of Korea"
+#~ msgstr "Sør-Korea"
+
+#~ msgid "Macedonia"
+#~ msgstr "Makedonia"
+
+#~ msgid "The Former Yugoslav Republic of Macedonia"
+#~ msgstr "Makedonia"
+
+#~ msgid "Micronesia"
+#~ msgstr "Mikronesiaføderasjonen"
+
+#~ msgid "Federated States of Micronesia"
+#~ msgstr "Mikronesiaføderasjonen"
+
+#~ msgid "Moldova"
+#~ msgstr "Moldova"
+
+#~ msgid "Republic of Moldova"
+#~ msgstr "Moldova"
+
+#, fuzzy
+#~ msgid "Palestinian Territory"
+#~ msgstr "Palestinske territorier*"
+
+#, fuzzy
+#~ msgid "Occupied Palestinian Territory"
+#~ msgstr "Palestinske territorier*"
+
+#~ msgid "Taiwan"
+#~ msgstr "Taiwan"
+
+#~ msgid "Province of China Taiwan"
+#~ msgstr "Taiwan"
+
+#~ msgid "Tanzania"
+#~ msgstr "Tanzania"
+
+#~ msgid "United Republic of Tanzania"
+#~ msgstr "Tanzania"
+
+#~ msgid "Virgin Islands"
+#~ msgstr "Jomfruøyene (Storbritannia)"
+
+#~ msgid "British Virgin Islands"
+#~ msgstr "Jomfruøyene (Storbritannia)"
+
+#~ msgid "U.S. Virgin Islands"
+#~ msgstr "Jomfruøyene (USA)"
+
diff --recursive --new-file --unified --exclude=.svn --exclude=.git /ram/gitcmp/localechooser/1.16/svn/iso-codes.updates/nn.po /ram/gitcmp/localechooser/1.16/git/iso-codes.updates/nn.po
--- /ram/gitcmp/localechooser/1.16/svn/iso-codes.updates/nn.po	1970-01-01 01:00:00.000000000 +0100
+++ /ram/gitcmp/localechooser/1.16/git/iso-codes.updates/nn.po	2009-08-06 23:21:29.243659687 +0200
@@ -0,0 +1,1044 @@
+# translation of iso-codes_iso_3166.po to Norwegian (Nynorsk)
+# Landsnamn på engelsk og norsk
+# Håvard Korsvoll <korsvoll@skulelinux.no>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: iso-codes_iso_3166\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-04-17 23:46+0100\n"
+"PO-Revision-Date: 2004-04-23 23:34+0200\n"
+"Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
+"Language-Team: Norwegian (Nynorsk) <i18n-nn@lister.ping.uio.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3.1\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. AD
+msgid "Andorra"
+msgstr "Andorra"
+
+#. AE
+msgid "United Arab Emirates"
+msgstr "Dei sameinte arabiske emirata"
+
+#. AF
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+#. AG
+msgid "Antigua and Barbuda"
+msgstr "Antigua og Barbuda"
+
+#. AI
+msgid "Anguilla"
+msgstr "Anguilla"
+
+#. AL
+msgid "Albania"
+msgstr "Albania"
+
+#. AM
+msgid "Armenia"
+msgstr "Armenia"
+
+#. AN
+msgid "Netherlands Antilles"
+msgstr "Dei nederlandske Antillane"
+
+#. AO
+msgid "Angola"
+msgstr "Angola"
+
+#. AQ
+msgid "Antarctica"
+msgstr "Antarktika"
+
+#. AR
+msgid "Argentina"
+msgstr "Argentina"
+
+#. AS
+msgid "American Samoa"
+msgstr "Amerikansk Samoa"
+
+#. AT
+msgid "Austria"
+msgstr "Austerrike"
+
+#. AU
+msgid "Australia"
+msgstr "Australia"
+
+#. AW
+msgid "Aruba"
+msgstr "Aruba"
+
+#. AX
+msgid "Åland Islands"
+msgstr "Åland"
+
+#. AZ
+msgid "Azerbaijan"
+msgstr "Aserbajdsjan"
+
+#. BA
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnia-Hercegovina"
+
+#. BB
+msgid "Barbados"
+msgstr "Barbados"
+
+#. BD
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#. BE
+msgid "Belgium"
+msgstr "Belgia"
+
+#. BF
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+#. BG
+msgid "Bulgaria"
+msgstr "Bulgaria"
+
+#. BH
+msgid "Bahrain"
+msgstr "Bahrain"
+
+#. BI
+msgid "Burundi"
+msgstr "Burundi"
+
+#. BJ
+msgid "Benin"
+msgstr "Benin"
+
+#. BM
+msgid "Bermuda"
+msgstr "Bermuda"
+
+#. BN
+msgid "Brunei Darussalam"
+msgstr "Brunei"
+
+#. BO
+msgid "Bolivia"
+msgstr "Bolivia"
+
+#. BR
+msgid "Brazil"
+msgstr "Brasil"
+
+#. BS
+msgid "Bahamas"
+msgstr "Bahamas"
+
+#. BT
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#. BV
+msgid "Bouvet Island"
+msgstr "Bouvetøya"
+
+#. BW
+msgid "Botswana"
+msgstr "Botswana"
+
+#. BY
+msgid "Belarus"
+msgstr "Kviterussland"
+
+#. BZ
+msgid "Belize"
+msgstr "Belize"
+
+#. CA
+msgid "Canada"
+msgstr "Canada"
+
+#. CC
+msgid "Cocos (Keeling) Islands"
+msgstr "Kokosøyane"
+
+#. CD
+msgid "Congo, The Democratic Republic of"
+msgstr "Kongo"
+
+#. CF
+msgid "Central African Republic"
+msgstr "Den sentralafrikanske republikken"
+
+#. CG
+msgid "Congo"
+msgstr "Kongo-Brazaville"
+
+#. CH
+msgid "Switzerland"
+msgstr "Sveits"
+
+#. CI
+msgid "Côte d'Ivoire"
+msgstr "Elfenbeinskysten"
+
+#. CK
+msgid "Cook Islands"
+msgstr "Cookøyane"
+
+#. CL
+msgid "Chile"
+msgstr "Chile"
+
+#. CM
+msgid "Cameroon"
+msgstr "Kamerun"
+
+#. CN
+msgid "China"
+msgstr "Kina"
+
+#. CO
+msgid "Colombia"
+msgstr "Colombia"
+
+#. CR
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#. CS
+msgid "Serbia and Montenegro"
+msgstr "Serbia og Montenegro"
+
+#. CU
+msgid "Cuba"
+msgstr "Cuba"
+
+#. CV
+msgid "Cape Verde"
+msgstr "Kapp Verde"
+
+#. CX
+msgid "Christmas Island"
+msgstr "Christmasøya"
+
+#. CY
+msgid "Cyprus"
+msgstr "Kypros"
+
+#. CZ
+msgid "Czech Republic"
+msgstr "Tsjekkia"
+
+#. DE
+msgid "Germany"
+msgstr "Tyskland"
+
+#. DJ
+msgid "Djibouti"
+msgstr "Djibouti"
+
+#. DK
+msgid "Denmark"
+msgstr "Danmark"
+
+#. DM
+msgid "Dominica"
+msgstr "Dominica"
+
+#. DO
+msgid "Dominican Republic"
+msgstr "Den dominikanske republikken"
+
+#. DZ
+msgid "Algeria"
+msgstr "Algerie"
+
+#. EC
+msgid "Ecuador"
+msgstr "Ecuador"
+
+#. EE
+msgid "Estonia"
+msgstr "Estland"
+
+#. EG
+msgid "Egypt"
+msgstr "Egypt"
+
+#. EH
+msgid "Western Sahara"
+msgstr "Vest-Sahara"
+
+#. ER
+msgid "Eritrea"
+msgstr "Eritrea"
+
+#. ES
+msgid "Spain"
+msgstr "Spania"
+
+#. ET
+msgid "Ethiopia"
+msgstr "Etiopia"
+
+#. FI
+msgid "Finland"
+msgstr "Finland"
+
+#. FJ
+msgid "Fiji"
+msgstr "Fiji"
+
+#. FK
+msgid "Falkland Islands (Malvinas)"
+msgstr "Falklandsøyane"
+
+#. FM
+msgid "Micronesia, Federated States of"
+msgstr "Mikronesiaføderasjonen"
+
+#. FO
+msgid "Faroe Islands"
+msgstr "Færøyane"
+
+#. FR
+msgid "France"
+msgstr "Frankrike"
+
+#. GA
+msgid "Gabon"
+msgstr "Gabon"
+
+#. GB
+msgid "United Kingdom"
+msgstr "Storbritannia"
+
+#. GD
+msgid "Grenada"
+msgstr "Grenada"
+
+#. GE
+msgid "Georgia"
+msgstr "Georgia"
+
+#. GF
+msgid "French Guiana"
+msgstr "Fransk Guyana"
+
+#. GH
+msgid "Ghana"
+msgstr "Ghana"
+
+#. GI
+msgid "Gibraltar"
+msgstr "Gibraltar"
+
+#. GL
+msgid "Greenland"
+msgstr "Grønland"
+
+#. GM
+msgid "Gambia"
+msgstr "Gambia"
+
+#. GN
+msgid "Guinea"
+msgstr "Guinea"
+
+#. GP
+msgid "Guadeloupe"
+msgstr "Guadeloupe"
+
+#. GQ
+msgid "Equatorial Guinea"
+msgstr "Ekvatorial-Guinea"
+
+#. GR
+msgid "Greece"
+msgstr "Hellas"
+
+#. GS
+msgid "South Georgia and the South Sandwich Islands"
+msgstr "Sør-Georgia og dei sørlege Sandwichøyane"
+
+#. GT
+msgid "Guatemala"
+msgstr "Guatemala"
+
+#. GU
+msgid "Guam"
+msgstr "Guam"
+
+#. GW
+msgid "Guinea-Bissau"
+msgstr "Guinea-Bissau"
+
+#. GY
+msgid "Guyana"
+msgstr "Guyana"
+
+#. HK
+msgid "Hong Kong"
+msgstr "Hongkong"
+
+#. HM
+msgid "Heard Island and McDonald Islands"
+msgstr "Heard- og McDonaldøyane"
+
+#. HN
+msgid "Honduras"
+msgstr "Honduras"
+
+#. HR
+msgid "Croatia"
+msgstr "Kroatia"
+
+#. HT
+msgid "Haiti"
+msgstr "Haiti"
+
+#. HU
+msgid "Hungary"
+msgstr "Ungarn"
+
+#. ID
+msgid "Indonesia"
+msgstr "Indonesia"
+
+#. IE
+msgid "Ireland"
+msgstr "Irland"
+
+#. IL
+msgid "Israel"
+msgstr "Israel"
+
+#. IN
+msgid "India"
+msgstr "India"
+
+#. IO
+msgid "British Indian Ocean Territory"
+msgstr "Det britiske området i Indiahavet"
+
+#. IQ
+msgid "Iraq"
+msgstr "Irak"
+
+#. IR
+msgid "Iran, Islamic Republic of"
+msgstr "Iran"
+
+#. IS
+msgid "Iceland"
+msgstr "Island"
+
+#. IT
+msgid "Italy"
+msgstr "Italia"
+
+#. JM
+msgid "Jamaica"
+msgstr "Jamaica"
+
+#. JO
+msgid "Jordan"
+msgstr "Jordan"
+
+#. JP
+msgid "Japan"
+msgstr "Japan"
+
+#. KE
+msgid "Kenya"
+msgstr "Kenya"
+
+#. KG
+msgid "Kyrgyzstan"
+msgstr "Kirgisistan"
+
+#. KH
+msgid "Cambodia"
+msgstr "Kambodsja"
+
+#. KI
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#. KM
+msgid "Comoros"
+msgstr "Komorane"
+
+#. KN
+msgid "Saint Kitts and Nevis"
+msgstr "St. Kitts og Nevis; Saint Kitts og Nevis"
+
+#. KP
+msgid "Korea, Democratic People's Republic of"
+msgstr "Nord-Korea"
+
+#. KR
+msgid "Korea, Republic of"
+msgstr "Sør-Korea"
+
+#. KW
+msgid "Kuwait"
+msgstr "Kuwait"
+
+#. KY
+msgid "Cayman Islands"
+msgstr "Caymanøyane"
+
+#. KZ
+msgid "Kazakhstan"
+msgstr "Kasakhstan"
+
+#. LA
+msgid "Lao People's Democratic Republic"
+msgstr "Laos"
+
+#. LB
+msgid "Lebanon"
+msgstr "Libanon"
+
+#. LC
+msgid "Saint Lucia"
+msgstr "St. Lucia; Saint Lucia"
+
+#. LI
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+#. LK
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#. LR
+msgid "Liberia"
+msgstr "Liberia"
+
+#. LS
+msgid "Lesotho"
+msgstr "Lesotho"
+
+#. LT
+msgid "Lithuania"
+msgstr "Litauen"
+
+#. LU
+msgid "Luxembourg"
+msgstr "Luxembourg; Luxemburg"
+
+#. LV
+msgid "Latvia"
+msgstr "Latvia"
+
+#. LY
+msgid "Libyan Arab Jamahiriya"
+msgstr "Libya"
+
+#. MA
+msgid "Morocco"
+msgstr "Marokko"
+
+#. MC
+msgid "Monaco"
+msgstr "Monaco"
+
+#. MD
+msgid "Moldova, Republic of"
+msgstr "Moldova"
+
+#. MG
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#. MH
+msgid "Marshall Islands"
+msgstr "Marshalløyane"
+
+#. MK
+msgid "Macedonia, the former Yugoslavian Republic of"
+msgstr "Makedonia"
+
+#. ML
+msgid "Mali"
+msgstr "Mali"
+
+#. MM
+msgid "Myanmar"
+msgstr "Myanmar; Burma"
+
+#. MN
+msgid "Mongolia"
+msgstr "Mongolia"
+
+#. MO
+msgid "Macao"
+msgstr "Macao"
+
+#. MP
+msgid "Northern Mariana Islands"
+msgstr "Nord-Marianane"
+
+#. MQ
+msgid "Martinique"
+msgstr "Martinique"
+
+#. MR
+msgid "Mauritania"
+msgstr "Mauritania"
+
+#. MS
+msgid "Montserrat"
+msgstr "Montserrat"
+
+#. MT
+msgid "Malta"
+msgstr "Malta"
+
+#. MU
+msgid "Mauritius"
+msgstr "Mauritius"
+
+#. MV
+msgid "Maldives"
+msgstr "Maldivane"
+
+#. MW
+msgid "Malawi"
+msgstr "Malawi"
+
+#. MX
+msgid "Mexico"
+msgstr "Mexico"
+
+#. MY
+msgid "Malaysia"
+msgstr "Malaysia"
+
+#. MZ
+msgid "Mozambique"
+msgstr "Mosambik"
+
+#. NA
+msgid "Namibia"
+msgstr "Namibia"
+
+#. NC
+msgid "New Caledonia"
+msgstr "Ny-Caledonia"
+
+#. NE
+msgid "Niger"
+msgstr "Niger"
+
+#. NF
+msgid "Norfolk Island"
+msgstr "Norfolkøya; Norfolk Island"
+
+#. NG
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#. NI
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+#. NL
+msgid "Netherlands"
+msgstr "Nederland"
+
+#. NO
+msgid "Norway"
+msgstr "Noreg"
+
+#. NP
+msgid "Nepal"
+msgstr "Nepal"
+
+#. NR
+msgid "Nauru"
+msgstr "Nauru"
+
+#. NU
+msgid "Niue"
+msgstr "Niue"
+
+#. NZ
+msgid "New Zealand"
+msgstr "New Zealand; Ny-Zealand"
+
+#. OM
+msgid "Oman"
+msgstr "Oman"
+
+#. PA
+msgid "Panama"
+msgstr "Panama"
+
+#. PE
+msgid "Peru"
+msgstr "Peru"
+
+#. PF
+msgid "French Polynesia"
+msgstr "Fransk Polynesia"
+
+#. PG
+msgid "Papua New Guinea"
+msgstr "Papua Ny-Guinea"
+
+#. PH
+msgid "Philippines"
+msgstr "Filippinane"
+
+#. PK
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#. PL
+msgid "Poland"
+msgstr "Polen"
+
+#. PM
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint-Pierre-et-Miquelon"
+
+#. PN
+msgid "Pitcairn"
+msgstr "Pitcairn"
+
+#. PR
+msgid "Puerto Rico"
+msgstr "Puerto Rico"
+
+#. PS
+msgid "Palestinian Territory, occupied"
+msgstr "Palestinske territorium"
+
+#. PT
+msgid "Portugal"
+msgstr "Portugual"
+
+#. PW
+msgid "Palau"
+msgstr "Palau"
+
+#. PY
+msgid "Paraguay"
+msgstr "Paraguay"
+
+#. QA
+msgid "Qatar"
+msgstr "Qatar"
+
+#. RE
+msgid "Reunion"
+msgstr "Réunion"
+
+#. RO
+msgid "Romania"
+msgstr "Romania"
+
+#. RU
+msgid "Russian Federation"
+msgstr "Russland"
+
+#. RW
+msgid "Rwanda"
+msgstr "Rwanda"
+
+#. SA
+msgid "Saudi Arabia"
+msgstr "Saudi-Arabia"
+
+#. SB
+msgid "Solomon Islands"
+msgstr "Salomonøyane"
+
+#. SC
+msgid "Seychelles"
+msgstr "Seychellane"
+
+#. SD
+msgid "Sudan"
+msgstr "Sudan"
+
+#. SE
+msgid "Sweden"
+msgstr "Sverige"
+
+#. SG
+msgid "Singapore"
+msgstr "Singapore"
+
+#. SH
+msgid "Saint Helena"
+msgstr "St. Helena"
+
+#. SI
+msgid "Slovenia"
+msgstr "Slovenia"
+
+#. SJ
+msgid "Svalbard and Jan Mayen"
+msgstr "Svalbard og Jan Mayen"
+
+#. SK
+msgid "Slovakia"
+msgstr "Slovakia"
+
+#. SL
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+#. SM
+msgid "San Marino"
+msgstr "San Marino"
+
+#. SN
+msgid "Senegal"
+msgstr "Senegal"
+
+#. SO
+msgid "Somalia"
+msgstr "Somalia"
+
+#. SR
+msgid "Suriname"
+msgstr "Surinam"
+
+#. ST
+msgid "Sao Tome and Principe"
+msgstr "São Tomé og Príncipe"
+
+#. SV
+msgid "El Salvador"
+msgstr "El Salvador"
+
+#. SY
+msgid "Syrian Arab Republic"
+msgstr "Syria"
+
+#. SZ
+msgid "Swaziland"
+msgstr "Swaziland"
+
+#. TC
+msgid "Turks and Caicos Islands"
+msgstr "Turks- og Caicosøyane"
+
+#. TD
+msgid "Chad"
+msgstr "Tsjad"
+
+#. TF
+msgid "French Southern Territories"
+msgstr "Franske sørlege territorium"
+
+#. TG
+msgid "Togo"
+msgstr "Togo"
+
+#. TH
+msgid "Thailand"
+msgstr "Thailand"
+
+#. TJ
+msgid "Tajikistan"
+msgstr "Tadsjikistan"
+
+#. TK
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#. TL
+msgid "Timor-Leste"
+msgstr "Aust-Timor"
+
+#. TM
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#. TN
+msgid "Tunisia"
+msgstr "Tunisia"
+
+#. TO
+msgid "Tonga"
+msgstr "Tonga"
+
+#. TR
+msgid "Turkey"
+msgstr "Tyrkia"
+
+#. TT
+msgid "Trinidad and Tobago"
+msgstr "Trinidad og Tobago"
+
+#. TV
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+#. TW
+msgid "Taiwan, Province of China"
+msgstr "Taiwan"
+
+#. TZ
+msgid "Tanzania, United Republic of"
+msgstr "Tanzania"
+
+#. UA
+msgid "Ukraine"
+msgstr "Ukraina"
+
+#. UG
+msgid "Uganda"
+msgstr "Uganda"
+
+#. UM
+#, fuzzy
+msgid "United States Minor Outlying Islands"
+msgstr "USA, mindre utanforliggjande øyar"
+
+#. US
+msgid "United States"
+msgstr "USA; Sambandsstatane"
+
+#. UY
+msgid "Uruguay"
+msgstr "Uruguay"
+
+#. UZ
+msgid "Uzbekistan"
+msgstr "Usbekistan"
+
+#. VA
+msgid "Holy See (Vatican City State)"
+msgstr "Vatikanstaten"
+
+#. VC
+msgid "Saint Vincent and the Grenadines"
+msgstr "Saint Vincent og Grenadinane"
+
+#. VE
+msgid "Venezuela"
+msgstr "Venezuela"
+
+#. VG
+msgid "Virgin Islands, British"
+msgstr "Jomfruøyane (Storbritannia)"
+
+#. VI
+msgid "Virgin Islands, U.S."
+msgstr "Jomfruøyane (USA)"
+
+#. VN
+msgid "Viet Nam"
+msgstr "Vietnam"
+
+#. VU
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#. WF
+msgid "Wallis and Futuna"
+msgstr "Wallis- og Futunaøyane"
+
+#. WS
+msgid "Samoa"
+msgstr "Samoa"
+
+#. YE
+msgid "Yemen"
+msgstr "Jemen"
+
+#. YT
+msgid "Mayotte"
+msgstr "Mayotte"
+
+#. ZA
+msgid "South Africa"
+msgstr "Sør-Afrika"
+
+#. ZM
+msgid "Zambia"
+msgstr "Zambia"
+
+#. ZW
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+#~ msgid "The Democratic Republic of the Congo"
+#~ msgstr "Kongo"
+
+#~ msgid "Iran"
+#~ msgstr "Iran"
+
+#~ msgid "Islamic Republic of Iran"
+#~ msgstr "Iran"
+
+#~ msgid "Korea"
+#~ msgstr "Nord-Korea"
+
+#~ msgid "Democratic People’s Republic of Korea"
+#~ msgstr "Nord-Korea"
+
+#~ msgid "Republic of Korea"
+#~ msgstr "Sør-Korea"
+
+#~ msgid "Macedonia"
+#~ msgstr "Makedonia"
+
+#~ msgid "The Former Yugoslav Republic of Macedonia"
+#~ msgstr "Makedonia"
+
+#~ msgid "Micronesia"
+#~ msgstr "Mikronesiaføderasjonen"
+
+#~ msgid "Federated States of Micronesia"
+#~ msgstr "Mikronesiaføderasjonen"
+
+#~ msgid "Moldova"
+#~ msgstr "Moldova"
+
+#~ msgid "Republic of Moldova"
+#~ msgstr "Moldova"
+
+#, fuzzy
+#~ msgid "Palestinian Territory"
+#~ msgstr "Palestinske territorium*"
+
+#, fuzzy
+#~ msgid "Occupied Palestinian Territory"
+#~ msgstr "Palestinske territorium*"
+
+#~ msgid "Taiwan"
+#~ msgstr "Taiwan"
+
+#~ msgid "Province of China Taiwan"
+#~ msgstr "Taiwan"
+
+#~ msgid "Tanzania"
+#~ msgstr "Tanzania"
+
+#~ msgid "United Republic of Tanzania"
+#~ msgstr "Tanzania"
+
+#~ msgid "Virgin Islands"
+#~ msgstr "Jomfruøyane (Storbritannia)"
+
+#~ msgid "British Virgin Islands"
+#~ msgstr "Jomfruøyane (Storbritannia)"
+
+#~ msgid "U.S. Virgin Islands"
+#~ msgstr "Jomfruøyane (USA)"
+
diff --recursive --new-file --unified --exclude=.svn --exclude=.git /ram/gitcmp/localechooser/1.16/svn/iso-codes.updates/README.txt /ram/gitcmp/localechooser/1.16/git/iso-codes.updates/README.txt
--- /ram/gitcmp/localechooser/1.16/svn/iso-codes.updates/README.txt	1970-01-01 01:00:00.000000000 +0100
+++ /ram/gitcmp/localechooser/1.16/git/iso-codes.updates/README.txt	2009-08-06 23:21:29.243659687 +0200
@@ -0,0 +1,2 @@
+Translators may put here updated versions of the iso-3166.tab file from the
+iso-codes package.
diff --recursive --new-file --unified --exclude=.svn --exclude=.git /ram/gitcmp/localechooser/1.16/svn/mktemplates /ram/gitcmp/localechooser/1.16/git/mktemplates
--- /ram/gitcmp/localechooser/1.16/svn/mktemplates	1970-01-01 01:00:00.000000000 +0100
+++ /ram/gitcmp/localechooser/1.16/git/mktemplates	2009-08-06 23:21:29.243659687 +0200
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+set -e
+
+# Script for generating a debconf templates file from both files
+# in debian/po/*.po and country names translations from the
+# iso-codes package
+#
+# Some variables
+ISO3166TAB=/usr/share/iso-codes/iso_3166.tab
+# Translations location (relative to the build root directory)
+ISO3166TRANSLATIONS=debian/iso-codes
+
+# This string can be anything; it is used as a standin for the actual
+# string used to indent countries inside regions.
+INDENTMARKER="[INDENT]"
+# This is the actual indentation string. cdebconf supports escapes spaces
+# in choices lists to preserve leading whitespace.
+INDENT='\\  '
+
+# Get the ordered list of countries from the iso_3166.tab, sorted
+# according to the regionmap.
+#
+# We need to escape commas by preceding them with a backslash.
+CHOICES=$(./countrylist $ISO3166TAB ./regionmap "$INDENTMARKER" | \
+         sed 's/,/\\\\\\\\,/g' | \
+         (read a; echo -n "$a"; while read b; do echo -n ", $b"; done; echo))
+
+# Now put this list as the choices in the templates
+# and defined this field as translatable (__Choices hack)
+cat debian/countrychooser.templates-in | \
+    perl -pe 's/\@countrylist\@/'"$CHOICES"'/g' | \
+    sed "/^Choices:/s/Choices:/__Choices:/g" \
+    >debian/templates.tmp
+
+# Create a temporary "pobuild" directory
+rm -rf debian/pobuild >/dev/null 2>&1
+mkdir debian/pobuild
+
+# Create the appropriate POTFILES.in file there
+cat >debian/pobuild/POTFILES.in <<EOF
+[type: gettext/rfc822deb] templates.tmp
+../regionmap
+EOF
+
+# Create the appropriate output file also
+cat >debian/pobuild/output <<EOF
+2   utf8
+EOF
+
+# Run debconf-updatepo on this directory
+# -->this will create pobuild/templates.pot
+debconf-updatepo --podir debian/pobuild
+
+# (each existing file in debian/po
+for pofile in debian/po/*.po ; do
+    pofilename=`basename $pofile`
+    printf "$pofilename "
+    # If the country names are translated, we need to merge
+    # the translation with the templates translations
+    if [ -f $ISO3166TRANSLATIONS/$pofilename ]
+    then
+	# Munge the po file to have the indentmarker in its strings.
+	perl -pe 'BEGIN { $marker=shift } s/^msg(id|str) "(.+)"/msg$1 "$marker$2"/' "$INDENTMARKER" \
+		< $ISO3166TRANSLATIONS/$pofilename \
+		> $ISO3166TRANSLATIONS/$pofilename.munged
+	
+	# msgcat will properly handle different encodings
+	msgcat debian/po/$pofilename \
+		$ISO3166TRANSLATIONS/$pofilename.munged \
+		> debian/pobuild/$pofilename
+
+	msgmerge -U debian/pobuild/$pofilename \
+		debian/pobuild/templates.pot
+    # Else we just use what's translated
+    else
+	cp $pofile debian/pobuild/$pofilename
+    fi
+done
+
+# and now we generate the templates file from all this
+PODEBCONF_LIB=. po2debconf --podir debian/pobuild debian/templates.tmp >debian/templates.base
+
+# Replace the indent marker with the actual indent.
+perl -i -pe "s/\Q$INDENTMARKER\E/$INDENT/g" debian/templates.base
