Add MG (will have to use isoquery in the future)

CVS version numbers

arabic/po/countries.ar.po: 1.10 -> 1.11 
armenian/po/countries.hy.po: 1.3 -> 1.4 
bulgarian/po/countries.bg.po: 1.31 -> 1.32 
chinese/po/countries.zh.po: 1.7 -> 1.8 
croatian/po/countries.hr.po: 1.17 -> 1.18 
czech/po/countries.cs.po: 1.5 -> 1.6 
danish/po/countries.da.po: 1.32 -> 1.33 
dutch/po/countries.nl.po: 1.32 -> 1.33 
english/po/countries.pot: 1.27 -> 1.28 
english/template/debian/countries.wml: 1.199 -> 1.200 
esperanto/po/countries.eo.po: 1.6 -> 1.7 
finnish/po/countries.fi.po: 1.32 -> 1.33 
french/po/countries.fr.po: 1.31 -> 1.32 
german/po/countries.de.po: 1.36 -> 1.37 
greek/po/countries.el.po: 1.10 -> 1.11 
hebrew/po/countries.he.po: 1.3 -> 1.4 
hungarian/po/countries.hu.po: 1.19 -> 1.20 
indonesian/po/countries.id.po: 1.4 -> 1.5 
japanese/po/countries.ja.po: 1.20 -> 1.21 
korean/po/countries.ko.po: 1.9 -> 1.10 
lithuanian/po/countries.lt.po: 1.4 -> 1.5 
norwegian/po/countries.nb.po: 1.3 -> 1.4 
persian/po/countries.fa.po: 1.4 -> 1.5 
polish/po/countries.pl.po: 1.26 -> 1.27 
portuguese/po/countries.pt.po: 1.24 -> 1.25 
russian/po/countries.ru.po: 1.27 -> 1.28 
slovak/po/countries.sk.po: 1.6 -> 1.7 
slovene/po/countries.sl.po: 1.2 -> 1.3 
swedish/po/countries.sv.po: 1.29 -> 1.30 
tamil/po/countries.ta.po: 1.1 -> 1.2 
turkish/po/countries.tr.po: 1.5 -> 1.6 
ukrainian/po/countries.uk.po: 1.7 -> 1.8 
vietnamese/po/countries.vi.po: 1.1 -> 1.2(DEAD)

33 files changed, 3251 insertions, 2788 deletions

diff --git a/arabic/po/countries.ar.po b/arabic/po/countries.ar.po
index a1b7a816435..733b83c4a9e 100644
--- a/arabic/po/countries.ar.po
+++ b/arabic/po/countries.ar.po
@@ -7,347 +7,416 @@ msgstr ""
 "PO-Revision-Date: 2006-01-30 23:40+0100\n"
 "Last-Translator: Mohammed Adnene Trojette <adn+deb@diwi.org>\n"
 "Language-Team: Arabic <debian-l10n-arabic@lists.debian.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../english/template/debian/countries.wml:26
+#, fuzzy
+#| msgid "United States"
+msgid "United Arab Emirates"
+msgstr "الولايات المتحدة"
+
+#: ../../english/template/debian/countries.wml:29
 msgid "Albania"
 msgstr "ألبانيا"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:32
 msgid "Armenia"
 msgstr "أرمينيا"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:35
 msgid "Argentina"
 msgstr "الأرجنتين"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:38
 msgid "Austria"
 msgstr "النمسا"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:41
 msgid "Australia"
 msgstr "أستراليا"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:44
 msgid "Bosnia and Herzegovina"
 msgstr "البسنة و الهرسك"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:47
 msgid "Bangladesh"
 msgstr "البنغلادش"
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:50
 msgid "Belgium"
 msgstr "بلجيكا"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:53
 msgid "Bulgaria"
 msgstr "بلغاريا"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:56
 msgid "Brazil"
 msgstr "البرازيل"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:59
+msgid "Bahamas"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:62
 msgid "Belarus"
 msgstr "روسيا البيضاء"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:65
 msgid "Canada"
 msgstr "كندا"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:68
 msgid "Switzerland"
 msgstr "سويسرا"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:71
 msgid "Chile"
 msgstr "تشيلي"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:74
 msgid "China"
 msgstr "الصين"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:77
 msgid "Colombia"
 msgstr "كولومبيا"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:80
 msgid "Costa Rica"
 msgstr "كوستاريكا"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:83
 msgid "Czech Republic"
 msgstr "جمهورية التشيك"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:86
 msgid "Germany"
 msgstr "ألمانيا"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:89
 msgid "Denmark"
 msgstr "الدنمارك"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:92
 msgid "Dominican Republic"
 msgstr "جمهورية الدومينيك"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:95
+msgid "Algeria"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:98
+msgid "Ecuador"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:101
 msgid "Estonia"
 msgstr "إستونيا"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:104
 msgid "Egypt"
 msgstr "مصر"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:107
 msgid "Spain"
 msgstr "إسبانيا"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:110
 msgid "Ethiopia"
 msgstr "اثيوبيا"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:113
 msgid "Finland"
 msgstr "فنلندا"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:116
 msgid "Faroe Islands"
 msgstr "جزر الفيرو"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:119
 msgid "France"
 msgstr "فرنسا"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:122
 msgid "Great Britain"
 msgstr "بريطانيا"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:125
 msgid "Grenada"
 msgstr "غرانادا"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:128
+msgid "Georgia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:131
 msgid "Greenland"
 msgstr "غرينلاند"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:134
 msgid "Greece"
 msgstr "اليونان"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:137
 msgid "Guatemala"
 msgstr "غواتيمالا"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:140
 msgid "Hong Kong"
 msgstr "هونغ كونغ"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:143
 msgid "Honduras"
 msgstr "هندوراس"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:146
 msgid "Croatia"
 msgstr "كرواتيا"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:149
 msgid "Hungary"
 msgstr "هنغاريا"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:152
 msgid "Indonesia"
 msgstr "اندونيسيا"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:155
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:158
 msgid "Ireland"
 msgstr "ايرلندا"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:161
 msgid "Israel"
 msgstr "اسرائيل"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:164
 msgid "India"
 msgstr "الهند"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:167
 msgid "Iceland"
 msgstr "آيسلندا"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:170
 msgid "Italy"
 msgstr "ايطاليا"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:173
 msgid "Jordan"
 msgstr "الأردن"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:176
 msgid "Japan"
 msgstr "اليابان"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:179
 msgid "Kenya"
 msgstr "كينيا"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:182
 msgid "Korea"
 msgstr "كوريا"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:185
 msgid "Kuwait"
 msgstr "الكويت"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:188
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Kazakhstan"
+msgstr "بكستان"
+
+#: ../../english/template/debian/countries.wml:191
 msgid "Sri Lanka"
 msgstr "سريلانكا"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:194
 msgid "Lithuania"
 msgstr "ليتوانيا"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:197
 msgid "Luxembourg"
 msgstr "لوكسمبورغ"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:200
 msgid "Latvia"
 msgstr "لاتفيا"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:203
 msgid "Morocco"
 msgstr "المغرب"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:206
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:209
+#, fuzzy
+#| msgid "Serbia and Montenegro"
+msgid "Montenegro"
+msgstr "صربية و المنتنيغرو"
+
+#: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "مدغشقر"
+
+#: ../../english/template/debian/countries.wml:215
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:218
+msgid "Malta"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "المكسيك"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "ماليزيا"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:227
+msgid "New Caledonia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "نيكاراغوا"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "هولندا"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "النرويج"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "نيوزيلندا"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "بنما"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "بيرو"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:248
+msgid "French Polynesia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "الفلبين"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "بكستان"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "بولندا"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "البرتغال"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "رومانيا"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:266
+msgid "Serbia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "روسيا"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "السعودية"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "السويد"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "سنغافورة"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "سلوفينيا"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "سلوفاكيا"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "السلفادور"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "تايلاند"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "تونس"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "تركيا"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "تايوان"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "أوكرانيا"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "المملكة المتحدة"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "الولايات المتحدة"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "أوروغواي"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:314
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Uzbekistan"
+msgstr "بكستان"
+
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "فينزويلا"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "فيتنام"
 
-#: ../../english/template/debian/countries.wml:275
-msgid "Serbia and Montenegro"
-msgstr "صربية و المنتنيغرو"
-
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "جنوب أفريقيا"
 
diff --git a/armenian/po/countries.hy.po b/armenian/po/countries.hy.po
index c707bce18e0..c0a309063f5 100644
--- a/armenian/po/countries.hy.po
+++ b/armenian/po/countries.hy.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2006-08-12 17:27+0200\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -103,281 +104,315 @@ msgid "Dominican Republic"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:95
-msgid "Ecuador"
+msgid "Algeria"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:98
+msgid "Ecuador"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:101
 msgid "Estonia"
 msgstr "Էստոնիա"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:104
 msgid "Egypt"
 msgstr "Եգիպտոս"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:107
 msgid "Spain"
 msgstr "Իսպանիա"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:110
 msgid "Ethiopia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:113
 msgid "Finland"
 msgstr "Ֆինլանդիա"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:116
 msgid "Faroe Islands"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:119
 msgid "France"
 msgstr "Ֆրանսիա"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:122
 msgid "Great Britain"
 msgstr "Մեծ Բրիտանիա"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:125
 #, fuzzy
 msgid "Grenada"
 msgstr "Կանադա"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:128
 msgid "Georgia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:131
 msgid "Greenland"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:134
 msgid "Greece"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:137
 msgid "Guatemala"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:140
 msgid "Hong Kong"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:143
 msgid "Honduras"
 msgstr "Գանդուրաս"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:146
 msgid "Croatia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:149
 msgid "Hungary"
 msgstr "Հունգարիա"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:152
 msgid "Indonesia"
 msgstr "Ինդոնեզիա"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:155
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:158
 msgid "Ireland"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:161
 msgid "Israel"
 msgstr "Իսրաել"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:164
 msgid "India"
 msgstr "Հնդկաստան"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:167
 msgid "Iceland"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:170
 msgid "Italy"
 msgstr "Իտալիա"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:173
 msgid "Jordan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:176
 msgid "Japan"
 msgstr "Ճապոնիա"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:179
 msgid "Kenya"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:182
 msgid "Korea"
 msgstr "Կորեա"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:185
 msgid "Kuwait"
 msgstr "Քուվեիտ"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:188
 #, fuzzy
 msgid "Kazakhstan"
 msgstr "Պակիստան"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:191
 msgid "Sri Lanka"
 msgstr "Շիրի Լանկա"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:194
 msgid "Lithuania"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:197
 msgid "Luxembourg"
 msgstr "Լուկսենբուրգ"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:200
 msgid "Latvia"
 msgstr "Լատվիա"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:203
 msgid "Morocco"
 msgstr "Մարոկո"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:206
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:209
 msgid "Montenegro"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Մադագասկար"
+
+#: ../../english/template/debian/countries.wml:215
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:218
 #, fuzzy
 msgid "Malta"
 msgstr "Մալազիա"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Մեքսիկա"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Մալազիա"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:227
+msgid "New Caledonia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Նիկարագուա"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Նորվեգիա"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Պանամա"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Պեռու"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:248
+msgid "French Polynesia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Ֆիլիպիններ"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Պակիստան"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Պորտուգալիա"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Ռումինիա"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Ռուսաստան"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Շվեդիա"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Սինգապուր"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Սլովենիա"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Սլովակիա"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Թաիլանդ"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:293
 #, fuzzy
 msgid "Tunisia"
 msgstr "Ռուսաստան"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Թուրքիա"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Տաիվան"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ուկրաինիա"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Միացիալ Թագավորություն"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Միացիալ Նահանգներ"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Ուրուգվայ"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:314
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Uzbekistan"
+msgstr "Պակիստան"
+
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Վենեսուելա"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Վիետնամ"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Հարավային Աֆրիկա"
diff --git a/bulgarian/po/countries.bg.po b/bulgarian/po/countries.bg.po
index 00a4e453812..d5fab25d93c 100644
--- a/bulgarian/po/countries.bg.po
+++ b/bulgarian/po/countries.bg.po
@@ -262,149 +262,153 @@ msgid "Montenegro"
 msgstr "Черна Гора"
 
 #: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Мадагаскар"
+
+#: ../../english/template/debian/countries.wml:215
 msgid "Mongolia"
 msgstr "Монголия"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Малта"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Мексико"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Малайзия"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Нова Каледония"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Никарагуа"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Холандия"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Норвегия"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Нова Зеландия"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Панама"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Перу"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Френска Полинезия"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Филипини"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Пакистан"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Полша"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Португалия"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Румъния"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Сърбия"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Русия"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Саудитска Арабия"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Швеция"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Словения"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Словакия"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "Ел Салвадор"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Тайланд"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tунис"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Турция"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Тайван"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Украйна"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Обединено Кралство"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Съединени Щати"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Уругвай"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Узбекистан"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Венецуела"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Виетнам"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "ЮАР"
diff --git a/chinese/po/countries.zh.po b/chinese/po/countries.zh.po
index 61cf7cb565b..6e5aff3069a 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -5,6 +5,7 @@ msgstr ""
 "Last-Translator: Kanru Chen <koster@debian.org.tw>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
 "debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,290 +103,310 @@ msgid "Dominican Republic"
 msgstr "多米尼加共和國"
 
 #: ../../english/template/debian/countries.wml:95
+msgid "Algeria"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:98
 msgid "Ecuador"
 msgstr "厄瓜多"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:101
 msgid "Estonia"
 msgstr "愛沙尼亞"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:104
 msgid "Egypt"
 msgstr "埃及"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:107
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:110
 msgid "Ethiopia"
 msgstr "衣索比亞"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:113
 msgid "Finland"
 msgstr "芬蘭"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:116
 msgid "Faroe Islands"
 msgstr "法羅群島"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:119
 msgid "France"
 msgstr "法國"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:122
 msgid "Great Britain"
 msgstr "英國"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:125
 msgid "Grenada"
 msgstr "格瑞那達"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:128
 msgid "Georgia"
 msgstr "喬治亞"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:131
 msgid "Greenland"
 msgstr "格陵蘭"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:134
 msgid "Greece"
 msgstr "希臘"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:137
 msgid "Guatemala"
 msgstr "瓜地馬拉"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:140
 msgid "Hong Kong"
 msgstr "香港"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:143
 msgid "Honduras"
 msgstr "[CNHK:洪都拉斯:][TW:宏都拉斯:]"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:146
 msgid "Croatia"
 msgstr "[CNHK:克羅地亞:][TW:克羅埃西亞:]"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:149
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:152
 msgid "Indonesia"
 msgstr "印尼"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:155
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:158
 msgid "Ireland"
 msgstr "愛爾蘭"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:161
 msgid "Israel"
 msgstr "以色列"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:164
 msgid "India"
 msgstr "印度"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:167
 msgid "Iceland"
 msgstr "冰島"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:170
 msgid "Italy"
 msgstr "意大利"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:173
 msgid "Jordan"
 msgstr "約旦"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:176
 msgid "Japan"
 msgstr "日本"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:179
 msgid "Kenya"
 msgstr "肯亞"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:182
 msgid "Korea"
 msgstr "韓國"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:185
 msgid "Kuwait"
 msgstr "科威特"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:188
 msgid "Kazakhstan"
 msgstr "哈薩克"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:191
 msgid "Sri Lanka"
 msgstr "斯里蘭卡"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:194
 msgid "Lithuania"
 msgstr "立陶宛"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:197
 msgid "Luxembourg"
 msgstr "盧森堡"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:200
 msgid "Latvia"
 msgstr "拉脫維亞"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:203
 msgid "Morocco"
 msgstr "摩洛哥"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:206
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:209
 msgid "Montenegro"
 msgstr "蒙特內哥羅"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "马达加斯加"
+
+#: ../../english/template/debian/countries.wml:215
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "馬爾他"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "墨西哥"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "馬來西亞"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "新喀里多尼亞"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "荷蘭"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "挪威"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "新西蘭"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "巴拿馬"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "秘魯"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "法屬玻里尼西亞"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "菲律賓"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "巴基斯坦"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "波蘭"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "羅馬尼亞"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "塞爾維亞"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "俄國"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "沙地阿拉伯"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "斯洛文尼亞"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "薩爾瓦多"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "泰國"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "突尼西亞"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "土耳其"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "台灣"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "烏克蘭"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "英國"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "美國"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "烏拉圭"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "烏茲別克"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "委內瑞拉"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "越南"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "南非"
 
diff --git a/croatian/po/countries.hr.po b/croatian/po/countries.hr.po
index 506bd041b29..0d2a5e0a733 100644
--- a/croatian/po/countries.hr.po
+++ b/croatian/po/countries.hr.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2008-08-16 14:05+0200\n"
 "Last-Translator: Josip Rodin\n"
 "Language-Team: Croatian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,289 +102,309 @@ msgid "Dominican Republic"
 msgstr "Dominikanska Republika"
 
 #: ../../english/template/debian/countries.wml:95
+msgid "Algeria"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:98
 msgid "Ecuador"
 msgstr "Ekvador"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:101
 msgid "Estonia"
 msgstr "Estonija"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:104
 msgid "Egypt"
 msgstr "Egipat"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:107
 msgid "Spain"
 msgstr "Španjolska"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:110
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:113
 msgid "Finland"
 msgstr "Finska"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:116
 msgid "Faroe Islands"
 msgstr "Farski otoci"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:119
 msgid "France"
 msgstr "Francuska"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:122
 msgid "Great Britain"
 msgstr "Velika Britanija"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:125
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:128
 msgid "Georgia"
 msgstr "Gruzija"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:131
 msgid "Greenland"
 msgstr "Grenland"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:134
 msgid "Greece"
 msgstr "Grčka"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:137
 msgid "Guatemala"
 msgstr "Gvatemala"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:140
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:143
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:146
 msgid "Croatia"
 msgstr "Hrvatska"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:149
 msgid "Hungary"
 msgstr "Mađarska"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:152
 msgid "Indonesia"
 msgstr "Indonezija"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:155
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:158
 msgid "Ireland"
 msgstr "Irska"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:161
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:164
 msgid "India"
 msgstr "Indija"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:167
 msgid "Iceland"
 msgstr "Island"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:170
 msgid "Italy"
 msgstr "Italija"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:173
 msgid "Jordan"
 msgstr "Jordan"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:176
 msgid "Japan"
 msgstr "Japan"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:179
 msgid "Kenya"
 msgstr "Kenija"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:182
 msgid "Korea"
 msgstr "Koreja"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:185
 msgid "Kuwait"
 msgstr "Kuvajt"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:188
 msgid "Kazakhstan"
 msgstr "Kazahstan"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:191
 msgid "Sri Lanka"
 msgstr "Šri Lanka"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:194
 msgid "Lithuania"
 msgstr "Litva"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:197
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:200
 msgid "Latvia"
 msgstr "Latvija"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:203
 msgid "Morocco"
 msgstr "Maroko"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:206
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:209
 msgid "Montenegro"
 msgstr "Crna Gora"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: ../../english/template/debian/countries.wml:215
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malezija"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Nova Kaledonija"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nikaragva"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Nizozemska"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Norveška"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Novi Zeland"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Francuska Polinezija"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Filipini"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Poljska"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Rumunjska"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Srbija"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Rusija"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Saudijska Arabija"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Švedska"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Slovenija"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Slovačka"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "Salvador"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Tajland"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tunis"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Turska"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ukrajina"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Velika Britanija"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Sjedinjene Države"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Urugvaj"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venecuela"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Vijetnam"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Južna Afrika"
diff --git a/czech/po/countries.cs.po b/czech/po/countries.cs.po
index eb7dd8aba10..8e332f900b4 100644
--- a/czech/po/countries.cs.po
+++ b/czech/po/countries.cs.po
@@ -5,13 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: countries 1.25\n"
+"POT-Creation-Date: \n"
 "PO-Revision-Date: 2011-02-01 12:37+0100\n"
 "Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: \n"
 
 #: ../../english/template/debian/countries.wml:26
 msgid "United Arab Emirates"
@@ -106,290 +107,309 @@ msgid "Dominican Republic"
 msgstr "Dominik�nsk� republika"
 
 #: ../../english/template/debian/countries.wml:95
+msgid "Algeria"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:98
 msgid "Ecuador"
 msgstr "Ekv�dor"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:101
 msgid "Estonia"
 msgstr "Estonsko"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:104
 msgid "Egypt"
 msgstr "Egypt"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:107
 msgid "Spain"
 msgstr "�pan�lsko"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:110
 msgid "Ethiopia"
 msgstr "Etiopie"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:113
 msgid "Finland"
 msgstr "Finsko"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:116
 msgid "Faroe Islands"
 msgstr "Faersk� ostrovy"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:119
 msgid "France"
 msgstr "Francie"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:122
 msgid "Great Britain"
 msgstr "Velk� Brit�nie"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:125
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:128
 msgid "Georgia"
 msgstr "Gruzie"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:131
 msgid "Greenland"
 msgstr "Gr�nsko"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:134
 msgid "Greece"
 msgstr "�ecko"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:137
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:140
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:143
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:146
 msgid "Croatia"
 msgstr "Chorvatsko"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:149
 msgid "Hungary"
 msgstr "Ma�arsko"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:152
 msgid "Indonesia"
 msgstr "Indon�sie"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:155
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:158
 msgid "Ireland"
 msgstr "Irsko"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:161
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:164
 msgid "India"
 msgstr "Indie"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:167
 msgid "Iceland"
 msgstr "Island"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:170
 msgid "Italy"
 msgstr "It�lie"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:173
 msgid "Jordan"
 msgstr "Jord�nsko"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:176
 msgid "Japan"
 msgstr "Japonsko"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:179
 msgid "Kenya"
 msgstr "Ke�a"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:182
 msgid "Korea"
 msgstr "Korea"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:185
 msgid "Kuwait"
 msgstr "Kuvajt"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:188
 msgid "Kazakhstan"
 msgstr "Kazachst�n"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:191
 msgid "Sri Lanka"
 msgstr "Sr� Lanka"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:194
 msgid "Lithuania"
 msgstr "Litva"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:197
 msgid "Luxembourg"
 msgstr "Lucembursko"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:200
 msgid "Latvia"
 msgstr "Loty�sko"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:203
 msgid "Morocco"
 msgstr "Maroko"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:206
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:209
 msgid "Montenegro"
 msgstr "�ern� Hora"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: ../../english/template/debian/countries.wml:215
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malajsie"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Nov� Kaledonie"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Nizozem�"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Norsko"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Nov� Z�land"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Francouzsk� Polyn�sie"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Filip�ny"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "P�kist�n"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Polsko"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugalsko"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Rumunsko"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Srbsko"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Rusko"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Saudsk� Ar�bie"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "�v�dsko"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Slovinsko"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Slovensko"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "Salvador"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Thajsko"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tunisko"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Turecko"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Tchai-wan"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ukrajina"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Spojen� kr�lovstv�"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Spojen� st�ty"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Uzbekist�n"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Ji�n� Afrika"
-
diff --git a/danish/po/countries.da.po b/danish/po/countries.da.po
index a89e431e01a..8d79a995cfd 100644
--- a/danish/po/countries.da.po
+++ b/danish/po/countries.da.po
@@ -258,150 +258,154 @@ msgid "Montenegro"
 msgstr "Montenegro"
 
 #: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: ../../english/template/debian/countries.wml:215
 msgid "Mongolia"
 msgstr "Mongoliet"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Mexico"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Ny Kaledonien"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Holland"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Norge"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Fransk Polynesien"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Filippinerne"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Polen"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Romænien"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Serbien"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Rusland"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabien"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Slovenien"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Slovakiet"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tunesien"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Tyrkiet"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Storbritannien"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "USA"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Sydafrika"
 
diff --git a/dutch/po/countries.nl.po b/dutch/po/countries.nl.po
index 62d63b6f096..004c0048a01 100644
--- a/dutch/po/countries.nl.po
+++ b/dutch/po/countries.nl.po
@@ -265,149 +265,153 @@ msgid "Montenegro"
 msgstr "Montenegro"
 
 #: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: ../../english/template/debian/countries.wml:215
 msgid "Mongolia"
 msgstr "Mongolië"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Mexico"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Maleisië"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Nieuw Caledonië"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Noorwegen"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Nieuw-Zeeland"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Frans Polynesië"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Filipijnen"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Polen"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Roemenië"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Servië"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Rusland"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Saoedi-Arabië"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Zweden"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Slovenië"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Slovakije"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tunesië"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Turkije"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Oekraïne"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Verenigd Koninkrijk"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Verenigde Staten"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Oezbekistan"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Zuid-Afrika"
diff --git a/english/po/countries.pot b/english/po/countries.pot
index bc393c478eb..ce0623161f4 100644
--- a/english/po/countries.pot
+++ b/english/po/countries.pot
@@ -252,150 +252,154 @@ msgid "Montenegro"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:212
-msgid "Mongolia"
+msgid "Madagascar"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:215
-msgid "Malta"
+msgid "Mongolia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:218
-msgid "Mexico"
+msgid "Malta"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:221
-msgid "Malaysia"
+msgid "Mexico"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:224
-msgid "New Caledonia"
+msgid "Malaysia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:227
-msgid "Nicaragua"
+msgid "New Caledonia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:230
-msgid "Netherlands"
+msgid "Nicaragua"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:233
-msgid "Norway"
+msgid "Netherlands"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:236
-msgid "New Zealand"
+msgid "Norway"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:239
-msgid "Panama"
+msgid "New Zealand"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:242
-msgid "Peru"
+msgid "Panama"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:245
-msgid "French Polynesia"
+msgid "Peru"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:248
-msgid "Philippines"
+msgid "French Polynesia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:251
-msgid "Pakistan"
+msgid "Philippines"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:254
-msgid "Poland"
+msgid "Pakistan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:257
-msgid "Portugal"
+msgid "Poland"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:260
-msgid "Romania"
+msgid "Portugal"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:263
-msgid "Serbia"
+msgid "Romania"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:266
-msgid "Russia"
+msgid "Serbia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:269
-msgid "Saudi Arabia"
+msgid "Russia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:272
-msgid "Sweden"
+msgid "Saudi Arabia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:275
-msgid "Singapore"
+msgid "Sweden"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:278
-msgid "Slovenia"
+msgid "Singapore"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:281
-msgid "Slovakia"
+msgid "Slovenia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:284
-msgid "El Salvador"
+msgid "Slovakia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:287
-msgid "Thailand"
+msgid "El Salvador"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:290
-msgid "Tunisia"
+msgid "Thailand"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:293
-msgid "Turkey"
+msgid "Tunisia"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:296
-msgid "Taiwan"
+msgid "Turkey"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:299
-msgid "Ukraine"
+msgid "Taiwan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:302
-msgid "United Kingdom"
+msgid "Ukraine"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:305
-msgid "United States"
+msgid "United Kingdom"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:308
-msgid "Uruguay"
+msgid "United States"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:311
-msgid "Uzbekistan"
+msgid "Uruguay"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:314
-msgid "Venezuela"
+msgid "Uzbekistan"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:317
-msgid "Vietnam"
+msgid "Venezuela"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:320
+msgid "Vietnam"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr ""
 
diff --git a/english/template/debian/countries.wml b/english/template/debian/countries.wml
index a4299a65e5c..1cbe419c666 100644
--- a/english/template/debian/countries.wml
+++ b/english/template/debian/countries.wml
@@ -208,6 +208,9 @@ EOT
 <define-country code="ME">
     <gettext domain="countries">Montenegro</gettext>
 </define-country>
+<define-country code="MG">
+    <gettext domain="countries">Madagascar</gettext>
+</define-country>
 <define-country code="MN">
     <gettext domain="countries">Mongolia</gettext>
 </define-country>
diff --git a/esperanto/po/countries.eo.po b/esperanto/po/countries.eo.po
index ce84983648a..3b44341c019 100644
--- a/esperanto/po/countries.eo.po
+++ b/esperanto/po/countries.eo.po
@@ -4,345 +4,412 @@ msgstr ""
 "PO-Revision-Date: 2006-08-12 16:58+0200\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../english/template/debian/countries.wml:26
+#, fuzzy
+#| msgid "United States"
+msgid "United Arab Emirates"
+msgstr "Usono"
+
+#: ../../english/template/debian/countries.wml:29
 msgid "Albania"
 msgstr "Albanio"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:32
 msgid "Armenia"
 msgstr "Armenio"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:35
 msgid "Argentina"
 msgstr "Argentino"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:38
 msgid "Austria"
 msgstr "A�strio"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:41
 msgid "Australia"
 msgstr "A�stralio"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:44
 msgid "Bosnia and Herzegovina"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:47
 msgid "Bangladesh"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:50
 msgid "Belgium"
 msgstr "Belgio"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:53
 msgid "Bulgaria"
 msgstr "Bulgario"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:56
 msgid "Brazil"
 msgstr "Brazilo"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:59
+msgid "Bahamas"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:62
 msgid "Belarus"
 msgstr "Bielorusia"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:65
 msgid "Canada"
 msgstr "Kanado"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:68
 msgid "Switzerland"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:71
 msgid "Chile"
 msgstr "�ilio"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:74
 msgid "China"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:77
 msgid "Colombia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:80
 msgid "Costa Rica"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:83
 msgid "Czech Republic"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:86
 msgid "Germany"
 msgstr "Germanio"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:89
 msgid "Denmark"
 msgstr "Danio"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:92
 msgid "Dominican Republic"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:95
+msgid "Algeria"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:98
+msgid "Ecuador"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:101
 msgid "Estonia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:104
 msgid "Egypt"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:107
 msgid "Spain"
 msgstr "Hispanio"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:110
 msgid "Ethiopia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:113
 msgid "Finland"
 msgstr "Finlando"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:116
 msgid "Faroe Islands"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:119
 msgid "France"
 msgstr "Francio"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:122
 msgid "Great Britain"
 msgstr "Britio"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:125
 #, fuzzy
 msgid "Grenada"
 msgstr "Kanado"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:128
+msgid "Georgia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:131
 msgid "Greenland"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:134
 msgid "Greece"
 msgstr "Grekio"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:137
 msgid "Guatemala"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:140
 msgid "Hong Kong"
 msgstr "Hongkongo"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:143
 msgid "Honduras"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:146
 msgid "Croatia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:149
 msgid "Hungary"
 msgstr "Hungario"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:152
 msgid "Indonesia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:155
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:158
 msgid "Ireland"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:161
 msgid "Israel"
 msgstr "Israelo"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:164
 msgid "India"
 msgstr "Hindio"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:167
 msgid "Iceland"
 msgstr "Islando"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:170
 msgid "Italy"
 msgstr "Italio"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:173
 msgid "Jordan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:176
 msgid "Japan"
 msgstr "Japanio"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:179
 msgid "Kenya"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:182
 msgid "Korea"
 msgstr "Koreio"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:185
 msgid "Kuwait"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:188
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:191
 msgid "Sri Lanka"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:194
 msgid "Lithuania"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:197
 msgid "Luxembourg"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:200
 msgid "Latvia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:203
 msgid "Morocco"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:206
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:209
+msgid "Montenegro"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaskaro"
+
+#: ../../english/template/debian/countries.wml:215
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:218
+msgid "Malta"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:227
+msgid "New Caledonia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Nederlando"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Norvegio"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Novzelando"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:242
 #, fuzzy
 msgid "Panama"
 msgstr "Kanado"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:248
+msgid "French Polynesia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Polando"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugalio"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:266
+msgid "Serbia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Rusio"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Svedio"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:293
+msgid "Tunisia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Turkio"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Tajvano"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:302
 #, fuzzy
 msgid "Ukraine"
 msgstr "Francio"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Britio"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Usono"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:266
-msgid "Venezuela"
+#: ../../english/template/debian/countries.wml:314
+msgid "Uzbekistan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:269
-msgid "Vietnam"
+#: ../../english/template/debian/countries.wml:317
+msgid "Venezuela"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:272
-msgid "Serbia and Montenegro"
+#: ../../english/template/debian/countries.wml:320
+msgid "Vietnam"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Sudafriko"
diff --git a/finnish/po/countries.fi.po b/finnish/po/countries.fi.po
index 9ecee602a46..e6572aa1648 100644
--- a/finnish/po/countries.fi.po
+++ b/finnish/po/countries.fi.po
@@ -258,150 +258,154 @@ msgid "Montenegro"
 msgstr "Montenegro"
 
 #: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: ../../english/template/debian/countries.wml:215
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malesia"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Uusi-Kaledonia"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Alankomaat"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Norja"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Uusi-Seelanti"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Ranskan Polynesia"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Filippiinit"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Puola"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugali"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Romania"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Serbia"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Venäjä"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabia"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Ruotsi"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Thaimaa"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Turkki"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Iso-Britannia"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Yhdysvallat"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Etelä-Afrikka"
 
diff --git a/french/po/countries.fr.po b/french/po/countries.fr.po
index 3eb0690dc99..9dd434051ac 100644
--- a/french/po/countries.fr.po
+++ b/french/po/countries.fr.po
@@ -271,149 +271,153 @@ msgid "Montenegro"
 msgstr "Monténégro"
 
 #: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagascar"
+
+#: ../../english/template/debian/countries.wml:215
 msgid "Mongolia"
 msgstr "Mongolie"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Malte"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Mexique"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malaisie"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Nouvelle-Calédonie"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Pays-Bas"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Norvège"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Nouvelle-Zélande"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Pérou"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Polynésie française"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Philippines"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Pologne"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Roumanie"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Serbie"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Russie"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Arabie saoudite"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Suède"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singapour"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Slovénie"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Slovaquie"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "Salvador"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Thaïlande"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tunisie"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Turquie"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Taïwan"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Royaume-Uni"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "États-Unis"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Ouzbékistan"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Viêtnam"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Afrique du Sud"
diff --git a/german/po/countries.de.po b/german/po/countries.de.po
index 60cb3a51eba..75c02b29feb 100644
--- a/german/po/countries.de.po
+++ b/german/po/countries.de.po
@@ -265,149 +265,153 @@ msgid "Montenegro"
 msgstr "Montenegro"
 
 #: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: ../../english/template/debian/countries.wml:215
 msgid "Mongolia"
 msgstr "Mongolei"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Neukaledonien"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Niederlande"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Norwegen"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Neuseeland"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Französisch-Polynesien"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Philippinen"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Polen"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Rumänien"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Serbien"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Russland"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabien"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Schweden"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Slowenien"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Slowakei"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tunesien"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Türkei"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Vereinigtes Königreich"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Vereinigte Staaten"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Südafrika"
diff --git a/greek/po/countries.el.po b/greek/po/countries.el.po
index b49679d94fc..b751a25532e 100644
--- a/greek/po/countries.el.po
+++ b/greek/po/countries.el.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2006-08-12 17:38+0200\n"
 "Last-Translator: George Papamichelakis\n"
 "Language-Team: Greek\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -53,301 +54,363 @@ msgid "Brazil"
 msgstr "Βραζιλία"
 
 #: ../../english/template/debian/countries.wml:59
+msgid "Bahamas"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:62
 msgid "Belarus"
 msgstr "Λευκορωσία"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:65
 msgid "Canada"
 msgstr "Καναδάς"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:68
 msgid "Switzerland"
 msgstr "Ελβετία"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:71
 msgid "Chile"
 msgstr "Χιλή"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:74
 msgid "China"
 msgstr "Κίνα"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:77
 msgid "Colombia"
 msgstr "Κολομβία"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:80
 msgid "Costa Rica"
 msgstr "Κόστα Ρίκα"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:83
 msgid "Czech Republic"
 msgstr "Τσεχική Δημοκρατία"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:86
 msgid "Germany"
 msgstr "Γερμανία"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:89
 msgid "Denmark"
 msgstr "Δανία"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:92
 msgid "Dominican Republic"
 msgstr "Δομινικανή Δημοκρατία"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:95
+msgid "Algeria"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:98
+msgid "Ecuador"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:101
 msgid "Estonia"
 msgstr "Εσθονία"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:104
 msgid "Egypt"
 msgstr "Αίγυπτος"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:107
 msgid "Spain"
 msgstr "Ισπανία"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:110
 msgid "Ethiopia"
 msgstr "Εθιοπία"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:113
 msgid "Finland"
 msgstr "Φινλανδία"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:116
 msgid "Faroe Islands"
 msgstr "Νήσοι Φερόες"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:119
 msgid "France"
 msgstr "Γαλλία"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:122
 msgid "Great Britain"
 msgstr "Μ. Βρετανία"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:125
 msgid "Grenada"
 msgstr "Γρενάδα"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:128
+msgid "Georgia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:131
 msgid "Greenland"
 msgstr "Γροιλανδία"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:134
 msgid "Greece"
 msgstr "Ελλάδα"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:137
 msgid "Guatemala"
 msgstr "Γουατεμάλα"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:140
 msgid "Hong Kong"
 msgstr "Χονκ Κονκ"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:143
 msgid "Honduras"
 msgstr "Ονδούρες"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:146
 msgid "Croatia"
 msgstr "Κροατία"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:149
 msgid "Hungary"
 msgstr "Ουγγαρία"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:152
 msgid "Indonesia"
 msgstr "Ινδονησία"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:155
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:158
 msgid "Ireland"
 msgstr "Ιρλανδία"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:161
 msgid "Israel"
 msgstr "Ισραήλ"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:164
 msgid "India"
 msgstr "Ινδία"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:167
 msgid "Iceland"
 msgstr "Ισλανδία"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:170
 msgid "Italy"
 msgstr "Ιταλία"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:173
 msgid "Jordan"
 msgstr "Ιορδανία"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:176
 msgid "Japan"
 msgstr "Ιαπωνία"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:179
 msgid "Kenya"
 msgstr "Κένυα"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:182
 msgid "Korea"
 msgstr "Κορέα"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:185
 msgid "Kuwait"
 msgstr "Κουβέιτ"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:188
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Kazakhstan"
+msgstr "Πακιστάν"
+
+#: ../../english/template/debian/countries.wml:191
 msgid "Sri Lanka"
 msgstr "Σρι-Λάνκα"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:194
 msgid "Lithuania"
 msgstr "Λιθουανία"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:197
 msgid "Luxembourg"
 msgstr "Λουξεμβούργο"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:200
 msgid "Latvia"
 msgstr "Λετονία"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:203
 msgid "Morocco"
 msgstr "Μαρόκο"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:206
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:209
+#, fuzzy
+#| msgid "Serbia and Montenegro"
+msgid "Montenegro"
+msgstr "Σερβία και Μοντενέγκρο"
+
+#: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Μαδαγασκάρη"
+
+#: ../../english/template/debian/countries.wml:215
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:218
+msgid "Malta"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Μεξικό"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Μαλαισία"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:227
+msgid "New Caledonia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Νικαράγουα"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Ολλανδία"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Νορβηγία"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Νέα Ζηλανδία"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Παναμάς"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Περού"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:248
+msgid "French Polynesia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Φιλιππίνες"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Πακιστάν"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Πολωνία"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Πορτογαλία"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Ρουμανία"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:266
+msgid "Serbia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Ρωσία"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Σαουδική Αραβία"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Σουηδία"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Σιγκαπούρη"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Σλοβενία"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Σλοβακία"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "Ελ Σαλβαδόρ"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Ταϊλάνδη"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Τυνισία"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Τουρκία"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Ταΐβάν"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ουκρανία"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Ην. Βασίλειο"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Ην. Πολιτείες"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Ουρουγουάη"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:314
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Uzbekistan"
+msgstr "Πακιστάν"
+
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Βενεζουέλα"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Βιετνάμ"
 
-#: ../../english/template/debian/countries.wml:278
-msgid "Serbia and Montenegro"
-msgstr "Σερβία και Μοντενέγκρο"
-
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Νότια Αφρική"
diff --git a/hebrew/po/countries.he.po b/hebrew/po/countries.he.po
index c4a6edf9af1..172de8fbc06 100644
--- a/hebrew/po/countries.he.po
+++ b/hebrew/po/countries.he.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2008-06-17 13:52+0200\n"
 "Last-Translator: Oz Nahum <nahumoz@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -101,282 +102,309 @@ msgid "Dominican Republic"
 msgstr "הרפוליקה הדומיניקית"
 
 #: ../../english/template/debian/countries.wml:95
+msgid "Algeria"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:98
 msgid "Ecuador"
 msgstr "אקוודור"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:101
 msgid "Estonia"
 msgstr "אסטוניה"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:104
 msgid "Egypt"
 msgstr "מצרים"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:107
 msgid "Spain"
 msgstr "ספרד"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:110
 msgid "Ethiopia"
 msgstr "אתיופיה"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:113
 msgid "Finland"
 msgstr "פינלנד"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:116
 msgid "Faroe Islands"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:119
 msgid "France"
 msgstr "צרפת"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:122
 msgid "Great Britain"
 msgstr "בריטניה"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:125
 msgid "Grenada"
 msgstr "גרנאדה"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:128
 msgid "Georgia"
 msgstr "גיאורגיה"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:131
 msgid "Greenland"
 msgstr "גרינלנד"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:134
 msgid "Greece"
 msgstr "יוון"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:137
 msgid "Guatemala"
 msgstr "גוואטמלה"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:140
 msgid "Hong Kong"
 msgstr "הונג קונג"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:143
 msgid "Honduras"
 msgstr "הונדורס"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:146
 msgid "Croatia"
 msgstr "קרואטיה"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:149
 msgid "Hungary"
 msgstr "הונגריה"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:152
 msgid "Indonesia"
 msgstr "אינדונזיה"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:155
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:158
 msgid "Ireland"
 msgstr "אירלנד"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:161
 msgid "Israel"
 msgstr "ישראל"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:164
 msgid "India"
 msgstr "הודו"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:167
 msgid "Iceland"
 msgstr "איסלנד"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:170
 msgid "Italy"
 msgstr "איטליה"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:173
 msgid "Jordan"
 msgstr "ירדן"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:176
 msgid "Japan"
 msgstr "יפן"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:179
 msgid "Kenya"
 msgstr "קניה"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:182
 msgid "Korea"
 msgstr "קוריאה"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:185
 msgid "Kuwait"
 msgstr "כוויית"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:188
 msgid "Kazakhstan"
 msgstr "קזחסטאן"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:191
 msgid "Sri Lanka"
 msgstr "סרי לנקה"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:194
 msgid "Lithuania"
 msgstr "ליטא"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:197
 msgid "Luxembourg"
 msgstr "לוקסמבורג"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:200
 msgid "Latvia"
 msgstr "לטביה"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:203
 msgid "Morocco"
 msgstr "מרוקו"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:206
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:209
 msgid "Montenegro"
 msgstr "מונטנגרו"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "מדגסקר"
+
+#: ../../english/template/debian/countries.wml:215
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "מלטה"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "מקיסקו"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "מלזיה"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:227
+msgid "New Caledonia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "ניקרגוואה"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "הולנד"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "נורווגיה"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "ניו זילנד"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "פנמה"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "פרו"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:248
+msgid "French Polynesia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "פיליפינים"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "פקיסטאן"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "פולין"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "פורטוגל"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "רומניה"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "סרביה"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "רוסיה"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "ערב הסעודית"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "שוודיה"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "סינגפור"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "סלובניה"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "סלובקיה"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "אל סלוודור"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "תאילנד"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "תוניס"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "תורכיה"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "טאיואן"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "אוקראינה"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "בריטניה"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "ארצות הברית"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "אורוגוואי"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "אוזבקיסטן"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "וונצואלה"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "ויאטנם"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "דרום אפריקה"
-
diff --git a/hungarian/po/countries.hu.po b/hungarian/po/countries.hu.po
index e5c04b93acf..a91597bdfdd 100644
--- a/hungarian/po/countries.hu.po
+++ b/hungarian/po/countries.hu.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2011-01-10 22:52+0100\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -257,150 +258,154 @@ msgid "Montenegro"
 msgstr "Montenegró"
 
 #: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaszkár"
+
+#: ../../english/template/debian/countries.wml:215
 msgid "Mongolia"
 msgstr "Mongólia"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Málta"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Mexikó"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malajzia"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Új Kaledónia"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Hollandia"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Norvégia"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Új-Zéland"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Francia Polinézia"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Fülöp-szigetek"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Pakisztán"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Lengyelország"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugália"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Románia"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Szerbia"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Oroszország"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Szaud-Arábia"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Svédország"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Szingapúr"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Szlovénia"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Szlovákia"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Thaiföld"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tunézia"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Törökország"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ukrajna"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Nagy-Britannia"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Egyesült Államok"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Üzbegisztán"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Vietnám"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Dél-Afrika"
 
diff --git a/indonesian/po/countries.id.po b/indonesian/po/countries.id.po
index 304958ac2cf..b150c341a0a 100644
--- a/indonesian/po/countries.id.po
+++ b/indonesian/po/countries.id.po
@@ -1,13 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debian webwml organization\n"
+"POT-Creation-Date: \n"
 "PO-Revision-Date: 2010-11-24 01:51+0700\n"
 "Last-Translator: Mahyuddin Susanto <udienz@gmail.com>\n"
 "Language-Team: Debian Indonesia Translator <debian-l10n@debian-id.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: \n"
 "X-Poedit-Language: Indonesian\n"
 "X-Poedit-Country: INDONESIA\n"
 
@@ -56,302 +57,363 @@ msgid "Brazil"
 msgstr "Brasil"
 
 #: ../../english/template/debian/countries.wml:59
+msgid "Bahamas"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:62
 msgid "Belarus"
 msgstr "Belarusia"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:65
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:68
 msgid "Switzerland"
 msgstr "Swiss"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:71
 msgid "Chile"
 msgstr "Cili"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:74
 msgid "China"
 msgstr "Cina"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:77
 msgid "Colombia"
 msgstr "Kolombia"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:80
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:83
 msgid "Czech Republic"
 msgstr "Republik Ceko"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:86
 msgid "Germany"
 msgstr "Jerman"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:89
 msgid "Denmark"
 msgstr "Denmark"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:92
 msgid "Dominican Republic"
 msgstr "Republik Dominika"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:95
+msgid "Algeria"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:98
+msgid "Ecuador"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:101
 msgid "Estonia"
 msgstr "Estonia"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:104
 msgid "Egypt"
 msgstr "Mesir"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:107
 msgid "Spain"
 msgstr "Spanyol"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:110
 msgid "Ethiopia"
 msgstr "Ethiopia"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:113
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:116
 msgid "Faroe Islands"
 msgstr "Kepulauan Faroe"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:119
 msgid "France"
 msgstr "Perancis"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:122
 msgid "Great Britain"
 msgstr "Inggris"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:125
 msgid "Grenada"
 msgstr "Granada"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:128
+msgid "Georgia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:131
 msgid "Greenland"
 msgstr "Greenland"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:134
 msgid "Greece"
 msgstr "Yunani"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:137
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:140
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:143
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:146
 msgid "Croatia"
 msgstr "Kroasia"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:149
 msgid "Hungary"
 msgstr "Hongaria"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:152
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:155
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:158
 msgid "Ireland"
 msgstr "Irlandia"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:161
 msgid "Israel"
 msgstr "Israel"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:164
 msgid "India"
 msgstr "India"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:167
 msgid "Iceland"
 msgstr "Islandia"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:170
 msgid "Italy"
 msgstr "Italia"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:173
 msgid "Jordan"
 msgstr "Jordania"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:176
 msgid "Japan"
 msgstr "Jepang"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:179
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:182
 msgid "Korea"
 msgstr "Korea"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:185
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:188
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Kazakhstan"
+msgstr "Pakistan"
+
+#: ../../english/template/debian/countries.wml:191
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:194
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:197
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:200
 msgid "Latvia"
 msgstr "Latvia"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:203
 msgid "Morocco"
 msgstr "Maroko"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:206
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:209
+#, fuzzy
+#| msgid "Serbia and Montenegro"
+msgid "Montenegro"
+msgstr "Serbia Montenegro"
+
+#: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: ../../english/template/debian/countries.wml:215
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:218
+msgid "Malta"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:227
+msgid "New Caledonia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Belanda"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Norwegia"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Selandia Baru"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:248
+msgid "French Polynesia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Filipina"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Polandia"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Rumania"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:266
+msgid "Serbia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Arab Saudi"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Swedia"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singapura"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Slowakia"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Turki"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Thailand"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Inggris"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Amerika Serikat"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:314
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Uzbekistan"
+msgstr "Pakistan"
+
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:278
-msgid "Serbia and Montenegro"
-msgstr "Serbia Montenegro"
-
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Afrika Selatan"
-
diff --git a/japanese/po/countries.ja.po b/japanese/po/countries.ja.po
index 486b277f2af..6b2019fee40 100644
--- a/japanese/po/countries.ja.po
+++ b/japanese/po/countries.ja.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: countries.po\n"
+"POT-Creation-Date: \n"
 "PO-Revision-Date: 2010-12-14 13:04+0900\n"
 "Last-Translator: Nobuhiro Iwamatsu <iwamatsu@debian.org>\n"
 "Language-Team: Japanese <debian-doc@debian.or.jp>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: \n"
 
 #: ../../english/template/debian/countries.wml:26
 msgid "United Arab Emirates"
@@ -259,150 +259,153 @@ msgid "Montenegro"
 msgstr "モンテネグロ"
 
 #: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "マダガスカル"
+
+#: ../../english/template/debian/countries.wml:215
 msgid "Mongolia"
 msgstr "モンゴル"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "マルタ"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "メキシコ"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "マレーシア"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "ニューカレドニア"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "ニカラグア"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "オランダ"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "ノルウェー"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "ニュージーランド"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "パナマ"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "ペルー"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "フランス領ポリネシア"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "フィリピン"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "パキスタン"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "ポーランド"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "ポルトガル"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "ルーマニア"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "セルビア"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "ロシア"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "サウジアラビア"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "スウェーデン"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "シンガポール"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "スロベニア"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "スロバキア"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "エルサルバドル"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "タイ"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "チュニジア"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "トルコ"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "台湾"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "ウクライナ"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "イギリス"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "アメリカ合衆国"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "ウルグアイ"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "ウズベキスタン"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "ベネズエラ"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "ベトナム"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "南アフリカ"
-
diff --git a/korean/po/countries.ko.po b/korean/po/countries.ko.po
index 776c72d93dc..f44cbf45bc9 100644
--- a/korean/po/countries.ko.po
+++ b/korean/po/countries.ko.po
@@ -8,6 +8,7 @@ msgstr ""
 "PO-Revision-Date: 2007-09-08 00:56+0900\n"
 "Last-Translator: Song Woo-il <wooil@debian.or.kr>\n"
 "Language-Team: debian-kr-www <debian-kr-www@lists.debian.or.kr>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -105,270 +106,312 @@ msgid "Dominican Republic"
 msgstr "���̴�ī ��ȭ��"
 
 #: ../../english/template/debian/countries.wml:95
+msgid "Algeria"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:98
 msgid "Ecuador"
 msgstr "���⵵��"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:101
 msgid "Estonia"
 msgstr "������Ͼ�"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:104
 msgid "Egypt"
 msgstr "����Ʈ"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:107
 msgid "Spain"
 msgstr "������"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:110
 msgid "Ethiopia"
 msgstr "��Ƽ���Ǿ�"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:113
 msgid "Finland"
 msgstr "�ɶ���"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:116
 msgid "Faroe Islands"
 msgstr "��ν� ����"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:119
 msgid "France"
 msgstr "������"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:122
 msgid "Great Britain"
 msgstr "����"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:125
 msgid "Grenada"
 msgstr "�׷�����"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:128
+msgid "Georgia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:131
 msgid "Greenland"
 msgstr "�׸�����"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:134
 msgid "Greece"
 msgstr "�׸���"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:137
 msgid "Guatemala"
 msgstr "���׸���"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:140
 msgid "Hong Kong"
 msgstr "ȫ��"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:143
 msgid "Honduras"
 msgstr "�µζ�"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:146
 msgid "Croatia"
 msgstr "ũ�ξ�Ƽ��"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:149
 msgid "Hungary"
 msgstr "�밡��"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:152
 msgid "Indonesia"
 msgstr "�ε��׽þ�"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:155
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:158
 msgid "Ireland"
 msgstr "���Ϸ���"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:161
 msgid "Israel"
 msgstr "�̽���"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:164
 msgid "India"
 msgstr "�ε�"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:167
 msgid "Iceland"
 msgstr "���̽�����"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:170
 msgid "Italy"
 msgstr "��Ż����"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:173
 msgid "Jordan"
 msgstr "�丣��"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:176
 msgid "Japan"
 msgstr "�Ϻ�"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:179
 msgid "Kenya"
 msgstr "�ɳ�"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:182
 msgid "Korea"
 msgstr "���ѹα�"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:185
 msgid "Kuwait"
 msgstr "������Ʈ"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:188
 msgid "Kazakhstan"
 msgstr "ī���彺ź"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:191
 msgid "Sri Lanka"
 msgstr "������ī"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:194
 msgid "Lithuania"
 msgstr "�����ƴϾ�"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:197
 msgid "Luxembourg"
 msgstr "����θ�ũ"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:200
 msgid "Latvia"
 msgstr "��Ʈ���"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:203
 msgid "Morocco"
 msgstr "�����"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:206
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:209
 msgid "Montenegro"
 msgstr "���ױ׷���"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "���ٰ���ī��"
+
+#: ../../english/template/debian/countries.wml:215
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:218
+msgid "Malta"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "�߽���"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "�����̽þ�"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:227
+msgid "New Caledonia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "��ī���"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "�״�����"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "�븣����"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "��������"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "�ij���"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "���"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:248
+msgid "French Polynesia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "�ʸ���"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "��Ű��ź"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "������"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "��������"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "�縶�Ͼ�"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "�������"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "���þ�"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "����ƶ���"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "������"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "�̰�����"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "���κ��Ͼ�"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "���ι�Ű��"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "����ٵ���"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Ÿ��"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Ƣ����"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "��Ű"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Ÿ�̿�"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "��ũ���̳�"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "����"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "�̱�"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "������"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:314
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Uzbekistan"
+msgstr "��Ű��ź"
+
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "���׼�����"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "��Ʈ��"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "��������ī ��ȭ��"
 
diff --git a/lithuanian/po/countries.lt.po b/lithuanian/po/countries.lt.po
index 2073c3813d6..751ee7fa934 100644
--- a/lithuanian/po/countries.lt.po
+++ b/lithuanian/po/countries.lt.po
@@ -6,6 +6,7 @@ msgstr ""
 "PO-Revision-Date: 2008-12-29 20:59+0300\n"
 "Last-Translator: Aleksandr Charkov <alcharkov@gmail.com>\n"
 "Language-Team: unknown\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -55,7 +56,6 @@ msgid "Brazil"
 msgstr "Brazilija"
 
 #: ../../english/template/debian/countries.wml:59
-#| msgid "Panama"
 msgid "Bahamas"
 msgstr "Bahamos"
 
@@ -104,294 +104,309 @@ msgid "Dominican Republic"
 msgstr "Dominykos Respublika"
 
 #: ../../english/template/debian/countries.wml:95
+msgid "Algeria"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:98
 msgid "Ecuador"
 msgstr "Ekvadoras"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:101
 msgid "Estonia"
 msgstr "Estija"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:104
 msgid "Egypt"
 msgstr "Egiptas"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:107
 msgid "Spain"
 msgstr "Ispanija"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:110
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:113
 msgid "Finland"
 msgstr "Suomija"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:116
 msgid "Faroe Islands"
 msgstr "Farer� Salos"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:119
 msgid "France"
 msgstr "Pranc�zija"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:122
 msgid "Great Britain"
 msgstr "Did�ioji Britanija"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:125
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:128
 msgid "Georgia"
 msgstr "Gruzija"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:131
 msgid "Greenland"
 msgstr "Grenlandija"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:134
 msgid "Greece"
 msgstr "Graikija"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:137
 msgid "Guatemala"
 msgstr "Gvatemala"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:140
 msgid "Hong Kong"
 msgstr "Hongkongas"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:143
 msgid "Honduras"
 msgstr "Hond�ras"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:146
 msgid "Croatia"
 msgstr "Kroatija"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:149
 msgid "Hungary"
 msgstr "Vengrija"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:152
 msgid "Indonesia"
 msgstr "Indonezija"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:155
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:158
 msgid "Ireland"
 msgstr "Airija"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:161
 msgid "Israel"
 msgstr "Izraelis"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:164
 msgid "India"
 msgstr "Indija"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:167
 msgid "Iceland"
 msgstr "Islandija"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:170
 msgid "Italy"
 msgstr "Italija"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:173
 msgid "Jordan"
 msgstr "Jordanija"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:176
 msgid "Japan"
 msgstr "Japonija"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:179
 msgid "Kenya"
 msgstr "Kenija"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:182
 msgid "Korea"
 msgstr "Kor�ja"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:185
 msgid "Kuwait"
 msgstr "Kuveitas"
 
-#: ../../english/template/debian/countries.wml:182
-#| msgid "Pakistan"
+#: ../../english/template/debian/countries.wml:188
 msgid "Kazakhstan"
 msgstr "Kazachstanas"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:191
 msgid "Sri Lanka"
 msgstr "�ri Lanka"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:194
 msgid "Lithuania"
 msgstr "Lietuva"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:197
 msgid "Luxembourg"
 msgstr "Liuksemburgas"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:200
 msgid "Latvia"
 msgstr "Latvija"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:203
 msgid "Morocco"
 msgstr "Marokas"
 
-#: ../../english/template/debian/countries.wml:200
-#| msgid "Serbia and Montenegro"
+#: ../../english/template/debian/countries.wml:206
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:209
 msgid "Montenegro"
 msgstr "Juodkalnija"
 
-#: ../../english/template/debian/countries.wml:203
-#| msgid "Malaysia"
+#: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaskaras"
+
+#: ../../english/template/debian/countries.wml:215
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Meksika"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malaizija"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Naujoji Kaledonija"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nikaragva"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Olandija"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Norvegija"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Naujoji Zelandija"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Pranc�zijos Polinezija"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Filipinai"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Pakistanas"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Lenkija"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugalija"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Rumunija"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Serbija"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Rusija"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Saudo Arabija"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "�vedija"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singap�ras"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Slov�nija"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Slovakija"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "Salvadoras"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Tailandas"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tunisas"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Turkija"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Taivanas"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Jungtin�s Karalyst�s"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Jungtin�s Valstijos"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Urugvajus"
 
-#: ../../english/template/debian/countries.wml:299
-#| msgid "Pakistan"
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Uzbekistanas"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venesuela"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Vietnamas"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Piet� Afrika"
-
diff --git a/norwegian/po/countries.nb.po b/norwegian/po/countries.nb.po
index d1f7c0fa95c..c3ee3b3ebc0 100644
--- a/norwegian/po/countries.nb.po
+++ b/norwegian/po/countries.nb.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2011-02-07 09:31+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -257,150 +258,154 @@ msgid "Montenegro"
 msgstr "Montenegro"
 
 #: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: ../../english/template/debian/countries.wml:215
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Mexico"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Ny-Caledonia"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Norge"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Fransk Polynesia"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Filippinene"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Polen"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Romania"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Serbia"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Russland"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Saudiarabia"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Tyrkia"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Storbritannia"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Forente stater"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Sørafrika"
 
diff --git a/persian/po/countries.fa.po b/persian/po/countries.fa.po
index 222b3f93a30..c6e0d27a314 100644
--- a/persian/po/countries.fa.po
+++ b/persian/po/countries.fa.po
@@ -5,6 +5,7 @@ msgstr ""
 "PO-Revision-Date: 2011-03-25 11:05+0330\n"
 "Last-Translator: Behrad Eslamifar <behrad_es@yahoo.com>\n"
 "Language-Team: debian-l10n-persian <debian-l10n-persian@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -106,7 +107,6 @@ msgid "Dominican Republic"
 msgstr "جمهوری دومینیکن"
 
 #: ../../english/template/debian/countries.wml:95
-#| msgid "Bulgaria"
 msgid "Algeria"
 msgstr "الجزیره"
 
@@ -187,7 +187,6 @@ msgid "Indonesia"
 msgstr "اندونزی"
 
 #: ../../english/template/debian/countries.wml:155
-#| msgid "Ireland"
 msgid "Iran"
 msgstr "ایران"
 
@@ -264,152 +263,153 @@ msgid "Montenegro"
 msgstr "مونته‌نگرو"
 
 #: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "ماداگاسکار"
+
+#: ../../english/template/debian/countries.wml:215
 msgid "Mongolia"
 msgstr "مونگولیا"
 
-#: ../../english/template/debian/countries.wml:215
-#| msgid "Malaysia"
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "مالتا"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "مکزیک"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "مالزی"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "کالدونیای جدید"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "نیکاراگوئه"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "هلند"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "نروژ"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "زلاند نو"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "پاناما"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "پرو"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "پلینزی فرانسوی"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "فیلیپین"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "پاکستان"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "لهستان"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "پرتغال"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "رومانی"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "صربستان"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "روسیه"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "عربستان سعودی"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "سوئد"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "سنگاپور"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "اسلوونی"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "اسلواکی"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "السالوادور"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "تایلند"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "تونس"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "ترکیه"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "تایوان"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "اکراین"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "انگلستان"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "ایالات متحده"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "اروگوئه"
 
-#: ../../english/template/debian/countries.wml:311
-#| msgid "Pakistan"
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "ازبکستان"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "ونزوئلا"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "ویتنام"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "آفریقای جنوبی"
-
diff --git a/polish/po/countries.pl.po b/polish/po/countries.pl.po
index 34abf8d3337..b55b3d9c54d 100644
--- a/polish/po/countries.pl.po
+++ b/polish/po/countries.pl.po
@@ -7,6 +7,7 @@ msgstr ""
 "PO-Revision-Date: 2010-08-04 22:44+0000\n"
 "Last-Translator: Marcin Owsiany <porridge@debian.org>\n"
 "Language-Team: polski <debian-l10n-polish@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -261,149 +262,153 @@ msgid "Montenegro"
 msgstr "Czarnog�ra"
 
 #: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: ../../english/template/debian/countries.wml:215
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Meksyk"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malezja"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Nowa Kaledonia"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Holandia"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Norwegia"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Nowa Zelandia"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Polinezja Francuska"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Filipiny"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Polska"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugalia"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Rumunia"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Serbia"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Rosja"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Arabia Saudyjska"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Szwecja"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "S�owenia"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "S�owacja"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "Salwador"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Tajlandia"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tunezja"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Turcja"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Tajwan"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Wielka Brytania"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Stany Zjednoczone"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Urugwaj"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Wenezuela"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Wietnam"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "RPA"
diff --git a/portuguese/po/countries.pt.po b/portuguese/po/countries.pt.po
index e6c62a9694a..4a791b043ed 100644
--- a/portuguese/po/countries.pt.po
+++ b/portuguese/po/countries.pt.po
@@ -266,149 +266,153 @@ msgid "Montenegro"
 msgstr "Montenegro"
 
 #: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagáscar"
+
+#: ../../english/template/debian/countries.wml:215
 msgid "Mongolia"
 msgstr "Mongólia"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "México"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malásia"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Nova Caledônia"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nicarágua"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Holanda"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Nova Zelândia"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panamá"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Polinésia Francesa"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Paquistão"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Polônia"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Romênia"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Sérvia"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Rússia"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Arábia Saudita"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Suécia"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singapura"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Eslovênia"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Eslováquia"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "Salvador"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Tailândia"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tunísia"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Turquia"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ucrânia"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Uzbequistão"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Vietnã"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "África do Sul"
diff --git a/russian/po/countries.ru.po b/russian/po/countries.ru.po
index b8b618948f1..c4ea4f86be3 100644
--- a/russian/po/countries.ru.po
+++ b/russian/po/countries.ru.po
@@ -266,149 +266,153 @@ msgid "Montenegro"
 msgstr "Черногория"
 
 #: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Мадагаскар"
+
+#: ../../english/template/debian/countries.wml:215
 msgid "Mongolia"
 msgstr "Монголия"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Мальта"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Мексика"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Малайзия"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Новая Каледония"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Никарагуа"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Нидерланды"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Норвегия"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Новая Зеландия"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Панама"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Перу"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Французская Полинезия"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Филиппины"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Пакистан"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Польша"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Португалия"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Румыния"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Сербия"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Россия"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Саудовская Аравия"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Швеция"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Словения"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Словакия"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "Сальвадор"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Таиланд"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Тунис"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Турция"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Тайвань"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Украина"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Великобритания"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "США"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Уругвай"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Узбекистан"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Венесуэла"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Вьетнам"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Южная Африка"
diff --git a/slovak/po/countries.sk.po b/slovak/po/countries.sk.po
index 197db5087d3..866379c84dc 100644
--- a/slovak/po/countries.sk.po
+++ b/slovak/po/countries.sk.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2011-02-13 18:34+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -264,1086 +265,1179 @@ msgid "Montenegro"
 msgstr "Čierna Hora"
 
 #: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: ../../english/template/debian/countries.wml:215
 msgid "Mongolia"
 msgstr "Mongolsko"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malajzia"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Nová Kaledónia"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Holandsko"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Nórsko"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Nový Zéland"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Francúzska Polynézia"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Filipíny"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Poľsko"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugalsko"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Rumunsko"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Srbsko"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Rusko"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Saudská Arábia"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Švédsko"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Slovinsko"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Slovensko"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "Salvádor"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Thajsko"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tunisko"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Turecko"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ukrajina"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Spojené kráľovstvo"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Spojené štáty"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Uruguaj"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Južná Afrika"
 
-#~ msgid "Afghanistan"
-#~ msgstr "Afganistan"
+#~ msgid "Kingdom of Nepal"
+#~ msgstr "Nepálske kráľovstvo"
 
-#, fuzzy
-#~ msgid "Islamic Republic of Afghanistan"
-#~ msgstr "Pakistanská islamská republika"
+#~ msgid "State of Bahrain"
+#~ msgstr "Bahrajnské kráľovstvo"
 
-#~ msgid "Åland Islands"
-#~ msgstr "Ålandy"
+#~ msgid "The Transitional Islamic State of Afghanistan"
+#~ msgstr "Dočasný afganský islamský štát"
 
-#~ msgid "Republic of Albania"
-#~ msgstr "Albánska republika"
+#, fuzzy
+#~ msgid "Zaire, Republic of"
+#~ msgstr "Kórejská republika"
 
-#~ msgid "People's Democratic Republic of Algeria"
-#~ msgstr "Alžírska demokratická ľudová republika"
+#, fuzzy
+#~ msgid "Yugoslavia, Socialist Federal Republic of"
+#~ msgstr "Tanzánijská zjednotená republika"
 
-#~ msgid "American Samoa"
-#~ msgstr "Americká Samoa"
+#, fuzzy
+#~ msgid "Yemen, Yemen Arab Republic"
+#~ msgstr "Sýrska arabská republika"
 
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
+#, fuzzy
+#~ msgid "Yemen, Democratic, People's Democratic Republic of"
+#~ msgstr "Kórejská ľudovodemokratická republika"
 
-#~ msgid "Principality of Andorra"
-#~ msgstr "Andorrské kniežatstvo"
+#, fuzzy
+#~ msgid "Wake Island"
+#~ msgstr "Faerské ostrovy"
 
-#~ msgid "Angola"
-#~ msgstr "Angola"
+#, fuzzy
+#~ msgid "Viet-Nam, Democratic Republic of"
+#~ msgstr "Kórejská ľudovodemokratická republika"
 
-#~ msgid "Republic of Angola"
-#~ msgstr "Angolská republika"
+#, fuzzy
+#~ msgid "Vatican City State (Holy See)"
+#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
 
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
+#, fuzzy
+#~ msgid "Upper Volta, Republic of"
+#~ msgstr "Moldavská republika"
 
-#~ msgid "Antarctica"
-#~ msgstr "Antarktída"
+#, fuzzy
+#~ msgid "Serbia and Montenegro"
+#~ msgstr "Čiernohorská republika"
 
-#~ msgid "Antigua and Barbuda"
-#~ msgstr "Antigua a Barbuda"
+#, fuzzy
+#~ msgid "Romania, Socialist Republic of"
+#~ msgstr "Vietnamská socialistická republika"
 
-#~ msgid "Argentine Republic"
-#~ msgstr "Argentínska republika"
+#, fuzzy
+#~ msgid "Panama, Republic of"
+#~ msgstr "Macedónska republika"
 
-#~ msgid "Republic of Armenia"
-#~ msgstr "Arménska republika"
+#, fuzzy
+#~ msgid "Midway Islands"
+#~ msgstr "Kajmanie ostrovy"
 
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
+#, fuzzy
+#~ msgid "Johnston Island"
+#~ msgstr "Cookove ostrovy"
 
-#~ msgid "Republic of Austria"
-#~ msgstr "Rakúska republika"
+#, fuzzy
+#~ msgid "Gilbert and Ellice Islands"
+#~ msgstr "Ostrovy Turks a Caicos"
 
-#~ msgid "Azerbaijan"
-#~ msgstr "Azerbajdžan"
+#, fuzzy
+#~ msgid "Germany, Federal Republic of"
+#~ msgstr "Nemecká spolková republika"
 
-#~ msgid "Republic of Azerbaijan"
-#~ msgstr "Azerbajdžanská republika"
+#, fuzzy
+#~ msgid "German Democratic Republic"
+#~ msgstr "Laoská ľudovodemokratická republika"
 
-#~ msgid "Commonwealth of the Bahamas"
-#~ msgstr "Bahamské spoločenstvo"
+#, fuzzy
+#~ msgid "French Southern and Antarctic Territories"
+#~ msgstr "Francúzske južné a antarktické územia"
 
-#~ msgid "Bahrain"
-#~ msgstr "Bahrajn"
+#, fuzzy
+#~ msgid "Burma, Socialist Republic of the Union of"
+#~ msgstr "Vietnamská socialistická republika"
 
 #, fuzzy
-#~ msgid "Kingdom of Bahrain"
-#~ msgstr "Bhutánske kráľovstvo"
+#~ msgid "British Antarctic Territory"
+#~ msgstr "Britské indickooceánske územie"
 
-#~ msgid "People's Republic of Bangladesh"
-#~ msgstr "Bangladéšska ľudová republika"
+#~ msgid "Republic of Zimbabwe"
+#~ msgstr "Zimbabwianska republika"
 
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
+#~ msgid "Zimbabwe"
+#~ msgstr "Zimbabwe"
 
-#~ msgid "Republic of Belarus"
-#~ msgstr "Bieloruská republika"
+#~ msgid "Republic of Zambia"
+#~ msgstr "Zambijská republika"
 
-#~ msgid "Kingdom of Belgium"
-#~ msgstr "Belgické kráľovstvo"
+#~ msgid "Zambia"
+#~ msgstr "Zambia"
 
-#~ msgid "Belize"
-#~ msgstr "Belize"
+#~ msgid "Republic of Yemen"
+#~ msgstr "Jemenská republika"
 
-#~ msgid "Benin"
-#~ msgstr "Benin"
+#~ msgid "Yemen"
+#~ msgstr "Jemen"
 
-#~ msgid "Republic of Benin"
-#~ msgstr "Beninská republika"
+#~ msgid "Western Sahara"
+#~ msgstr "Západná Sahara"
 
-#~ msgid "Bermuda"
-#~ msgstr "Bermudy"
+#~ msgid "Wallis and Futuna"
+#~ msgstr "Wallis a Futuna"
 
-#~ msgid "Bhutan"
-#~ msgstr "Bhután"
+#~ msgid "Virgin Islands of the United States"
+#~ msgstr "Panenské ostrovy Spojených štátov"
 
-#~ msgid "Kingdom of Bhutan"
-#~ msgstr "Bhutánske kráľovstvo"
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "Panenské ostrovy, Americké"
 
-#~ msgid "Bolivia"
-#~ msgstr "Bolívia"
+#~ msgid "British Virgin Islands"
+#~ msgstr "Britské Panenské ostrovy"
 
-#~ msgid "Republic of Bolivia"
-#~ msgstr "Bolívijská republika"
+#~ msgid "Virgin Islands, British"
+#~ msgstr "Panenské ostrovy, Britské"
 
-#~ msgid "Republic of Bosnia and Herzegovina"
-#~ msgstr "Republika Bosny a Hercegoviny"
+#~ msgid "Socialist Republic of Viet Nam"
+#~ msgstr "Vietnamská socialistická republika"
 
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
+#~ msgid "Bolivarian Republic of Venezuela"
+#~ msgstr "Venezuelská bolívarovská republika"
 
-#~ msgid "Republic of Botswana"
-#~ msgstr "Botswanská republika"
+#~ msgid "Republic of Vanuatu"
+#~ msgstr "Vanuatská republika"
 
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvetov ostrov"
+#~ msgid "Vanuatu"
+#~ msgstr "Vanuatu"
 
-#~ msgid "Federative Republic of Brazil"
-#~ msgstr "Brazílska federatívna republika"
+#~ msgid "Republic of Uzbekistan"
+#~ msgstr "Uzbecká republika"
 
-#~ msgid "British Indian Ocean Territory"
-#~ msgstr "Britské indickooceánske územie"
+#~ msgid "Eastern Republic of Uruguay"
+#~ msgstr "Uruguajská východná republika"
 
-#~ msgid "Brunei Darussalam"
-#~ msgstr "Brunejsko-darussalamský štát"
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "Menšie odľahlé ostrovy Spojených štátov"
 
-#~ msgid "Republic of Bulgaria"
-#~ msgstr "Bulharská republika"
+#~ msgid "United States of America"
+#~ msgstr "Spojené štáty americké"
 
-#~ msgid "Burkina Faso"
-#~ msgstr "Burkina Faso"
+#~ msgid "United Kingdom of Great Britain and Northern Ireland"
+#~ msgstr "Spojené kráľovstvo Veľkej Británie a Severného Írska"
 
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
+#~ msgid "Republic of Uganda"
+#~ msgstr "Ugandská republika"
 
-#~ msgid "Republic of Burundi"
-#~ msgstr "Burundská republika"
+#~ msgid "Uganda"
+#~ msgstr "Uganda"
 
-#~ msgid "Cambodia"
-#~ msgstr "Kambodža"
+#~ msgid "Tuvalu"
+#~ msgstr "Tuvalu"
 
-#~ msgid "Kingdom of Cambodia"
-#~ msgstr "Kambodžské kráľovstvo"
+#~ msgid "Turks and Caicos Islands"
+#~ msgstr "Ostrovy Turks a Caicos"
 
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
+#~ msgid "Turkmenistan"
+#~ msgstr "Turkménsko"
 
-#~ msgid "Republic of Cameroon"
-#~ msgstr "Kamerunská republika"
+#~ msgid "Republic of Turkey"
+#~ msgstr "Turecká republika"
 
-#~ msgid "Cape Verde"
-#~ msgstr "Kapverdy"
+#~ msgid "Republic of Tunisia"
+#~ msgstr "Tuniská republika"
 
-#~ msgid "Republic of Cape Verde"
-#~ msgstr "Kapverdská republika"
+#~ msgid "Republic of Trinidad and Tobago"
+#~ msgstr "Republika Trinidadu a Tobaga"
 
-#~ msgid "Cayman Islands"
-#~ msgstr "Kajmanie ostrovy"
+#~ msgid "Trinidad and Tobago"
+#~ msgstr "Trinidad a Tobago"
 
-#~ msgid "Central African Republic"
-#~ msgstr "Stredoafrická republika"
+#~ msgid "Kingdom of Tonga"
+#~ msgstr "Tongské kráľovstvo"
 
-#~ msgid "Chad"
-#~ msgstr "Čad"
+#~ msgid "Tonga"
+#~ msgstr "Tonga"
 
-#~ msgid "Republic of Chad"
-#~ msgstr "Čadská republika"
+#~ msgid "Tokelau"
+#~ msgstr "Tokelau"
 
-#~ msgid "Republic of Chile"
-#~ msgstr "Čilská republika"
+#~ msgid "Togolese Republic"
+#~ msgstr "Togská republika"
 
-#~ msgid "People's Republic of China"
-#~ msgstr "Čínska ľudová republika"
+#~ msgid "Togo"
+#~ msgstr "Togo"
 
-#~ msgid "Christmas Island"
-#~ msgstr "Vianočný ostrov"
+#~ msgid "Democratic Republic of Timor-Leste"
+#~ msgstr "Východotimorská demokratická republika"
 
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Kokosové ostrovy"
+#~ msgid "Timor-Leste"
+#~ msgstr "Východný Timor"
 
-#~ msgid "Republic of Colombia"
-#~ msgstr "Kolumbijská republika"
+#~ msgid "Kingdom of Thailand"
+#~ msgstr "Thajské kráľovstvo"
 
-#~ msgid "Comoros"
-#~ msgstr "Komory"
+#~ msgid "United Republic of Tanzania"
+#~ msgstr "Tanzánijská zjednotená republika"
 
-#~ msgid "Union of the Comoros"
-#~ msgstr "Komorský zväz"
+#~ msgid "Tanzania, United Republic of"
+#~ msgstr "Tanzánijská zjednotená republika"
 
-#~ msgid "Congo"
-#~ msgstr "Kongo"
+#~ msgid "Republic of Tajikistan"
+#~ msgstr "Tadžická republika"
 
-#~ msgid "Republic of the Congo"
-#~ msgstr "Konžská republika"
+#~ msgid "Tajikistan"
+#~ msgstr "Tadžikistan"
 
-#~ msgid "Congo, The Democratic Republic of the"
-#~ msgstr "Konžská demokratická republika"
+#~ msgid "Taiwan, Province of China"
+#~ msgstr "Taiwan, provincia Číny"
 
-#~ msgid "Cook Islands"
-#~ msgstr "Cookove ostrovy"
+#~ msgid "Syrian Arab Republic"
+#~ msgstr "Sýrska arabská republika"
 
-#~ msgid "Republic of Costa Rica"
-#~ msgstr "Kostarická republika"
+#~ msgid "Swiss Confederation"
+#~ msgstr "Švajčiarska konfederácia"
 
-#~ msgid "Côte d'Ivoire"
-#~ msgstr "Pobrežie Slonoviny"
+#~ msgid "Kingdom of Sweden"
+#~ msgstr "Švédske kráľovstvo"
 
-#, fuzzy
-#~ msgid "Republic of Côte d'Ivoire"
-#~ msgstr "Republika Pobrežia Slonoviny"
+#~ msgid "Kingdom of Swaziland"
+#~ msgstr "Svazijské kráľovstvo"
 
-#~ msgid "Republic of Croatia"
-#~ msgstr "Chorvátska republika"
+#~ msgid "Swaziland"
+#~ msgstr "Svazijsko"
 
-#~ msgid "Cuba"
-#~ msgstr "Kuba"
+#~ msgid "Svalbard and Jan Mayen"
+#~ msgstr "Svalbard a Jan Mayen"
 
-#~ msgid "Republic of Cuba"
-#~ msgstr "Kubánska republika"
+#~ msgid "Republic of Suriname"
+#~ msgstr "Surinamská republika"
 
-#~ msgid "Cyprus"
-#~ msgstr "Cyprus"
+#~ msgid "Suriname"
+#~ msgstr "Surinam"
 
-#~ msgid "Republic of Cyprus"
-#~ msgstr "Cyperská republika"
+#~ msgid "Republic of the Sudan"
+#~ msgstr "Sudánska republika"
 
-#~ msgid "Kingdom of Denmark"
-#~ msgstr "Dánske kráľovstvo"
+#~ msgid "Sudan"
+#~ msgstr "Sudán"
 
-#~ msgid "Djibouti"
-#~ msgstr "Džibutsko"
+#~ msgid "Democratic Socialist Republic of Sri Lanka"
+#~ msgstr "Srílanská demokratická socialistická republika"
 
-#~ msgid "Republic of Djibouti"
-#~ msgstr "Džibutská republika"
+#~ msgid "Kingdom of Spain"
+#~ msgstr "Španielske kráľovstvo"
 
-#~ msgid "Dominica"
-#~ msgstr "Dominika"
+#~ msgid "South Georgia and the South Sandwich Islands"
+#~ msgstr "Južná Georgia a Južné Sandwichove ostrovy"
 
-#~ msgid "Commonwealth of Dominica"
-#~ msgstr "Dominické spoločenstvo"
+#~ msgid "Republic of South Africa"
+#~ msgstr "Juhoafrická republika"
 
-#~ msgid "Republic of Ecuador"
-#~ msgstr "Ekvádorská republika"
+#~ msgid "Somali Republic"
+#~ msgstr "Somálska republika"
 
-#~ msgid "Arab Republic of Egypt"
-#~ msgstr "Egyptská arabská republika"
+#~ msgid "Somalia"
+#~ msgstr "Somálsko"
 
-#~ msgid "Republic of El Salvador"
-#~ msgstr "Salvádorská republika"
+#~ msgid "Solomon Islands"
+#~ msgstr "Šalamúnove ostrovy"
 
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Rovníková Guinea"
+#~ msgid "Republic of Slovenia"
+#~ msgstr "Slovinská republika"
 
-#~ msgid "Republic of Equatorial Guinea"
-#~ msgstr "Republika Rovníkovej Guiney"
+#~ msgid "Slovak Republic"
+#~ msgstr "Slovenská republika"
 
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
+#~ msgid "Republic of Singapore"
+#~ msgstr "Singapurská republika"
 
-#~ msgid "Republic of Estonia"
-#~ msgstr "Estónska republika"
+#~ msgid "Republic of Sierra Leone"
+#~ msgstr "Sierraleonská republika"
 
-#~ msgid "Federal Democratic Republic of Ethiopia"
-#~ msgstr "Etiópska federatívna demokratická republika"
+#~ msgid "Sierra Leone"
+#~ msgstr "Sierra Leone"
 
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "Falklandy (Malvíny)"
+#~ msgid "Republic of Seychelles"
+#~ msgstr "Seychelská republika"
 
-#~ msgid "Fiji"
-#~ msgstr "Fidži"
+#~ msgid "Seychelles"
+#~ msgstr "Seychely"
 
-#~ msgid "Republic of the Fiji Islands"
-#~ msgstr "Republika Fidžijských ostrovov"
+#~ msgid "Republic of Serbia"
+#~ msgstr "Srbská republika"
 
-#~ msgid "Republic of Finland"
-#~ msgstr "Fínska republika"
+#~ msgid "Republic of Senegal"
+#~ msgstr "Senegalská republika"
 
-#~ msgid "French Republic"
-#~ msgstr "Francúzska republika"
+#~ msgid "Senegal"
+#~ msgstr "Senegal"
 
-#~ msgid "French Guiana"
-#~ msgstr "Francúzska Guyana"
+#~ msgid "Kingdom of Saudi Arabia"
+#~ msgstr "Saudskoarabské kráľovstvo"
 
-#~ msgid "French Southern Territories"
-#~ msgstr "Francúzske južné a antarktické územia"
+#~ msgid "Democratic Republic of Sao Tome and Principe"
+#~ msgstr "Demokratická republika Svätého Tomáša a Princovho ostrova"
 
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
+#~ msgid "Sao Tome and Principe"
+#~ msgstr "Svätý Tomáš a Princov ostrov"
 
-#~ msgid "Gabonese Republic"
-#~ msgstr "Gabonská republika"
+#~ msgid "Republic of San Marino"
+#~ msgstr "Sanmarínska republika"
 
-#~ msgid "Gambia"
-#~ msgstr "Gambia"
+#~ msgid "San Marino"
+#~ msgstr "San Maríno"
 
-#~ msgid "Republic of the Gambia"
-#~ msgstr "Gambijská republika"
+#~ msgid "Independent State of Samoa"
+#~ msgstr "Samojský nezávislý štát"
 
-#~ msgid "Federal Republic of Germany"
-#~ msgstr "Nemecká spolková republika"
+#~ msgid "Samoa"
+#~ msgstr "Samoa"
 
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
+#~ msgid "Saint Vincent and the Grenadines"
+#~ msgstr "Svätý Vincent a Grenadíny"
 
-#~ msgid "Republic of Ghana"
-#~ msgstr "Ghanská republika"
+#~ msgid "Saint Pierre and Miquelon"
+#~ msgstr "Saint Pierre a Miquelon"
 
-#~ msgid "Gibraltar"
-#~ msgstr "Gibraltár"
+#~ msgid "Saint Lucia"
+#~ msgstr "Svätá Lucia"
 
-# pozn.: Na výslovnú žiadosť gréckej strany sa v medzinárodných dohodách, zmluvách a podobných dokumentoch medzi Gréckou republikou a Slovenskou republikou používa podoba Helénska republika, v ostatných prípadoch podoba Grécka republika.
-#~ msgid "Hellenic Republic"
-#~ msgstr "Grécka republika"
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadeloupe"
-#~ msgid "Guam"
-#~ msgstr "Guam"
-#~ msgid "Republic of Guatemala"
-#~ msgstr "Guatemalská republika"
-#~ msgid "Guernsey"
-#~ msgstr "Guernsey"
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
-#~ msgid "Republic of Guinea"
-#~ msgstr "Guinejská republika"
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Guinea-Bissau"
-#~ msgid "Republic of Guinea-Bissau"
-#~ msgstr "Guinejsko-bissauská republika"
-#~ msgid "Guyana"
-#~ msgstr "Guyana"
-#~ msgid "Republic of Guyana"
-#~ msgstr "Guyanská kooperatívna republika"
-#~ msgid "Haiti"
-#~ msgstr "Haiti"
-#~ msgid "Republic of Haiti"
-#~ msgstr "Haitská republika"
-#~ msgid "Heard Island and McDonald Islands"
-#~ msgstr "Heardov ostrov"
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
-#~ msgid "Republic of Honduras"
-#~ msgstr "Honduraská republika"
-#~ msgid "Hong Kong Special Administrative Region of China"
-#~ msgstr "Osobitná administratívna oblasť Číny Hongkong"
-#~ msgid "Republic of Hungary"
-#~ msgstr "Maďarská republika"
-#~ msgid "Republic of Iceland"
-#~ msgstr "Islandská republika"
-#~ msgid "Republic of India"
-#~ msgstr "Indická republika"
-#~ msgid "Republic of Indonesia"
-#~ msgstr "Indonézska republika"
-#~ msgid "Iran, Islamic Republic of"
-#~ msgstr "Iránska islamská republika"
-#~ msgid "Islamic Republic of Iran"
-#~ msgstr "Iránska islamská republika"
-#~ msgid "Republic of Iraq"
-#~ msgstr "Iracká republika"
-#~ msgid "Isle of Man"
-#~ msgstr "Man"
-#~ msgid "State of Israel"
-#~ msgstr "Izraelský štát"
-#~ msgid "Italian Republic"
-#~ msgstr "Talianska republika"
-#~ msgid "Jamaica"
-#~ msgstr "Jamajka"
-#~ msgid "Jersey"
-#~ msgstr "Jersey"
-#~ msgid "Hashemite Kingdom of Jordan"
-#~ msgstr "Jordánske hášimovské kráľovstvo"
-#~ msgid "Republic of Kazakhstan"
-#~ msgstr "Kazašská republika"
-#~ msgid "Republic of Kenya"
-#~ msgstr "Kenská republika"
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
-#~ msgid "Republic of Kiribati"
-#~ msgstr "Kiribatská republika"
-#~ msgid "Korea, Democratic People's Republic of"
-#~ msgstr "Kórejská ľudovodemokratická republika"
-#~ msgid "Democratic People's Republic of Korea"
-#~ msgstr "Kórejská ľudovodemokratická republika"
-#~ msgid "Korea, Republic of"
-#~ msgstr "Kórejská republika"
-#~ msgid "State of Kuwait"
-#~ msgstr "Kuvajtský štát"
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirgizsko"
-#~ msgid "Kyrgyz Republic"
-#~ msgstr "Kirgizská republika"
-#~ msgid "Lao People's Democratic Republic"
-#~ msgstr "Laoská ľudovodemokratická republika"
-#~ msgid "Republic of Latvia"
-#~ msgstr "Lotyšská republika"
-#~ msgid "Lebanon"
-#~ msgstr "Libanon"
-#~ msgid "Lebanese Republic"
-#~ msgstr "Libanonská republika"
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
-#~ msgid "Kingdom of Lesotho"
-#~ msgstr "Lesothské kráľovstvo"
-#~ msgid "Liberia"
-#~ msgstr "Libéria"
-#~ msgid "Republic of Liberia"
-#~ msgstr "Libérijská republika"
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "Líbya"
-#~ msgid "Socialist People's Libyan Arab Jamahiriya"
-#~ msgstr "Líbyjská arabská ľudová socialistická džamahírija"
-#~ msgid "Liechtenstein"
-#~ msgstr "Lichtenštajnsko"
-#~ msgid "Principality of Liechtenstein"
-#~ msgstr "Lichtenštajnské kniežatstvo"
-#~ msgid "Republic of Lithuania"
-#~ msgstr "Litovská republika"
-#~ msgid "Grand Duchy of Luxembourg"
-#~ msgstr "Luxemburské veľkovojvodstvo"
-#~ msgid "Macao"
-#~ msgstr "Macao"
-#~ msgid "Macao Special Administrative Region of China"
-#~ msgstr "Osobitná administratívna oblasť Číny Macao"
-#~ msgid "Macedonia, Republic of"
-#~ msgstr "Macedónska republika"
-#~ msgid "The Former Yugoslav Republic of Macedonia"
-#~ msgstr "Bývalá juhoslovanská republika Macedónsko"
-#~ msgid "Madagascar"
-#~ msgstr "Madagaskar"
-#~ msgid "Republic of Madagascar"
-#~ msgstr "Madagaskarská republika"
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
-#~ msgid "Republic of Malawi"
-#~ msgstr "Malawijská republika"
-#~ msgid "Maldives"
-#~ msgstr "Maldivy"
-#~ msgid "Republic of Maldives"
-#~ msgstr "Maldivská republika"
-#~ msgid "Mali"
-#~ msgstr "Mali"
-#~ msgid "Republic of Mali"
-#~ msgstr "Malijská republika"
-#~ msgid "Republic of Malta"
-#~ msgstr "Maltská republika"
-#~ msgid "Marshall Islands"
-#~ msgstr "Marshallove ostrovy"
-#~ msgid "Republic of the Marshall Islands"
-#~ msgstr "Republika Marshallových ostrovov"
-#~ msgid "Martinique"
-#~ msgstr "Martinik"
-#~ msgid "Mauritania"
-#~ msgstr "Mauritánia"
-#~ msgid "Islamic Republic of Mauritania"
-#~ msgstr "Mauritánska islamská republika"
-#~ msgid "Mauritius"
-#~ msgstr "Maurícius"
-#~ msgid "Republic of Mauritius"
-#~ msgstr "Maurícijská republika"
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
-#~ msgid "United Mexican States"
-#~ msgstr "Spojené štáty mexické"
-#~ msgid "Micronesia, Federated States of"
-#~ msgstr "Mikronézske federatívne štáty"
-#~ msgid "Federated States of Micronesia"
-#~ msgstr "Mikronézske federatívne štáty"
-#~ msgid "Republic of Moldova"
-#~ msgstr "Moldavská republika"
-#~ msgid "Monaco"
-#~ msgstr "Monako"
-#~ msgid "Principality of Monaco"
-#~ msgstr "Monacké kniežatstvo"
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
-#~ msgid "Kingdom of Morocco"
-#~ msgstr "Marocké kráľovstvo"
-#~ msgid "Mozambique"
-#~ msgstr "Mozambik"
-#~ msgid "Republic of Mozambique"
-#~ msgstr "Mozambická republika"
-#~ msgid "Myanmar"
-#~ msgstr "Mjanmarsko"
-#~ msgid "Union of Myanmar"
-#~ msgstr "Mjanmarský zväz"
-#~ msgid "Namibia"
-#~ msgstr "Namíbia"
-#~ msgid "Republic of Namibia"
-#~ msgstr "Namíbijská republika"
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
-#~ msgid "Republic of Nauru"
-#~ msgstr "Nauruská republika"
-#~ msgid "Nepal"
-#~ msgstr "Nepál"
-#, fuzzy
-#~ msgid "Federal Democratic Republic of Nepal"
-#~ msgstr "Etiópska federatívna demokratická republika"
+#~ msgid "Saint Kitts and Nevis"
+#~ msgstr "Svätý Krištof a Nevis"
 
-#~ msgid "Kingdom of the Netherlands"
-#~ msgstr "Holandské kráľovstvo"
+#~ msgid "Saint Helena"
+#~ msgstr "Svätá Helena"
 
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Holandské Antily"
+#~ msgid "Rwandese Republic"
+#~ msgstr "Rwandská republika"
 
-#~ msgid "Republic of Nicaragua"
-#~ msgstr "Nikaragujská republika"
+#~ msgid "Rwanda"
+#~ msgstr "Rwanda"
 
-#~ msgid "Niger"
-#~ msgstr "Niger"
+#~ msgid "Russian Federation"
+#~ msgstr "Ruská federácia"
 
-#~ msgid "Republic of the Niger"
-#~ msgstr "Nigerská republika"
+#~ msgid "Reunion"
+#~ msgstr "Réunion"
 
-#~ msgid "Nigeria"
-#~ msgstr "Nigéria"
+#~ msgid "State of Qatar"
+#~ msgstr "Katarský štát"
 
-#~ msgid "Federal Republic of Nigeria"
-#~ msgstr "Nigérijská federatívna republika"
+#~ msgid "Qatar"
+#~ msgstr "Katar"
 
-#~ msgid "Niue"
-#~ msgstr "Niue"
+#~ msgid "Puerto Rico"
+#~ msgstr "Portoriko"
 
-#~ msgid "Republic of Niue"
-#~ msgstr "Republika Niue"
+#~ msgid "Portuguese Republic"
+#~ msgstr "Portugalská republika"
 
-#~ msgid "Norfolk Island"
-#~ msgstr "Norfolk"
+#~ msgid "Republic of Poland"
+#~ msgstr "Poľská republika"
 
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Severné Mariány"
+#~ msgid "Pitcairn"
+#~ msgstr "Pitcairnove ostrovy"
 
-#~ msgid "Commonwealth of the Northern Mariana Islands"
-#~ msgstr "Spoločenstvo Severných Marián"
+#~ msgid "Republic of the Philippines"
+#~ msgstr "Filipínska republika"
 
-#~ msgid "Kingdom of Norway"
-#~ msgstr "Nórske kráľovstvo"
+#~ msgid "Republic of Peru"
+#~ msgstr "Peruánska republika"
 
-#~ msgid "Oman"
-#~ msgstr "Omán"
+#~ msgid "Republic of Paraguay"
+#~ msgstr "Paraguajská republika"
 
-#~ msgid "Sultanate of Oman"
-#~ msgstr "Ománsky sultanát"
+#~ msgid "Paraguay"
+#~ msgstr "Paraguaj"
 
-#~ msgid "Islamic Republic of Pakistan"
-#~ msgstr "Pakistanská islamská republika"
+#~ msgid "Papua New Guinea"
+#~ msgstr "Papua - Nová Guinea"
 
-#~ msgid "Palau"
-#~ msgstr "Palau"
+#~ msgid "Republic of Panama"
+#~ msgstr "Panamská republika"
 
-#~ msgid "Republic of Palau"
-#~ msgstr "Palauská republika"
+#~ msgid "Occupied Palestinian Territory"
+#~ msgstr "Okupované palestínske územie"
 
 #~ msgid "Palestinian Territory, Occupied"
 #~ msgstr "palestínske územie, Okupované"
 
-#~ msgid "Occupied Palestinian Territory"
-#~ msgstr "Okupované palestínske územie"
+#~ msgid "Republic of Palau"
+#~ msgstr "Palauská republika"
 
-#~ msgid "Republic of Panama"
-#~ msgstr "Panamská republika"
+#~ msgid "Palau"
+#~ msgstr "Palau"
 
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua - Nová Guinea"
+#~ msgid "Islamic Republic of Pakistan"
+#~ msgstr "Pakistanská islamská republika"
 
-#~ msgid "Paraguay"
-#~ msgstr "Paraguaj"
+#~ msgid "Sultanate of Oman"
+#~ msgstr "Ománsky sultanát"
 
-#~ msgid "Republic of Paraguay"
-#~ msgstr "Paraguajská republika"
+#~ msgid "Oman"
+#~ msgstr "Omán"
 
-#~ msgid "Republic of Peru"
-#~ msgstr "Peruánska republika"
+#~ msgid "Kingdom of Norway"
+#~ msgstr "Nórske kráľovstvo"
 
-#~ msgid "Republic of the Philippines"
-#~ msgstr "Filipínska republika"
+#~ msgid "Commonwealth of the Northern Mariana Islands"
+#~ msgstr "Spoločenstvo Severných Marián"
 
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairnove ostrovy"
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "Severné Mariány"
 
-#~ msgid "Republic of Poland"
-#~ msgstr "Poľská republika"
+#~ msgid "Norfolk Island"
+#~ msgstr "Norfolk"
 
-#~ msgid "Portuguese Republic"
-#~ msgstr "Portugalská republika"
+#~ msgid "Republic of Niue"
+#~ msgstr "Republika Niue"
 
-#~ msgid "Puerto Rico"
-#~ msgstr "Portoriko"
+#~ msgid "Niue"
+#~ msgstr "Niue"
 
-#~ msgid "Qatar"
-#~ msgstr "Katar"
+#~ msgid "Federal Republic of Nigeria"
+#~ msgstr "Nigérijská federatívna republika"
 
-#~ msgid "State of Qatar"
-#~ msgstr "Katarský štát"
+#~ msgid "Nigeria"
+#~ msgstr "Nigéria"
 
-#~ msgid "Reunion"
-#~ msgstr "Réunion"
+#~ msgid "Republic of the Niger"
+#~ msgstr "Nigerská republika"
 
-#~ msgid "Russian Federation"
-#~ msgstr "Ruská federácia"
+#~ msgid "Niger"
+#~ msgstr "Niger"
 
-#~ msgid "Rwanda"
-#~ msgstr "Rwanda"
+#~ msgid "Republic of Nicaragua"
+#~ msgstr "Nikaragujská republika"
 
-#~ msgid "Rwandese Republic"
-#~ msgstr "Rwandská republika"
+#~ msgid "Netherlands Antilles"
+#~ msgstr "Holandské Antily"
 
-#~ msgid "Saint Helena"
-#~ msgstr "Svätá Helena"
+#~ msgid "Kingdom of the Netherlands"
+#~ msgstr "Holandské kráľovstvo"
 
-#~ msgid "Saint Kitts and Nevis"
-#~ msgstr "Svätý Krištof a Nevis"
+#, fuzzy
+#~ msgid "Federal Democratic Republic of Nepal"
+#~ msgstr "Etiópska federatívna demokratická republika"
 
-#~ msgid "Saint Lucia"
-#~ msgstr "Svätá Lucia"
+#~ msgid "Nepal"
+#~ msgstr "Nepál"
 
-#~ msgid "Saint Pierre and Miquelon"
-#~ msgstr "Saint Pierre a Miquelon"
+#~ msgid "Republic of Nauru"
+#~ msgstr "Nauruská republika"
 
-#~ msgid "Saint Vincent and the Grenadines"
-#~ msgstr "Svätý Vincent a Grenadíny"
+#~ msgid "Nauru"
+#~ msgstr "Nauru"
 
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
+#~ msgid "Republic of Namibia"
+#~ msgstr "Namíbijská republika"
 
-#~ msgid "Independent State of Samoa"
-#~ msgstr "Samojský nezávislý štát"
+#~ msgid "Namibia"
+#~ msgstr "Namíbia"
 
-#~ msgid "San Marino"
-#~ msgstr "San Maríno"
+#~ msgid "Union of Myanmar"
+#~ msgstr "Mjanmarský zväz"
 
-#~ msgid "Republic of San Marino"
-#~ msgstr "Sanmarínska republika"
+#~ msgid "Myanmar"
+#~ msgstr "Mjanmarsko"
 
-#~ msgid "Sao Tome and Principe"
-#~ msgstr "Svätý Tomáš a Princov ostrov"
+#~ msgid "Republic of Mozambique"
+#~ msgstr "Mozambická republika"
 
-#~ msgid "Democratic Republic of Sao Tome and Principe"
-#~ msgstr "Demokratická republika Svätého Tomáša a Princovho ostrova"
+#~ msgid "Mozambique"
+#~ msgstr "Mozambik"
 
-#~ msgid "Kingdom of Saudi Arabia"
-#~ msgstr "Saudskoarabské kráľovstvo"
+#~ msgid "Kingdom of Morocco"
+#~ msgstr "Marocké kráľovstvo"
 
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
+#~ msgid "Montserrat"
+#~ msgstr "Montserrat"
 
-#~ msgid "Republic of Senegal"
-#~ msgstr "Senegalská republika"
+#~ msgid "Principality of Monaco"
+#~ msgstr "Monacké kniežatstvo"
 
-#~ msgid "Republic of Serbia"
-#~ msgstr "Srbská republika"
+#~ msgid "Monaco"
+#~ msgstr "Monako"
 
-#~ msgid "Seychelles"
-#~ msgstr "Seychely"
+#~ msgid "Republic of Moldova"
+#~ msgstr "Moldavská republika"
 
-#~ msgid "Republic of Seychelles"
-#~ msgstr "Seychelská republika"
+#~ msgid "Federated States of Micronesia"
+#~ msgstr "Mikronézske federatívne štáty"
 
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
+#~ msgid "Micronesia, Federated States of"
+#~ msgstr "Mikronézske federatívne štáty"
 
-#~ msgid "Republic of Sierra Leone"
-#~ msgstr "Sierraleonská republika"
+#~ msgid "United Mexican States"
+#~ msgstr "Spojené štáty mexické"
 
-#~ msgid "Republic of Singapore"
-#~ msgstr "Singapurská republika"
+#~ msgid "Mayotte"
+#~ msgstr "Mayotte"
 
-#~ msgid "Slovak Republic"
-#~ msgstr "Slovenská republika"
+#~ msgid "Republic of Mauritius"
+#~ msgstr "Maurícijská republika"
 
-#~ msgid "Republic of Slovenia"
-#~ msgstr "Slovinská republika"
+#~ msgid "Mauritius"
+#~ msgstr "Maurícius"
 
-#~ msgid "Solomon Islands"
-#~ msgstr "Šalamúnove ostrovy"
+#~ msgid "Islamic Republic of Mauritania"
+#~ msgstr "Mauritánska islamská republika"
 
-#~ msgid "Somalia"
-#~ msgstr "Somálsko"
+#~ msgid "Mauritania"
+#~ msgstr "Mauritánia"
 
-#~ msgid "Somali Republic"
-#~ msgstr "Somálska republika"
+#~ msgid "Martinique"
+#~ msgstr "Martinik"
 
-#~ msgid "Republic of South Africa"
-#~ msgstr "Juhoafrická republika"
+#~ msgid "Republic of the Marshall Islands"
+#~ msgstr "Republika Marshallových ostrovov"
 
-#~ msgid "South Georgia and the South Sandwich Islands"
-#~ msgstr "Južná Georgia a Južné Sandwichove ostrovy"
+#~ msgid "Marshall Islands"
+#~ msgstr "Marshallove ostrovy"
 
-#~ msgid "Kingdom of Spain"
-#~ msgstr "Španielske kráľovstvo"
+#~ msgid "Republic of Malta"
+#~ msgstr "Maltská republika"
 
-#~ msgid "Democratic Socialist Republic of Sri Lanka"
-#~ msgstr "Srílanská demokratická socialistická republika"
+#~ msgid "Republic of Mali"
+#~ msgstr "Malijská republika"
 
-#~ msgid "Sudan"
-#~ msgstr "Sudán"
+#~ msgid "Mali"
+#~ msgstr "Mali"
 
-#~ msgid "Republic of the Sudan"
-#~ msgstr "Sudánska republika"
+#~ msgid "Republic of Maldives"
+#~ msgstr "Maldivská republika"
 
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
+#~ msgid "Maldives"
+#~ msgstr "Maldivy"
 
-#~ msgid "Republic of Suriname"
-#~ msgstr "Surinamská republika"
+#~ msgid "Republic of Malawi"
+#~ msgstr "Malawijská republika"
 
-#~ msgid "Svalbard and Jan Mayen"
-#~ msgstr "Svalbard a Jan Mayen"
+#~ msgid "Malawi"
+#~ msgstr "Malawi"
 
-#~ msgid "Swaziland"
-#~ msgstr "Svazijsko"
+#~ msgid "Republic of Madagascar"
+#~ msgstr "Madagaskarská republika"
 
-#~ msgid "Kingdom of Swaziland"
-#~ msgstr "Svazijské kráľovstvo"
+#~ msgid "The Former Yugoslav Republic of Macedonia"
+#~ msgstr "Bývalá juhoslovanská republika Macedónsko"
 
-#~ msgid "Kingdom of Sweden"
-#~ msgstr "Švédske kráľovstvo"
+#~ msgid "Macedonia, Republic of"
+#~ msgstr "Macedónska republika"
 
-#~ msgid "Swiss Confederation"
-#~ msgstr "Švajčiarska konfederácia"
+#~ msgid "Macao Special Administrative Region of China"
+#~ msgstr "Osobitná administratívna oblasť Číny Macao"
 
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "Sýrska arabská republika"
+#~ msgid "Macao"
+#~ msgstr "Macao"
 
-#~ msgid "Taiwan, Province of China"
-#~ msgstr "Taiwan, provincia Číny"
+#~ msgid "Grand Duchy of Luxembourg"
+#~ msgstr "Luxemburské veľkovojvodstvo"
 
-#~ msgid "Tajikistan"
-#~ msgstr "Tadžikistan"
+#~ msgid "Republic of Lithuania"
+#~ msgstr "Litovská republika"
 
-#~ msgid "Republic of Tajikistan"
-#~ msgstr "Tadžická republika"
+#~ msgid "Principality of Liechtenstein"
+#~ msgstr "Lichtenštajnské kniežatstvo"
 
-#~ msgid "Tanzania, United Republic of"
-#~ msgstr "Tanzánijská zjednotená republika"
+#~ msgid "Liechtenstein"
+#~ msgstr "Lichtenštajnsko"
 
-#~ msgid "United Republic of Tanzania"
-#~ msgstr "Tanzánijská zjednotená republika"
+#~ msgid "Socialist People's Libyan Arab Jamahiriya"
+#~ msgstr "Líbyjská arabská ľudová socialistická džamahírija"
 
-#~ msgid "Kingdom of Thailand"
-#~ msgstr "Thajské kráľovstvo"
+#~ msgid "Libyan Arab Jamahiriya"
+#~ msgstr "Líbya"
 
-#~ msgid "Timor-Leste"
-#~ msgstr "Východný Timor"
+#~ msgid "Republic of Liberia"
+#~ msgstr "Libérijská republika"
 
-#~ msgid "Democratic Republic of Timor-Leste"
-#~ msgstr "Východotimorská demokratická republika"
+#~ msgid "Liberia"
+#~ msgstr "Libéria"
 
-#~ msgid "Togo"
-#~ msgstr "Togo"
+#~ msgid "Kingdom of Lesotho"
+#~ msgstr "Lesothské kráľovstvo"
 
-#~ msgid "Togolese Republic"
-#~ msgstr "Togská republika"
+#~ msgid "Lesotho"
+#~ msgstr "Lesotho"
 
-#~ msgid "Tokelau"
-#~ msgstr "Tokelau"
+#~ msgid "Lebanese Republic"
+#~ msgstr "Libanonská republika"
 
-#~ msgid "Tonga"
-#~ msgstr "Tonga"
+#~ msgid "Lebanon"
+#~ msgstr "Libanon"
 
-#~ msgid "Kingdom of Tonga"
-#~ msgstr "Tongské kráľovstvo"
+#~ msgid "Republic of Latvia"
+#~ msgstr "Lotyšská republika"
 
-#~ msgid "Trinidad and Tobago"
-#~ msgstr "Trinidad a Tobago"
+#~ msgid "Lao People's Democratic Republic"
+#~ msgstr "Laoská ľudovodemokratická republika"
 
-#~ msgid "Republic of Trinidad and Tobago"
-#~ msgstr "Republika Trinidadu a Tobaga"
+#~ msgid "Kyrgyz Republic"
+#~ msgstr "Kirgizská republika"
 
-#~ msgid "Republic of Tunisia"
-#~ msgstr "Tuniská republika"
+#~ msgid "Kyrgyzstan"
+#~ msgstr "Kirgizsko"
 
-#~ msgid "Republic of Turkey"
-#~ msgstr "Turecká republika"
+#~ msgid "State of Kuwait"
+#~ msgstr "Kuvajtský štát"
 
-#~ msgid "Turkmenistan"
-#~ msgstr "Turkménsko"
+#~ msgid "Korea, Republic of"
+#~ msgstr "Kórejská republika"
 
-#~ msgid "Turks and Caicos Islands"
-#~ msgstr "Ostrovy Turks a Caicos"
+#~ msgid "Democratic People's Republic of Korea"
+#~ msgstr "Kórejská ľudovodemokratická republika"
 
-#~ msgid "Tuvalu"
-#~ msgstr "Tuvalu"
+#~ msgid "Korea, Democratic People's Republic of"
+#~ msgstr "Kórejská ľudovodemokratická republika"
 
-#~ msgid "Uganda"
-#~ msgstr "Uganda"
+#~ msgid "Republic of Kiribati"
+#~ msgstr "Kiribatská republika"
 
-#~ msgid "Republic of Uganda"
-#~ msgstr "Ugandská republika"
+#~ msgid "Kiribati"
+#~ msgstr "Kiribati"
 
-#~ msgid "United Kingdom of Great Britain and Northern Ireland"
-#~ msgstr "Spojené kráľovstvo Veľkej Británie a Severného Írska"
+#~ msgid "Republic of Kenya"
+#~ msgstr "Kenská republika"
 
-#~ msgid "United States of America"
-#~ msgstr "Spojené štáty americké"
+#~ msgid "Republic of Kazakhstan"
+#~ msgstr "Kazašská republika"
 
-#~ msgid "United States Minor Outlying Islands"
-#~ msgstr "Menšie odľahlé ostrovy Spojených štátov"
+#~ msgid "Hashemite Kingdom of Jordan"
+#~ msgstr "Jordánske hášimovské kráľovstvo"
 
-#~ msgid "Eastern Republic of Uruguay"
-#~ msgstr "Uruguajská východná republika"
+#~ msgid "Jersey"
+#~ msgstr "Jersey"
 
-#~ msgid "Republic of Uzbekistan"
-#~ msgstr "Uzbecká republika"
+#~ msgid "Jamaica"
+#~ msgstr "Jamajka"
 
-#~ msgid "Vanuatu"
-#~ msgstr "Vanuatu"
+#~ msgid "Italian Republic"
+#~ msgstr "Talianska republika"
 
-#~ msgid "Republic of Vanuatu"
-#~ msgstr "Vanuatská republika"
+#~ msgid "State of Israel"
+#~ msgstr "Izraelský štát"
 
-#~ msgid "Bolivarian Republic of Venezuela"
-#~ msgstr "Venezuelská bolívarovská republika"
+#~ msgid "Isle of Man"
+#~ msgstr "Man"
 
-#~ msgid "Socialist Republic of Viet Nam"
-#~ msgstr "Vietnamská socialistická republika"
+#~ msgid "Republic of Iraq"
+#~ msgstr "Iracká republika"
 
-#~ msgid "Virgin Islands, British"
-#~ msgstr "Panenské ostrovy, Britské"
+#~ msgid "Islamic Republic of Iran"
+#~ msgstr "Iránska islamská republika"
 
-#~ msgid "British Virgin Islands"
-#~ msgstr "Britské Panenské ostrovy"
+#~ msgid "Iran, Islamic Republic of"
+#~ msgstr "Iránska islamská republika"
 
-#~ msgid "Virgin Islands, U.S."
-#~ msgstr "Panenské ostrovy, Americké"
+#~ msgid "Republic of Indonesia"
+#~ msgstr "Indonézska republika"
 
-#~ msgid "Virgin Islands of the United States"
-#~ msgstr "Panenské ostrovy Spojených štátov"
+#~ msgid "Republic of India"
+#~ msgstr "Indická republika"
 
-#~ msgid "Wallis and Futuna"
-#~ msgstr "Wallis a Futuna"
+#~ msgid "Republic of Iceland"
+#~ msgstr "Islandská republika"
 
-#~ msgid "Western Sahara"
-#~ msgstr "Západná Sahara"
+#~ msgid "Republic of Hungary"
+#~ msgstr "Maďarská republika"
 
-#~ msgid "Yemen"
-#~ msgstr "Jemen"
+#~ msgid "Hong Kong Special Administrative Region of China"
+#~ msgstr "Osobitná administratívna oblasť Číny Hongkong"
 
-#~ msgid "Republic of Yemen"
-#~ msgstr "Jemenská republika"
+#~ msgid "Republic of Honduras"
+#~ msgstr "Honduraská republika"
 
-#~ msgid "Zambia"
-#~ msgstr "Zambia"
+#~ msgid "Holy See (Vatican City State)"
+#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
 
-#~ msgid "Republic of Zambia"
-#~ msgstr "Zambijská republika"
+#~ msgid "Heard Island and McDonald Islands"
+#~ msgstr "Heardov ostrov"
 
-#~ msgid "Zimbabwe"
-#~ msgstr "Zimbabwe"
+#~ msgid "Republic of Haiti"
+#~ msgstr "Haitská republika"
 
-#~ msgid "Republic of Zimbabwe"
-#~ msgstr "Zimbabwianska republika"
+#~ msgid "Haiti"
+#~ msgstr "Haiti"
 
-#, fuzzy
-#~ msgid "British Antarctic Territory"
-#~ msgstr "Britské indickooceánske územie"
+#~ msgid "Republic of Guyana"
+#~ msgstr "Guyanská kooperatívna republika"
 
-#, fuzzy
-#~ msgid "Burma, Socialist Republic of the Union of"
-#~ msgstr "Vietnamská socialistická republika"
+#~ msgid "Guyana"
+#~ msgstr "Guyana"
 
-#, fuzzy
-#~ msgid "French Southern and Antarctic Territories"
-#~ msgstr "Francúzske južné a antarktické územia"
+#~ msgid "Republic of Guinea-Bissau"
+#~ msgstr "Guinejsko-bissauská republika"
 
-#, fuzzy
-#~ msgid "German Democratic Republic"
-#~ msgstr "Laoská ľudovodemokratická republika"
+#~ msgid "Guinea-Bissau"
+#~ msgstr "Guinea-Bissau"
 
-#, fuzzy
-#~ msgid "Germany, Federal Republic of"
+#~ msgid "Republic of Guinea"
+#~ msgstr "Guinejská republika"
+
+#~ msgid "Guinea"
+#~ msgstr "Guinea"
+
+#~ msgid "Guernsey"
+#~ msgstr "Guernsey"
+
+#~ msgid "Republic of Guatemala"
+#~ msgstr "Guatemalská republika"
+
+#~ msgid "Guam"
+#~ msgstr "Guam"
+
+#~ msgid "Guadeloupe"
+#~ msgstr "Guadeloupe"
+
+# pozn.: Na výslovnú žiadosť gréckej strany sa v medzinárodných dohodách, zmluvách a podobných dokumentoch medzi Gréckou republikou a Slovenskou republikou používa podoba Helénska republika, v ostatných prípadoch podoba Grécka republika.
+#~ msgid "Hellenic Republic"
+#~ msgstr "Grécka republika"
+
+#~ msgid "Gibraltar"
+#~ msgstr "Gibraltár"
+
+#~ msgid "Republic of Ghana"
+#~ msgstr "Ghanská republika"
+
+#~ msgid "Ghana"
+#~ msgstr "Ghana"
+
+#~ msgid "Federal Republic of Germany"
 #~ msgstr "Nemecká spolková republika"
 
-#, fuzzy
-#~ msgid "Gilbert and Ellice Islands"
-#~ msgstr "Ostrovy Turks a Caicos"
+#~ msgid "Republic of the Gambia"
+#~ msgstr "Gambijská republika"
+
+#~ msgid "Gambia"
+#~ msgstr "Gambia"
+
+#~ msgid "Gabonese Republic"
+#~ msgstr "Gabonská republika"
+
+#~ msgid "Gabon"
+#~ msgstr "Gabon"
+
+#~ msgid "French Southern Territories"
+#~ msgstr "Francúzske južné a antarktické územia"
+
+#~ msgid "French Guiana"
+#~ msgstr "Francúzska Guyana"
+
+#~ msgid "French Republic"
+#~ msgstr "Francúzska republika"
+
+#~ msgid "Republic of Finland"
+#~ msgstr "Fínska republika"
+
+#~ msgid "Republic of the Fiji Islands"
+#~ msgstr "Republika Fidžijských ostrovov"
+
+#~ msgid "Fiji"
+#~ msgstr "Fidži"
+
+#~ msgid "Falkland Islands (Malvinas)"
+#~ msgstr "Falklandy (Malvíny)"
+
+#~ msgid "Federal Democratic Republic of Ethiopia"
+#~ msgstr "Etiópska federatívna demokratická republika"
+
+#~ msgid "Republic of Estonia"
+#~ msgstr "Estónska republika"
+
+#~ msgid "Eritrea"
+#~ msgstr "Eritrea"
+
+#~ msgid "Republic of Equatorial Guinea"
+#~ msgstr "Republika Rovníkovej Guiney"
+
+#~ msgid "Equatorial Guinea"
+#~ msgstr "Rovníková Guinea"
+
+#~ msgid "Republic of El Salvador"
+#~ msgstr "Salvádorská republika"
+
+#~ msgid "Arab Republic of Egypt"
+#~ msgstr "Egyptská arabská republika"
+
+#~ msgid "Republic of Ecuador"
+#~ msgstr "Ekvádorská republika"
+
+#~ msgid "Commonwealth of Dominica"
+#~ msgstr "Dominické spoločenstvo"
+
+#~ msgid "Dominica"
+#~ msgstr "Dominika"
+
+#~ msgid "Republic of Djibouti"
+#~ msgstr "Džibutská republika"
+
+#~ msgid "Djibouti"
+#~ msgstr "Džibutsko"
+
+#~ msgid "Kingdom of Denmark"
+#~ msgstr "Dánske kráľovstvo"
+
+#~ msgid "Republic of Cyprus"
+#~ msgstr "Cyperská republika"
+
+#~ msgid "Cyprus"
+#~ msgstr "Cyprus"
+
+#~ msgid "Republic of Cuba"
+#~ msgstr "Kubánska republika"
+
+#~ msgid "Cuba"
+#~ msgstr "Kuba"
+
+#~ msgid "Republic of Croatia"
+#~ msgstr "Chorvátska republika"
 
 #, fuzzy
-#~ msgid "Johnston Island"
+#~ msgid "Republic of Côte d'Ivoire"
+#~ msgstr "Republika Pobrežia Slonoviny"
+
+#~ msgid "Côte d'Ivoire"
+#~ msgstr "Pobrežie Slonoviny"
+
+#~ msgid "Republic of Costa Rica"
+#~ msgstr "Kostarická republika"
+
+#~ msgid "Cook Islands"
 #~ msgstr "Cookove ostrovy"
 
-#, fuzzy
-#~ msgid "Midway Islands"
+#~ msgid "Congo, The Democratic Republic of the"
+#~ msgstr "Konžská demokratická republika"
+
+#~ msgid "Republic of the Congo"
+#~ msgstr "Konžská republika"
+
+#~ msgid "Congo"
+#~ msgstr "Kongo"
+
+#~ msgid "Union of the Comoros"
+#~ msgstr "Komorský zväz"
+
+#~ msgid "Comoros"
+#~ msgstr "Komory"
+
+#~ msgid "Republic of Colombia"
+#~ msgstr "Kolumbijská republika"
+
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "Kokosové ostrovy"
+
+#~ msgid "Christmas Island"
+#~ msgstr "Vianočný ostrov"
+
+#~ msgid "People's Republic of China"
+#~ msgstr "Čínska ľudová republika"
+
+#~ msgid "Republic of Chile"
+#~ msgstr "Čilská republika"
+
+#~ msgid "Republic of Chad"
+#~ msgstr "Čadská republika"
+
+#~ msgid "Chad"
+#~ msgstr "Čad"
+
+#~ msgid "Central African Republic"
+#~ msgstr "Stredoafrická republika"
+
+#~ msgid "Cayman Islands"
 #~ msgstr "Kajmanie ostrovy"
 
-#, fuzzy
-#~ msgid "Panama, Republic of"
-#~ msgstr "Macedónska republika"
+#~ msgid "Republic of Cape Verde"
+#~ msgstr "Kapverdská republika"
 
-#, fuzzy
-#~ msgid "Romania, Socialist Republic of"
-#~ msgstr "Vietnamská socialistická republika"
+#~ msgid "Cape Verde"
+#~ msgstr "Kapverdy"
 
-#, fuzzy
-#~ msgid "Serbia and Montenegro"
-#~ msgstr "Čiernohorská republika"
+#~ msgid "Republic of Cameroon"
+#~ msgstr "Kamerunská republika"
 
-#, fuzzy
-#~ msgid "Upper Volta, Republic of"
-#~ msgstr "Moldavská republika"
+#~ msgid "Cameroon"
+#~ msgstr "Kamerun"
 
-#, fuzzy
-#~ msgid "Vatican City State (Holy See)"
-#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
+#~ msgid "Kingdom of Cambodia"
+#~ msgstr "Kambodžské kráľovstvo"
 
-#, fuzzy
-#~ msgid "Viet-Nam, Democratic Republic of"
-#~ msgstr "Kórejská ľudovodemokratická republika"
+#~ msgid "Cambodia"
+#~ msgstr "Kambodža"
 
-#, fuzzy
-#~ msgid "Wake Island"
-#~ msgstr "Faerské ostrovy"
+#~ msgid "Republic of Burundi"
+#~ msgstr "Burundská republika"
 
-#, fuzzy
-#~ msgid "Yemen, Democratic, People's Democratic Republic of"
-#~ msgstr "Kórejská ľudovodemokratická republika"
+#~ msgid "Burundi"
+#~ msgstr "Burundi"
 
-#, fuzzy
-#~ msgid "Yemen, Yemen Arab Republic"
-#~ msgstr "Sýrska arabská republika"
+#~ msgid "Burkina Faso"
+#~ msgstr "Burkina Faso"
 
-#, fuzzy
-#~ msgid "Yugoslavia, Socialist Federal Republic of"
-#~ msgstr "Tanzánijská zjednotená republika"
+#~ msgid "Republic of Bulgaria"
+#~ msgstr "Bulharská republika"
+
+#~ msgid "Brunei Darussalam"
+#~ msgstr "Brunejsko-darussalamský štát"
+
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "Britské indickooceánske územie"
+
+#~ msgid "Federative Republic of Brazil"
+#~ msgstr "Brazílska federatívna republika"
+
+#~ msgid "Bouvet Island"
+#~ msgstr "Bouvetov ostrov"
+
+#~ msgid "Republic of Botswana"
+#~ msgstr "Botswanská republika"
+
+#~ msgid "Botswana"
+#~ msgstr "Botswana"
+
+#~ msgid "Republic of Bosnia and Herzegovina"
+#~ msgstr "Republika Bosny a Hercegoviny"
+
+#~ msgid "Republic of Bolivia"
+#~ msgstr "Bolívijská republika"
+
+#~ msgid "Bolivia"
+#~ msgstr "Bolívia"
+
+#~ msgid "Kingdom of Bhutan"
+#~ msgstr "Bhutánske kráľovstvo"
+
+#~ msgid "Bhutan"
+#~ msgstr "Bhután"
+
+#~ msgid "Bermuda"
+#~ msgstr "Bermudy"
+
+#~ msgid "Republic of Benin"
+#~ msgstr "Beninská republika"
+
+#~ msgid "Benin"
+#~ msgstr "Benin"
+
+#~ msgid "Belize"
+#~ msgstr "Belize"
+
+#~ msgid "Kingdom of Belgium"
+#~ msgstr "Belgické kráľovstvo"
+
+#~ msgid "Republic of Belarus"
+#~ msgstr "Bieloruská republika"
+
+#~ msgid "Barbados"
+#~ msgstr "Barbados"
+
+#~ msgid "People's Republic of Bangladesh"
+#~ msgstr "Bangladéšska ľudová republika"
 
 #, fuzzy
-#~ msgid "Zaire, Republic of"
-#~ msgstr "Kórejská republika"
+#~ msgid "Kingdom of Bahrain"
+#~ msgstr "Bhutánske kráľovstvo"
 
-#~ msgid "The Transitional Islamic State of Afghanistan"
-#~ msgstr "Dočasný afganský islamský štát"
+#~ msgid "Bahrain"
+#~ msgstr "Bahrajn"
 
-#~ msgid "State of Bahrain"
-#~ msgstr "Bahrajnské kráľovstvo"
+#~ msgid "Commonwealth of the Bahamas"
+#~ msgstr "Bahamské spoločenstvo"
 
-#~ msgid "Kingdom of Nepal"
-#~ msgstr "Nepálske kráľovstvo"
+#~ msgid "Republic of Azerbaijan"
+#~ msgstr "Azerbajdžanská republika"
+
+#~ msgid "Azerbaijan"
+#~ msgstr "Azerbajdžan"
+
+#~ msgid "Republic of Austria"
+#~ msgstr "Rakúska republika"
+
+#~ msgid "Aruba"
+#~ msgstr "Aruba"
+
+#~ msgid "Republic of Armenia"
+#~ msgstr "Arménska republika"
+
+#~ msgid "Argentine Republic"
+#~ msgstr "Argentínska republika"
+
+#~ msgid "Antigua and Barbuda"
+#~ msgstr "Antigua a Barbuda"
+
+#~ msgid "Antarctica"
+#~ msgstr "Antarktída"
+
+#~ msgid "Anguilla"
+#~ msgstr "Anguilla"
+
+#~ msgid "Republic of Angola"
+#~ msgstr "Angolská republika"
+
+#~ msgid "Angola"
+#~ msgstr "Angola"
+
+#~ msgid "Principality of Andorra"
+#~ msgstr "Andorrské kniežatstvo"
+
+#~ msgid "Andorra"
+#~ msgstr "Andorra"
+
+#~ msgid "American Samoa"
+#~ msgstr "Americká Samoa"
+
+#~ msgid "People's Democratic Republic of Algeria"
+#~ msgstr "Alžírska demokratická ľudová republika"
+
+#~ msgid "Republic of Albania"
+#~ msgstr "Albánska republika"
+
+#~ msgid "Åland Islands"
+#~ msgstr "Ålandy"
+
+#, fuzzy
+#~ msgid "Islamic Republic of Afghanistan"
+#~ msgstr "Pakistanská islamská republika"
+
+#~ msgid "Afghanistan"
+#~ msgstr "Afganistan"
diff --git a/slovene/po/countries.sl.po b/slovene/po/countries.sl.po
index c76ac69a7b4..c85133542d2 100644
--- a/slovene/po/countries.sl.po
+++ b/slovene/po/countries.sl.po
@@ -4,6 +4,7 @@ msgstr ""
 "PO-Revision-Date: 2006-08-12 17:09+0200\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -55,308 +56,364 @@ msgid "Brazil"
 msgstr "Brazilija"
 
 #: ../../english/template/debian/countries.wml:59
+msgid "Bahamas"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:62
 msgid "Belarus"
 msgstr "Belorusija"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:65
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:68
 msgid "Switzerland"
 msgstr "Švica"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:71
 msgid "Chile"
 msgstr "Čile"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:74
 msgid "China"
 msgstr "Kitajska"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:77
 msgid "Colombia"
 msgstr "Kolumbija"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:80
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:83
 msgid "Czech Republic"
 msgstr "Češka"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:86
 msgid "Germany"
 msgstr "Nemčija"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:89
 msgid "Denmark"
 msgstr "Danska"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:92
 msgid "Dominican Republic"
 msgstr "Dominikanska republika"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:95
+msgid "Algeria"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:98
+msgid "Ecuador"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:101
 msgid "Estonia"
 msgstr "Estonija"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:104
 msgid "Egypt"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:107
 msgid "Spain"
 msgstr "Španija"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:110
 #, fuzzy
 msgid "Ethiopia"
 msgstr "Estonija"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:113
 msgid "Finland"
 msgstr "Finska"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:116
 msgid "Faroe Islands"
 msgstr "Ferski otoki"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:119
 msgid "France"
 msgstr "Francija"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:122
 msgid "Great Britain"
 msgstr "Velika Britanija"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:125
 #, fuzzy
 msgid "Grenada"
 msgstr "Grenlandija"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:128
+msgid "Georgia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:131
 msgid "Greenland"
 msgstr "Grenlandija"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:134
 msgid "Greece"
 msgstr "Grčija"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:137
 msgid "Guatemala"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:140
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:143
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:146
 msgid "Croatia"
 msgstr "Hrvaška"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:149
 msgid "Hungary"
 msgstr "Madžarska"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:152
 msgid "Indonesia"
 msgstr "Indonezija"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:155
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:158
 msgid "Ireland"
 msgstr "Irska"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:161
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:164
 msgid "India"
 msgstr "Indija"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:167
 msgid "Iceland"
 msgstr "Islandija"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:170
 msgid "Italy"
 msgstr "Italija"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:173
 msgid "Jordan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:176
 msgid "Japan"
 msgstr "Japonska"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:179
 #, fuzzy
 msgid "Kenya"
 msgstr "Koreja"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:182
 msgid "Korea"
 msgstr "Koreja"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:185
 msgid "Kuwait"
 msgstr "Kuvajt"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:188
+msgid "Kazakhstan"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:191
 msgid "Sri Lanka"
 msgstr "Šri lanka"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:194
 msgid "Lithuania"
 msgstr "Litva"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:197
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:200
 msgid "Latvia"
 msgstr "Latvija"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:203
 msgid "Morocco"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:206
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:209
+msgid "Montenegro"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: ../../english/template/debian/countries.wml:215
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:218
+msgid "Malta"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Mehika"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malezija"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:227
+msgid "New Caledonia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Nizozemska"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Norveška"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Nova Zelandija"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:242
 #, fuzzy
 msgid "Panama"
 msgstr "Kanada"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:248
+msgid "French Polynesia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Filipini"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Poljska"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugalska"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Romunija"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:266
+msgid "Serbia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Rusija"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Savdska Arabija"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Švedska"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Slovenija"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Slovaška"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Tajska"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:293
 #, fuzzy
 msgid "Tunisia"
 msgstr "Rusija"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Turčija"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:302
 #, fuzzy
 msgid "Ukraine"
 msgstr "Francija"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Združeno kraljestvo"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Združene države Amerike"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:314
+msgid "Uzbekistan"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venecuela"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:278
-msgid "Serbia and Montenegro"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Južna Afrika"
 
diff --git a/swedish/po/countries.sv.po b/swedish/po/countries.sv.po
index c52956717ff..60ae281ab62 100644
--- a/swedish/po/countries.sv.po
+++ b/swedish/po/countries.sv.po
@@ -265,149 +265,153 @@ msgid "Montenegro"
 msgstr "Montenegro"
 
 #: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: ../../english/template/debian/countries.wml:215
 msgid "Mongolia"
 msgstr "Mongoliet"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:218
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:227
 msgid "New Caledonia"
 msgstr "Nya Kaledonien"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Nederländerna"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Norge"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Nya Zeeland"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:248
 msgid "French Polynesia"
 msgstr "Franska Polynesien"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Filippinerna"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Polen"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Rumänien"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "Serbien"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Ryssland"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Saudiarabien"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Slovenien"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Slovakien"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Tunisien"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Turkiet"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Storbritannien"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Förenta staterna"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:314
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Sydafrika"
diff --git a/tamil/po/countries.ta.po b/tamil/po/countries.ta.po
index 6c2a60223bd..3d42c88d6cb 100644
--- a/tamil/po/countries.ta.po
+++ b/tamil/po/countries.ta.po
@@ -1,13 +1,14 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
 "Project-Id-Version: டெபியன் தள தமிழாக்கம்\n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: 2007-10-30 17:28+0530\n"
 "Last-Translator: ஆமாச்சு <amachu@ubuntu.com>\n"
 "Language-Team: டெபியன் தமிழாக்கம் <vizhuthugal@anbu.in>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Tamil\n"
 "X-Poedit-Country: INDIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -105,270 +106,311 @@ msgid "Dominican Republic"
 msgstr "டொமினிகன் குடியரசு"
 
 #: ../../english/template/debian/countries.wml:95
+msgid "Algeria"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:98
 msgid "Ecuador"
 msgstr "ஈகுவேடார்"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:101
 msgid "Estonia"
 msgstr "எஸ்டோனியா"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:104
 msgid "Egypt"
 msgstr "எகிப்து"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:107
 msgid "Spain"
 msgstr "ஸ்பெயின்"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:110
 msgid "Ethiopia"
 msgstr "எதியோபியா"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:113
 msgid "Finland"
 msgstr "பிஃன்லாந்து"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:116
 msgid "Faroe Islands"
 msgstr "பாஃரோ தீவு"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:119
 msgid "France"
 msgstr "பிரான்ஸ்"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:122
 msgid "Great Britain"
 msgstr "அகண்ட பிரிட்டன்"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:125
 msgid "Grenada"
 msgstr "கிரெனாடா"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:128
+msgid "Georgia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:131
 msgid "Greenland"
 msgstr "கிரீன்லாந்து"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:134
 msgid "Greece"
 msgstr "கிரேக்கம்"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:137
 msgid "Guatemala"
 msgstr "குவஹாத்திமாலா"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:140
 msgid "Hong Kong"
 msgstr "ஹாங்காங்"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:143
 msgid "Honduras"
 msgstr "ஹோன்டுராஸ்"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:146
 msgid "Croatia"
 msgstr "குரோயேஷியா"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:149
 msgid "Hungary"
 msgstr "ஹங்கேரி"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:152
 msgid "Indonesia"
 msgstr "இந்தோனேஷியா"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:155
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:158
 msgid "Ireland"
 msgstr "அயர்லாந்து"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:161
 msgid "Israel"
 msgstr "இஸ்ரேல்"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:164
 msgid "India"
 msgstr "பாரதம்"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:167
 msgid "Iceland"
 msgstr "ஐஸ்லாந்து"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:170
 msgid "Italy"
 msgstr "இத்தாலி"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:173
 msgid "Jordan"
 msgstr "ஜோர்டான்"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:176
 msgid "Japan"
 msgstr "ஜப்பான்"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:179
 msgid "Kenya"
 msgstr "கென்யா"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:182
 msgid "Korea"
 msgstr "கொரியா"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:185
 msgid "Kuwait"
 msgstr "குவைத்"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:188
 msgid "Kazakhstan"
 msgstr "கஜகஸ்தான்"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:191
 msgid "Sri Lanka"
 msgstr "இலங்கை"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:194
 msgid "Lithuania"
 msgstr "லித்துவானியா"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:197
 msgid "Luxembourg"
 msgstr "லக்ஸம்பரக்"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:200
 msgid "Latvia"
 msgstr "லத்வியா"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:203
 msgid "Morocco"
 msgstr "மொராகோ"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:206
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:209
 msgid "Montenegro"
 msgstr "மான்டெனெக்ரோ"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "மடகாஸகர"
+
+#: ../../english/template/debian/countries.wml:215
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:218
+msgid "Malta"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "மெக்ஸிகோ"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "மலேசியா"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:227
+msgid "New Caledonia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "நீகுரகோவா"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "நெதர்லாந்து"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "நார்வே"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "நியூசிலாந்து"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "பனாமா"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "பெரு"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:248
+msgid "French Polynesia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "பிலிப்பைன்ஸ்"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "பாகிஸ்தான்"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "போலாந்து"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "போர்ட்சுகல்"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "ருமேனியா"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:266
 msgid "Serbia"
 msgstr "செர்பியா"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "ரஷ்யா"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "சவுதி அரேபியா"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "ஸ்வீடன்"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "சிங்கப்பூர்"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "ஸ்லோவேனியா"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "ஸ்லோவேகியா"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "எல் சல்வேடார்"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "தாய்லாந்து"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "துனிஷியா"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "துருக்கி"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "தைவான்"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "யுக்ரைன்"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "இக்கிய இராஜ்ஜியம்"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "ஐக்கிய மாகாணங்கள்"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "உருகுவே"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:314
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Uzbekistan"
+msgstr "பாகிஸ்தான்"
+
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "வெனிசுலா"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "வியட்னாம்"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "தென்னாப்பிக்கா"
-
diff --git a/turkish/po/countries.tr.po b/turkish/po/countries.tr.po
index 6ffc1635858..f2d2f0bbc16 100644
--- a/turkish/po/countries.tr.po
+++ b/turkish/po/countries.tr.po
@@ -8,332 +8,423 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-webwml\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2003-11-10 15:06+0100\n"
 "PO-Revision-Date: 2006-01-18 17:24+0200\n"
 "Last-Translator: Recai Oktaş <roktas@omu.edu.tr>\n"
 "Language-Team: Debian L10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
 
 #: ../../english/template/debian/countries.wml:26
+#, fuzzy
+#| msgid "United States"
+msgid "United Arab Emirates"
+msgstr "ABD"
+
+#: ../../english/template/debian/countries.wml:29
 msgid "Albania"
 msgstr "Arnavutluk"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:32
 msgid "Armenia"
 msgstr "Ermenistan"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:35
 msgid "Argentina"
 msgstr "Arjantin"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:38
 msgid "Austria"
 msgstr "Avusturya"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:41
 msgid "Australia"
 msgstr "Avustralya"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:44
 msgid "Bosnia and Herzegovina"
 msgstr "Bosna-Hersek"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:47
+msgid "Bangladesh"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:50
 msgid "Belgium"
 msgstr "Belçika"
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:53
 msgid "Bulgaria"
 msgstr "Bulgaristan"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:56
 msgid "Brazil"
 msgstr "Brezilya"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:59
+msgid "Bahamas"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:62
 msgid "Belarus"
 msgstr "Belarus"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:65
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:68
 msgid "Switzerland"
 msgstr "İsviçre"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:71
 msgid "Chile"
 msgstr "Şili"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:74
 msgid "China"
 msgstr "Çin"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:77
 msgid "Colombia"
 msgstr "Kolombiya"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:80
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:83
 msgid "Czech Republic"
 msgstr "Çek Cum."
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:86
 msgid "Germany"
 msgstr "Almanya"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:89
 msgid "Denmark"
 msgstr "Danimarka"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:92
 msgid "Dominican Republic"
 msgstr "Dominik Cum."
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:95
+msgid "Algeria"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:98
+msgid "Ecuador"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:101
 msgid "Estonia"
 msgstr "Estonya"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:104
+msgid "Egypt"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:107
 msgid "Spain"
 msgstr "İspanya"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:110
 msgid "Ethiopia"
 msgstr "Etiyopya"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:113
 msgid "Finland"
 msgstr "Finlandiya"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:116
 msgid "Faroe Islands"
 msgstr "Faroe Adaları"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:119
 msgid "France"
 msgstr "Fransa"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:122
 msgid "Great Britain"
 msgstr "İngiltere"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:125
+#, fuzzy
+#| msgid "Canada"
+msgid "Grenada"
+msgstr "Kanada"
+
+#: ../../english/template/debian/countries.wml:128
+msgid "Georgia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:131
 msgid "Greenland"
 msgstr "Grönland"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:134
 msgid "Greece"
 msgstr "Yunanistan"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:137
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:140
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:143
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:146
 msgid "Croatia"
 msgstr "Hırvatistan"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:149
 msgid "Hungary"
 msgstr "Macaristan"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:152
 msgid "Indonesia"
 msgstr "Endonezya"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:155
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:158
 msgid "Ireland"
 msgstr "İrlanda"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:161
 msgid "Israel"
 msgstr "İsrail"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:164
 msgid "India"
 msgstr "Hindistan"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:167
 msgid "Iceland"
 msgstr "İzlanda"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:170
 msgid "Italy"
 msgstr "İtalya"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:173
+msgid "Jordan"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:176
 msgid "Japan"
 msgstr "Japonya"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:179
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:182
 msgid "Korea"
 msgstr "Kore"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:185
 msgid "Kuwait"
 msgstr "Kuveyt"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:188
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Kazakhstan"
+msgstr "Pakistan"
+
+#: ../../english/template/debian/countries.wml:191
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:194
 msgid "Lithuania"
 msgstr "Litvanya"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:197
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:200
 msgid "Latvia"
 msgstr "Letonya"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:203
 msgid "Morocco"
 msgstr "Fas"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:206
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:209
+#, fuzzy
+#| msgid "Serbia and Montenegro"
+msgid "Montenegro"
+msgstr "Sırbistan ve Karadağ"
+
+#: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Madagaskar"
+
+#: ../../english/template/debian/countries.wml:215
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:218
+msgid "Malta"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Meksika"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Malezya"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:227
+msgid "New Caledonia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Hollanda"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Norveç"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Yeni Zellanda"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:248
+msgid "French Polynesia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Filipinler"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Polonya"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Portekiz"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Romanya"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:266
+msgid "Serbia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Rusya"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Suudi Arabistan"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "İsveç"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Slovenya"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Slovakya"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Tayland"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:293
+msgid "Tunisia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Türkiye"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Tayvan"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Ukrayna"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "İngiltere"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "ABD"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:314
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Uzbekistan"
+msgstr "Pakistan"
+
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:260
-msgid "Serbia and Montenegro"
-msgstr "Sırbistan ve Karadağ"
-
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Güney Afrika"
diff --git a/ukrainian/po/countries.uk.po b/ukrainian/po/countries.uk.po
index 7c720d6038c..a33b87932d6 100644
--- a/ukrainian/po/countries.uk.po
+++ b/ukrainian/po/countries.uk.po
@@ -6,11 +6,13 @@ msgstr ""
 "PO-Revision-Date: 2006-11-03 20:18+0100\n"
 "Last-Translator: Eugeniy Meshcheryakov <eugen@debian.org>\n"
 "Language-Team: Ukrainian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../../english/template/debian/countries.wml:26
 msgid "United Arab Emirates"
@@ -57,306 +59,363 @@ msgid "Brazil"
 msgstr "Бразилія"
 
 #: ../../english/template/debian/countries.wml:59
+msgid "Bahamas"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:62
 msgid "Belarus"
 msgstr "Білорусь"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:65
 msgid "Canada"
 msgstr "Канада"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:68
 msgid "Switzerland"
 msgstr "Швейцарія"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:71
 msgid "Chile"
 msgstr "Чилі"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:74
 msgid "China"
 msgstr "Китай"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:77
 msgid "Colombia"
 msgstr "Колумбія"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:80
 msgid "Costa Rica"
 msgstr "Коста-Ріка"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:83
 msgid "Czech Republic"
 msgstr "Чеська Республіка"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:86
 msgid "Germany"
 msgstr "Німеччина"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:89
 msgid "Denmark"
 msgstr "Данія"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:92
 msgid "Dominican Republic"
 msgstr "Домініканська Республіка"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:95
+msgid "Algeria"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:98
 msgid "Ecuador"
 msgstr "Еквадор"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:101
 msgid "Estonia"
 msgstr "Естонія"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:104
 msgid "Egypt"
 msgstr "Єгипет"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:107
 msgid "Spain"
 msgstr "Іспанія"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:110
 msgid "Ethiopia"
 msgstr "Ефіопія"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:113
 msgid "Finland"
 msgstr "Фінляндія"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:116
 msgid "Faroe Islands"
 msgstr "Фарерські Острови"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:119
 msgid "France"
 msgstr "Франція"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:122
 msgid "Great Britain"
 msgstr "Великобританія"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:125
 msgid "Grenada"
 msgstr "Гренада"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:128
+msgid "Georgia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:131
 msgid "Greenland"
 msgstr "Гренландія"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:134
 msgid "Greece"
 msgstr "Греція"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:137
 msgid "Guatemala"
 msgstr "Гватемала"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:140
 msgid "Hong Kong"
 msgstr "Гонконг"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:143
 msgid "Honduras"
 msgstr "Гондурас"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:146
 msgid "Croatia"
 msgstr "Хорватія"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:149
 msgid "Hungary"
 msgstr "Угорщина"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:152
 msgid "Indonesia"
 msgstr "Індонезія"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:155
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:158
 msgid "Ireland"
 msgstr "Ірландія"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:161
 msgid "Israel"
 msgstr "Ізраїль"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:164
 msgid "India"
 msgstr "Індія"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:167
 msgid "Iceland"
 msgstr "Ісландія"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:170
 msgid "Italy"
 msgstr "Італія"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:173
 msgid "Jordan"
 msgstr "Йорданія"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:176
 msgid "Japan"
 msgstr "Японія"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:179
 msgid "Kenya"
 msgstr "Кенія"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:182
 msgid "Korea"
 msgstr "Корея"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:185
 msgid "Kuwait"
 msgstr "Кувейт"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:188
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Kazakhstan"
+msgstr "Пакистан"
+
+#: ../../english/template/debian/countries.wml:191
 msgid "Sri Lanka"
 msgstr "Шрі-Ланка"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:194
 msgid "Lithuania"
 msgstr "Литва"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:197
 msgid "Luxembourg"
 msgstr "Люксембург"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:200
 msgid "Latvia"
 msgstr "Латвія"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:203
 msgid "Morocco"
 msgstr "Марокко"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:206
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:209
+#, fuzzy
+#| msgid "Serbia and Montenegro"
+msgid "Montenegro"
+msgstr "Сербія і Чорногорія"
+
+#: ../../english/template/debian/countries.wml:212
+msgid "Madagascar"
+msgstr "Мадагаскар"
+
+#: ../../english/template/debian/countries.wml:215
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:218
+msgid "Malta"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:221
 msgid "Mexico"
 msgstr "Мексика"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:224
 msgid "Malaysia"
 msgstr "Малайзія"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:227
+msgid "New Caledonia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:230
 msgid "Nicaragua"
 msgstr "Нікарагуа"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:233
 msgid "Netherlands"
 msgstr "Нідерланди"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:236
 msgid "Norway"
 msgstr "Норвегія"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:239
 msgid "New Zealand"
 msgstr "Нова Зеландія"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:242
 msgid "Panama"
 msgstr "Панама"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:245
 msgid "Peru"
 msgstr "Перу"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:248
+msgid "French Polynesia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:251
 msgid "Philippines"
 msgstr "Філіппіни"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:254
 msgid "Pakistan"
 msgstr "Пакистан"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:257
 msgid "Poland"
 msgstr "Польща"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:260
 msgid "Portugal"
 msgstr "Португалія"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:263
 msgid "Romania"
 msgstr "Румунія"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:266
+msgid "Serbia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:269
 msgid "Russia"
 msgstr "Росія"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:272
 msgid "Saudi Arabia"
 msgstr "Саудівська Аравія"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:275
 msgid "Sweden"
 msgstr "Швеція"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:278
 msgid "Singapore"
 msgstr "Сінгапур"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:281
 msgid "Slovenia"
 msgstr "Словенія"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:284
 msgid "Slovakia"
 msgstr "Словаччина"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:287
 msgid "El Salvador"
 msgstr "Сальвадор"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:290
 msgid "Thailand"
 msgstr "Таїланд"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:293
 msgid "Tunisia"
 msgstr "Туніс"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:296
 msgid "Turkey"
 msgstr "Туреччина"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:299
 msgid "Taiwan"
 msgstr "Тайвань"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:302
 msgid "Ukraine"
 msgstr "Україна"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:305
 msgid "United Kingdom"
 msgstr "Об'єднане Королівство"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:308
 msgid "United States"
 msgstr "Сполучені Штати"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:311
 msgid "Uruguay"
 msgstr "Уругвай"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:314
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Uzbekistan"
+msgstr "Пакистан"
+
+#: ../../english/template/debian/countries.wml:317
 msgid "Venezuela"
 msgstr "Венесуела"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:320
 msgid "Vietnam"
 msgstr "В'єтнам"
 
-#: ../../english/template/debian/countries.wml:281
-msgid "Serbia and Montenegro"
-msgstr "Сербія і Чорногорія"
-
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:323
 msgid "South Africa"
 msgstr "Південна Африка"
-
diff --git a/vietnamese/po/countries.vi.po b/vietnamese/po/countries.vi.po
deleted file mode 100644
index f6ec05cb4ab..00000000000
--- a/vietnamese/po/countries.vi.po
+++ /dev/null
@@ -1,385 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=ASCII\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../../english/template/debian/countries.wml:26
-msgid "United Arab Emirates"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:29
-msgid "Albania"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:32
-msgid "Armenia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:35
-msgid "Argentina"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:38
-msgid "Austria"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:41
-msgid "Australia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:44
-msgid "Bosnia and Herzegovina"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:47
-msgid "Bangladesh"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:50
-msgid "Belgium"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:53
-msgid "Bulgaria"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:56
-msgid "Brazil"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:59
-msgid "Bahamas"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:62
-msgid "Belarus"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:65
-msgid "Canada"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:68
-msgid "Switzerland"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:71
-msgid "Chile"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:74
-msgid "China"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:77
-msgid "Colombia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:80
-msgid "Costa Rica"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:83
-msgid "Czech Republic"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:86
-msgid "Germany"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:89
-msgid "Denmark"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:92
-msgid "Dominican Republic"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:95
-msgid "Ecuador"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:98
-msgid "Estonia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:101
-msgid "Egypt"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:104
-msgid "Spain"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:107
-msgid "Ethiopia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:110
-msgid "Finland"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:113
-msgid "Faroe Islands"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:116
-msgid "France"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:119
-msgid "Great Britain"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:122
-msgid "Grenada"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:125
-msgid "Georgia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:128
-msgid "Greenland"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:131
-msgid "Greece"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:134
-msgid "Guatemala"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:137
-msgid "Hong Kong"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:140
-msgid "Honduras"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:143
-msgid "Croatia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:146
-msgid "Hungary"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:149
-msgid "Indonesia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:152
-msgid "Ireland"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:155
-msgid "Israel"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:158
-msgid "India"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:161
-msgid "Iceland"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:164
-msgid "Italy"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:167
-msgid "Jordan"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:170
-msgid "Japan"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:173
-msgid "Kenya"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:176
-msgid "Korea"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:179
-msgid "Kuwait"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:182
-msgid "Kazakhstan"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:185
-msgid "Sri Lanka"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:188
-msgid "Lithuania"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:191
-msgid "Luxembourg"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:194
-msgid "Latvia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:197
-msgid "Morocco"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:200
-msgid "Montenegro"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:203
-msgid "Malta"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:206
-msgid "Mexico"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:209
-msgid "Malaysia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:212
-msgid "New Caledonia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:215
-msgid "Nicaragua"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:218
-msgid "Netherlands"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:221
-msgid "Norway"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:224
-msgid "New Zealand"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:227
-msgid "Panama"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:230
-msgid "Peru"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:233
-msgid "French Polynesia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:236
-msgid "Philippines"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:239
-msgid "Pakistan"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:242
-msgid "Poland"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:245
-msgid "Portugal"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:248
-msgid "Romania"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:251
-msgid "Serbia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:254
-msgid "Russia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:257
-msgid "Saudi Arabia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:260
-msgid "Sweden"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:263
-msgid "Singapore"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:266
-msgid "Slovenia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:269
-msgid "Slovakia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:272
-msgid "El Salvador"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:275
-msgid "Thailand"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:278
-msgid "Tunisia"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:281
-msgid "Turkey"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:284
-msgid "Taiwan"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:287
-msgid "Ukraine"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:290
-msgid "United Kingdom"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:293
-msgid "United States"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:296
-msgid "Uruguay"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:299
-msgid "Uzbekistan"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:302
-msgid "Venezuela"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:305
-msgid "Vietnam"
-msgstr ""
-
-#: ../../english/template/debian/countries.wml:308
-msgid "South Africa"
-msgstr ""
-