countries.po: Manual partial update based on isoquery

CVS version numbers

arabic/po/countries.ar.po: 1.13 -> 1.14 
armenian/po/countries.hy.po: 1.4 -> 1.5 
bulgarian/po/countries.bg.po: 1.40 -> 1.41 
catalan/po/countries.ca.po: 1.28 -> 1.29 
chinese/po/countries.zh.po: 1.9 -> 1.10 
croatian/po/countries.hr.po: 1.18 -> 1.19 
czech/po/countries.cs.po: 1.7 -> 1.8 
danish/po/countries.da.po: 1.35 -> 1.36 
dutch/po/countries.nl.po: 1.36 -> 1.37 
english/po/countries.pot: 1.32 -> 1.33 
esperanto/po/countries.eo.po: 1.8 -> 1.9 
finnish/po/countries.fi.po: 1.34 -> 1.35 
french/po/countries.fr.po: 1.34 -> 1.35 
galician/po/countries.gl.po: 1.1 -> 1.2 
german/po/countries.de.po: 1.42 -> 1.43 
greek/po/countries.el.po: 1.11 -> 1.12 
hebrew/po/countries.he.po: 1.4 -> 1.5 
hungarian/po/countries.hu.po: 1.20 -> 1.21 
indonesian/po/countries.id.po: 1.6 -> 1.7 
italian/po/countries.it.po: 1.31 -> 1.32 
japanese/po/countries.ja.po: 1.24 -> 1.25 
korean/po/countries.ko.po: 1.11 -> 1.12 
lithuanian/po/countries.lt.po: 1.6 -> 1.7 
norwegian/po/countries.nb.po: 1.4 -> 1.5 
persian/po/countries.fa.po: 1.5 -> 1.6 
polish/po/countries.pl.po: 1.31 -> 1.32 
portuguese/po/countries.pt.po: 1.29 -> 1.30 
romanian/po/countries.ro.po: 1.8 -> 1.9 
russian/po/countries.ru.po: 1.29 -> 1.30 
slovak/po/countries.sk.po: 1.9 -> 1.10 
slovene/po/countries.sl.po: 1.3 -> 1.4 
spanish/po/countries.es.po: 1.26 -> 1.27 
swedish/po/countries.sv.po: 1.32 -> 1.33 
tamil/po/countries.ta.po: 1.2 -> 1.3 
turkish/po/countries.tr.po: 1.7 -> 1.8 
ukrainian/po/countries.uk.po: 1.9 -> 1.10

36 files changed, 3750 insertions, 3437 deletions

diff --git a/arabic/po/countries.ar.po b/arabic/po/countries.ar.po
index 33d1b015e5c..51b2a85b610 100644
--- a/arabic/po/countries.ar.po
+++ b/arabic/po/countries.ar.po
@@ -196,7 +196,7 @@ msgstr "أيرلندا"
 
 #: ../../english/template/debian/countries.wml:246
 msgid "Israel"
-msgstr ""
+msgstr "إسرائيل"
 
 #: ../../english/template/debian/countries.wml:249
 msgid "India"
@@ -415,5 +415,9 @@ msgid "Vietnam"
 msgstr "فيتنام"
 
 #: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "فانواتو"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "جنوب أفريقيا"
diff --git a/armenian/po/countries.hy.po b/armenian/po/countries.hy.po
index c0a309063f5..d46b115594a 100644
--- a/armenian/po/countries.hy.po
+++ b/armenian/po/countries.hy.po
@@ -9,410 +9,423 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 #, fuzzy
 msgid "United Arab Emirates"
 msgstr "Միացիալ Նահանգներ"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Ալբանիա"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Հայաստան"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Արգենտինա"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Ավստրիա"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Ավստրալիա"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Բանգլադեշ"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Բելգիա"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Բուլղարիա"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Բրազիլիա"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 #, fuzzy
 msgid "Bahamas"
 msgstr "Պանամա"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Բելառուսիա"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Կանադա"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Շվեցարիա"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Չիլի"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Չինաստան"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Կալումբիա"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Կոստա Րիկա"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Գերմանիա"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Դանիա"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Էստոնիա"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Եգիպտոս"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Իսպանիա"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Ֆինլանդիա"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Ֆրանսիա"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
-msgstr "Մեծ Բրիտանիա"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
+msgstr "Միացիալ Թագավորություն"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 #, fuzzy
 msgid "Grenada"
 msgstr "Կանադա"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Գանդուրաս"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Հունգարիա"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Ինդոնեզիա"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Իսրաել"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "Հնդկաստան"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Իտալիա"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Ճապոնիա"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Կորեա"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Քուվեիտ"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 #, fuzzy
 msgid "Kazakhstan"
 msgstr "Պակիստան"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Շիրի Լանկա"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Լուկսենբուրգ"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Լատվիա"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Մարոկո"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Մադագասկար"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:300
+msgid "Macedonia, Republic of"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:306
 #, fuzzy
 msgid "Malta"
 msgstr "Մալազիա"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Մեքսիկա"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Մալազիա"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Նիկարագուա"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Նորվեգիա"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Պանամա"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Պեռու"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Ֆիլիպիններ"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Պակիստան"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Պորտուգալիա"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Ռումինիա"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Ռուսաստան"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Շվեդիա"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Սինգապուր"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Սլովենիա"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Սլովակիա"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Թաիլանդ"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:381
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Tajikistan"
+msgstr "Պակիստան"
+
+#: ../../english/template/debian/countries.wml:384
 #, fuzzy
 msgid "Tunisia"
 msgstr "Ռուսաստան"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Թուրքիա"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Տաիվան"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ուկրաինիա"
 
-#: ../../english/template/debian/countries.wml:305
-msgid "United Kingdom"
-msgstr "Միացիալ Թագավորություն"
-
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Միացիալ Նահանգներ"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Ուրուգվայ"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:402
 #, fuzzy
 #| msgid "Pakistan"
 msgid "Uzbekistan"
 msgstr "Պակիստան"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Վենեսուելա"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Վիետնամ"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Հարավային Աֆրիկա"
+
+#~ msgid "Great Britain"
+#~ msgstr "Մեծ Բրիտանիա"
diff --git a/bulgarian/po/countries.bg.po b/bulgarian/po/countries.bg.po
index f390e9f08b9..4d9d3708792 100644
--- a/bulgarian/po/countries.bg.po
+++ b/bulgarian/po/countries.bg.po
@@ -414,6 +414,10 @@ msgid "Vietnam"
 msgstr "Виетнам"
 
 #: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Вануату"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "ЮАР"
 
diff --git a/catalan/po/countries.ca.po b/catalan/po/countries.ca.po
index 16f2a860730..b85c4eadbbc 100644
--- a/catalan/po/countries.ca.po
+++ b/catalan/po/countries.ca.po
@@ -14,398 +14,417 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Emirats Arabs Units"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albània"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Armènia"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Àustria"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Austràlia"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Bòsnia i Herzegovina"
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Bangla Desh"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Bèlgica"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bulgària"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "Bahames"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Bielorússia"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Canadà"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Suïssa"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Xile"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Xina"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Colòmbia"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "República Txeca"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Alemanya"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr "Algèria"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Estònia"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Egipte"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Espanya"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finlàndia"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Illes Fèroe"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "França"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
-msgstr "Gran Bretanya"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
+msgstr "Regne Unit"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "Geòrgia"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Groenlàndia"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Grècia"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Hondures"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Croàcia"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Hongria"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonèsia"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr "Iran"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Israel"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "Índia"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Islàndia"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Itàlia"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Jordània"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Japó"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Corea"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Lituània"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Letònia"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Marroc"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr "Moldàvia"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "Montenegro"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
+msgid "Madagascar"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:300
+#, fuzzy
+#| msgid "Dominican Republic"
+msgid "Macedonia, Republic of"
+msgstr "República Dominicana"
+
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr "Mongòlia"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Mèxic"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malàisia"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "Nova Caledonia"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Països Baixos"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Nova Zelanda"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panamà"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Perú"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "Polinèsia Francesa"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Filipines"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Polònia"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Romania"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "Sèrbia"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Rússia"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Aràbia Saudita"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Suècia"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Eslovènia"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Eslovàquia"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Tailàndia"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:381
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Tajikistan"
+msgstr "Pakistan"
+
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Tunísia"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Turquia"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ucraïna"
 
-#: ../../english/template/debian/countries.wml:302
-msgid "United Kingdom"
-msgstr "Regne Unit"
-
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Estats Units"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Veneçuela"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Sud-àfrica"
+
+#~ msgid "Great Britain"
+#~ msgstr "Gran Bretanya"
diff --git a/chinese/po/countries.zh.po b/chinese/po/countries.zh.po
index aba2351d1fc..899d355c807 100644
--- a/chinese/po/countries.zh.po
+++ b/chinese/po/countries.zh.po
@@ -10,413 +10,416 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "阿拉伯聯合大公國"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "阿爾巴尼亞"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "亞美尼亞"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "阿根延"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "奧地利"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "澳洲"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "波士尼亞與赫塞哥維納"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "孟加拉"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "比利時"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "保加利亞"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "巴哈馬"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "白俄羅斯"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "瑞士"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "智利"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "中國大陸"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "哥倫比亞"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "哥斯達尼加"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "捷克共和國"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "德國"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "丹麥"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "多米尼加共和國"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr "阿爾及利亞"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "厄瓜多"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "愛沙尼亞"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "埃及"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "衣索比亞"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "芬蘭"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "法羅群島"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "法國"
 
-#: ../../english/template/debian/countries.wml:206
-msgid "Great Britain"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
 msgstr "英國"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "格瑞那達"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "喬治亞"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "格陵蘭"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "希臘"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "瓜地馬拉"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "香港"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "[CNHK:洪都拉斯:][TW:宏都拉斯:]"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "[CNHK:克羅地亞:][TW:克羅埃西亞:]"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "匈牙利"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "印尼"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr "伊朗"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "愛爾蘭"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "以色列"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "印度"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "冰島"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "意大利"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "約旦"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "日本"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "肯亞"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "韓國"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "科威特"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "哈薩克"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "斯里蘭卡"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "立陶宛"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "盧森堡"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "拉脫維亞"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "摩洛哥"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr "摩爾多瓦"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "蒙特內哥羅"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "马达加斯加"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:300
 msgid "Macedonia, Republic of"
 msgstr "馬其頓共和國"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr "蒙古"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "馬爾他"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "墨西哥"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "馬來西亞"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "新喀里多尼亞"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "尼加拉瓜"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "荷蘭"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "挪威"
 
-#: ../../english/template/debian/countries.wml:326
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "新西蘭"
 
-#: ../../english/template/debian/countries.wml:329
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "巴拿馬"
 
-#: ../../english/template/debian/countries.wml:332
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "秘魯"
 
-#: ../../english/template/debian/countries.wml:335
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "法屬玻里尼西亞"
 
-#: ../../english/template/debian/countries.wml:338
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "菲律賓"
 
-#: ../../english/template/debian/countries.wml:341
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "巴基斯坦"
 
-#: ../../english/template/debian/countries.wml:344
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "波蘭"
 
-#: ../../english/template/debian/countries.wml:347
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../../english/template/debian/countries.wml:350
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "羅馬尼亞"
 
-#: ../../english/template/debian/countries.wml:353
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "塞爾維亞"
 
-#: ../../english/template/debian/countries.wml:356
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "俄國"
 
-#: ../../english/template/debian/countries.wml:359
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "沙地阿拉伯"
 
-#: ../../english/template/debian/countries.wml:362
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../../english/template/debian/countries.wml:365
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "新加坡"
 
-#: ../../english/template/debian/countries.wml:368
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "斯洛文尼亞"
 
-#: ../../english/template/debian/countries.wml:371
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "斯洛伐克"
 
-#: ../../english/template/debian/countries.wml:374
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "薩爾瓦多"
 
-#: ../../english/template/debian/countries.wml:377
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "泰國"
 
-#: ../../english/template/debian/countries.wml:380
+#: ../../english/template/debian/countries.wml:381
 msgid "Tajikistan"
 msgstr "塔吉克斯坦"
 
-#: ../../english/template/debian/countries.wml:383
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "突尼西亞"
 
-#: ../../english/template/debian/countries.wml:386
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "土耳其"
 
-#: ../../english/template/debian/countries.wml:389
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "台灣"
 
-#: ../../english/template/debian/countries.wml:392
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "烏克蘭"
 
-#: ../../english/template/debian/countries.wml:395
-msgid "United Kingdom"
-msgstr "英國"
-
-#: ../../english/template/debian/countries.wml:398
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "美國"
 
-#: ../../english/template/debian/countries.wml:401
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "烏拉圭"
 
-#: ../../english/template/debian/countries.wml:404
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "烏茲別克"
 
-#: ../../english/template/debian/countries.wml:407
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "委內瑞拉"
 
-#: ../../english/template/debian/countries.wml:410
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "越南"
 
-#: ../../english/template/debian/countries.wml:413
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "瓦努阿图"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "南非"
 
 #~ msgid "Yugoslavia"
 #~ msgstr "南斯拉夫"
+
+#~ msgid "Great Britain"
+#~ msgstr "英國"
diff --git a/croatian/po/countries.hr.po b/croatian/po/countries.hr.po
index 0d2a5e0a733..baea91cd0dd 100644
--- a/croatian/po/countries.hr.po
+++ b/croatian/po/countries.hr.po
@@ -9,402 +9,417 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Ujedinjeni Arapski Emirati"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albanija"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Armenija"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Austrija"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Australija"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Bosna i Hercegovina"
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Bangladeš"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bugarska"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "Bahami"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Bjelorusija"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Švicarska"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Čile"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Kina"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Kolumbija"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "Češka"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Njemačka"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Danska"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "Dominikanska Republika"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "Ekvador"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Estonija"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Egipat"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Španjolska"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finska"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Farski otoci"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Francuska"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
 msgstr "Velika Britanija"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "Gruzija"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Grenland"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Grčka"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Gvatemala"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Hrvatska"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Mađarska"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonezija"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Irska"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "Indija"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Island"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Italija"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Jordan"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Japan"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Kenija"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Koreja"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Kuvajt"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "Kazahstan"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Šri Lanka"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Litva"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Latvija"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Maroko"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "Crna Gora"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:300
+#, fuzzy
+#| msgid "Dominican Republic"
+msgid "Macedonia, Republic of"
+msgstr "Dominikanska Republika"
+
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malezija"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "Nova Kaledonija"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nikaragva"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Nizozemska"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Norveška"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Novi Zeland"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "Francuska Polinezija"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Filipini"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Poljska"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Rumunjska"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "Srbija"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Rusija"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Saudijska Arabija"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Švedska"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Slovenija"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Slovačka"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "Salvador"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Tajland"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:381
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Tajikistan"
+msgstr "Pakistan"
+
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Tunis"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Turska"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ukrajina"
 
-#: ../../english/template/debian/countries.wml:305
-msgid "United Kingdom"
-msgstr "Velika Britanija"
-
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Sjedinjene Države"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Urugvaj"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Venecuela"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Vijetnam"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Južna Afrika"
+
+#~ msgid "Great Britain"
+#~ msgstr "Velika Britanija"
diff --git a/czech/po/countries.cs.po b/czech/po/countries.cs.po
index 1abe0026098..676dd54004b 100644
--- a/czech/po/countries.cs.po
+++ b/czech/po/countries.cs.po
@@ -14,402 +14,417 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Spojené arabské emiráty"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albánie"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Arménie"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Rakousko"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Austrálie"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Bosna a Hercegovina"
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Bangladéš"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Belgie"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bulharsko"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brazílie"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "Bahamy"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Bělorusko"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Švýcarsko"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Chile"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Čína"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Kolumbie"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "Česká republika"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Německo"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Dánsko"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "Dominikánská republika"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "Ekvádor"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Estonsko"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Egypt"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Španělsko"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Etiopie"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finsko"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Faerské ostrovy"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Francie"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
-msgstr "Velká Británie"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
+msgstr "Spojené království"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "Gruzie"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Grónsko"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Řecko"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Chorvatsko"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Maďarsko"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonésie"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Irsko"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "Indie"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Island"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Itálie"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Jordánsko"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Japonsko"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Keňa"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Korea"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Kuvajt"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "Kazachstán"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Srí Lanka"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Litva"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Lucembursko"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Lotyšsko"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Maroko"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "Černá Hora"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:300
+#, fuzzy
+#| msgid "Dominican Republic"
+msgid "Macedonia, Republic of"
+msgstr "Dominikánská republika"
+
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Mexiko"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malajsie"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "Nová Kaledonie"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Nizozemí"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Norsko"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Nový Zéland"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "Francouzská Polynésie"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Filipíny"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Pákistán"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Polsko"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugalsko"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Rumunsko"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "Srbsko"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Rusko"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Saudská Arábie"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Švédsko"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Slovinsko"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Slovensko"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "Salvador"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Thajsko"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:381
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Tajikistan"
+msgstr "Pákistán"
+
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Tunisko"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Turecko"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Tchai-wan"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ukrajina"
 
-#: ../../english/template/debian/countries.wml:305
-msgid "United Kingdom"
-msgstr "Spojené království"
-
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Spojené státy"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "Uzbekistán"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Jižní Afrika"
+
+#~ msgid "Great Britain"
+#~ msgstr "Velká Británie"
diff --git a/danish/po/countries.da.po b/danish/po/countries.da.po
index 8dd8b44f484..7a0513dc54d 100644
--- a/danish/po/countries.da.po
+++ b/danish/po/countries.da.po
@@ -9,413 +9,416 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Forende Arabiske Emirater"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albanien"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Armenien"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Østrig"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Australien"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnien og Herzegovina"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Belgien"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bulgarien"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brasilien"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Hviderusland"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Canada"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Svejts"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Chile"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Kina"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "Tjekkiet"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Danmark"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "Den Dominikanske Republik"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr "Algeriet"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Estland"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Ægypten"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Spanien"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Etiopien"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finland"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Færøerne"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Frankrig"
 
-#: ../../english/template/debian/countries.wml:206
-msgid "Great Britain"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
 msgstr "Storbritannien"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "Georgien"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Grønland"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Grækenland"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Kroatien"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonesien"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr "Iran"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Irland"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Israel"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "Indien"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Island"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Italien"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Jordan"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Japan"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Korea"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Letland"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Marokko"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr "Moldova"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "Montenegro"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:300
 msgid "Macedonia, Republic of"
 msgstr "Makedonien, Republikken"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr "Mongoliet"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Mexico"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "Ny Kaledonien"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Holland"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Norge"
 
-#: ../../english/template/debian/countries.wml:326
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: ../../english/template/debian/countries.wml:329
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:332
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:335
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "Fransk Polynesien"
 
-#: ../../english/template/debian/countries.wml:338
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Filippinerne"
 
-#: ../../english/template/debian/countries.wml:341
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:344
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Polen"
 
-#: ../../english/template/debian/countries.wml:347
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:350
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Romænien"
 
-#: ../../english/template/debian/countries.wml:353
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "Serbien"
 
-#: ../../english/template/debian/countries.wml:356
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Rusland"
 
-#: ../../english/template/debian/countries.wml:359
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabien"
 
-#: ../../english/template/debian/countries.wml:362
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../../english/template/debian/countries.wml:365
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../../english/template/debian/countries.wml:368
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Slovenien"
 
-#: ../../english/template/debian/countries.wml:371
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Slovakiet"
 
-#: ../../english/template/debian/countries.wml:374
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:377
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../../english/template/debian/countries.wml:380
+#: ../../english/template/debian/countries.wml:381
 msgid "Tajikistan"
 msgstr "Tadsjikistan"
 
-#: ../../english/template/debian/countries.wml:383
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Tunesien"
 
-#: ../../english/template/debian/countries.wml:386
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Tyrkiet"
 
-#: ../../english/template/debian/countries.wml:389
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:392
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: ../../english/template/debian/countries.wml:395
-msgid "United Kingdom"
-msgstr "Storbritannien"
-
-#: ../../english/template/debian/countries.wml:398
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "USA"
 
-#: ../../english/template/debian/countries.wml:401
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:404
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: ../../english/template/debian/countries.wml:407
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:410
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:413
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Sydafrika"
 
 #~ msgid "Yugoslavia"
 #~ msgstr "Jugoslavien"
+
+#~ msgid "Great Britain"
+#~ msgstr "Storbritannien"
diff --git a/dutch/po/countries.nl.po b/dutch/po/countries.nl.po
index f71e51dd676..4de3218058f 100644
--- a/dutch/po/countries.nl.po
+++ b/dutch/po/countries.nl.po
@@ -16,410 +16,413 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Verenigde Arabische Emiraten"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albanië"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Armenië"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentinië"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Oostenrijk"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Australië"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnië en Herzegovina"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "België"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bulgarije"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brazilië"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Wit-Rusland"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Canada"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Zwitserland"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Chili"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "China"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "Tjechië"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Duitsland"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Denemarken"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "Dominicaanse Republiek"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr "Algerije"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "Equador"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Estland"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Egypte"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Spanje"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Ethiopië"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finland"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Faeröereilanden"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Frankrijk"
 
-#: ../../english/template/debian/countries.wml:206
-msgid "Great Britain"
-msgstr "Groot-Brittannië"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
+msgstr "Verenigd Koninkrijk"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "Georgië"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Groenland"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Griekenland"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Kroatië"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Hongarije"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonesië"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr "Iran"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Ierland"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Israël"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "India"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "IJsland"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Italië"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Jordanië"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Japan"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Kenia"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Korea"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Koeweit"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "Kazachstan"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Litouwen"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Letland"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Marokko"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr "Moldavië"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "Montenegro"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:300
 msgid "Macedonia, Republic of"
 msgstr "Macedonië"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr "Mongolië"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Mexico"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Maleisië"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "Nieuw Caledonië"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Noorwegen"
 
-#: ../../english/template/debian/countries.wml:326
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Nieuw-Zeeland"
 
-#: ../../english/template/debian/countries.wml:329
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:332
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:335
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "Frans Polynesië"
 
-#: ../../english/template/debian/countries.wml:338
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Filipijnen"
 
-#: ../../english/template/debian/countries.wml:341
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:344
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Polen"
 
-#: ../../english/template/debian/countries.wml:347
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:350
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Roemenië"
 
-#: ../../english/template/debian/countries.wml:353
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "Servië"
 
-#: ../../english/template/debian/countries.wml:356
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Rusland"
 
-#: ../../english/template/debian/countries.wml:359
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Saoedi-Arabië"
 
-#: ../../english/template/debian/countries.wml:362
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Zweden"
 
-#: ../../english/template/debian/countries.wml:365
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../../english/template/debian/countries.wml:368
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Slovenië"
 
-#: ../../english/template/debian/countries.wml:371
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Slovakije"
 
-#: ../../english/template/debian/countries.wml:374
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:377
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../../english/template/debian/countries.wml:380
+#: ../../english/template/debian/countries.wml:381
 msgid "Tajikistan"
 msgstr "Tadzjikistan"
 
-#: ../../english/template/debian/countries.wml:383
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Tunesië"
 
-#: ../../english/template/debian/countries.wml:386
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Turkije"
 
-#: ../../english/template/debian/countries.wml:389
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:392
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Oekraïne"
 
-#: ../../english/template/debian/countries.wml:395
-msgid "United Kingdom"
-msgstr "Verenigd Koninkrijk"
-
-#: ../../english/template/debian/countries.wml:398
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Verenigde Staten"
 
-#: ../../english/template/debian/countries.wml:401
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:404
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "Oezbekistan"
 
-#: ../../english/template/debian/countries.wml:407
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:410
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:413
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Zuid-Afrika"
+
+#~ msgid "Great Britain"
+#~ msgstr "Groot-Brittannië"
diff --git a/english/po/countries.pot b/english/po/countries.pot
index 3d5ee6f66a1..6e8fe807476 100644
--- a/english/po/countries.pot
+++ b/english/po/countries.pot
@@ -404,6 +404,10 @@ msgid "Vietnam"
 msgstr ""
 
 #: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr ""
 
diff --git a/esperanto/po/countries.eo.po b/esperanto/po/countries.eo.po
index 9b5a73431bb..51466ecab4e 100644
--- a/esperanto/po/countries.eo.po
+++ b/esperanto/po/countries.eo.po
@@ -4,416 +4,423 @@ 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"
-"Language: \n"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 #, fuzzy
 #| msgid "United States"
 msgid "United Arab Emirates"
 msgstr "Usono"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albanio"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Armenio"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentino"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "A�strio"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "A�stralio"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Belgio"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bulgario"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brazilo"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Bielorusia"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Kanado"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "�ilio"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Germanio"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Danio"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Hispanio"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finlando"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Francio"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
 msgstr "Britio"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 #, fuzzy
 msgid "Grenada"
 msgstr "Kanado"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Grekio"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hongkongo"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Hungario"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Israelo"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "Hindio"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Islando"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Italio"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Japanio"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Koreio"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagaskaro"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:300
 msgid "Macedonia, Republic of"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Nederlando"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Norvegio"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Novzelando"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:330
 #, fuzzy
 msgid "Panama"
 msgstr "Kanado"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Polando"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugalio"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Rusio"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Svedio"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:381
+msgid "Tajikistan"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Turkio"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Tajvano"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:393
 #, fuzzy
 msgid "Ukraine"
 msgstr "Francio"
 
-#: ../../english/template/debian/countries.wml:308
-msgid "United Kingdom"
-msgstr "Britio"
-
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Usono"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:326
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Sudafriko"
+
+#~ msgid "Great Britain"
+#~ msgstr "Britio"
diff --git a/finnish/po/countries.fi.po b/finnish/po/countries.fi.po
index de7a1fde9fa..a23260294af 100644
--- a/finnish/po/countries.fi.po
+++ b/finnish/po/countries.fi.po
@@ -9,409 +9,416 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Arabiemiirikunnat"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albania"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentiina"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Itävalta"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Australia"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia ja Hertsegovina"
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brasilia"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "Bahama"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Valkovenäjä"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Sveitsi"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Chile"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Kiina"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "Tsekki"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Saksa"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Tanska"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "Dominikaaninen tasavalta"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr "Algeria"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Viro"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Egypti"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Espanja"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Suomi"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Färsaaret"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Ranska"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
 msgstr "Iso-Britannia"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "Georgia"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Grönlanti"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Kreikka"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Kroatia"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Unkari"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr "Iran"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Irlanti"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Israel"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "Intia"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Islanti"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Italia"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Jordania"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Japani"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Kenia"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Korea"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "Kazakstan"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Liettua"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Latvia"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Marokko"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr "Moldova"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "Montenegro"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:300
 msgid "Macedonia, Republic of"
 msgstr "Makedonian tasavalta"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malesia"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "Uusi-Kaledonia"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Alankomaat"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Norja"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Uusi-Seelanti"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "Ranskan Polynesia"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Filippiinit"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Puola"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugali"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Romania"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "Serbia"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Venäjä"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabia"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Ruotsi"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Thaimaa"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:381
+msgid "Tajikistan"
+msgstr "Tadžikistan"
+
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Turkki"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../../english/template/debian/countries.wml:308
-msgid "United Kingdom"
-msgstr "Iso-Britannia"
-
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Yhdysvallat"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:326
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Etelä-Afrikka"
 
 #~ msgid "Yugoslavia"
 #~ msgstr "Jugoslavia"
+
+#~ msgid "Great Britain"
+#~ msgstr "Iso-Britannia"
diff --git a/french/po/countries.fr.po b/french/po/countries.fr.po
index f8b16c6fbfe..80e7a99fafb 100644
--- a/french/po/countries.fr.po
+++ b/french/po/countries.fr.po
@@ -22,410 +22,413 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Émirats arabes unis"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albanie"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Arménie"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentine"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Autriche"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Australie"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnie-Herzégovine"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Belgique"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bulgarie"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brésil"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Biélorussie"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Canada"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Suisse"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Chili"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Chine"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Colombie"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "République tchèque"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Allemagne"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Danemark"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "République dominicaine"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr "Algérie"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "Équateur"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Estonie"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Égypte"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Espagne"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Éthiopie"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finlande"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Îles Féroé"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "France"
 
-#: ../../english/template/debian/countries.wml:206
-msgid "Great Britain"
-msgstr "Grande-Bretagne"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
+msgstr "Royaume-Uni"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Grenade"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "Géorgie"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Groenland"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Grèce"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Croatie"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Hongrie"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonésie"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr "Iran"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Irlande"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Israël"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "Inde"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Islande"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Italie"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Jordanie"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Japon"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Corée"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Koweït"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Lituanie"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Lettonie"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Maroc"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr "Moldavie"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "Monténégro"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:300
 msgid "Macedonia, Republic of"
 msgstr "Macédoine, République de"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr "Mongolie"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "Malte"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Mexique"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malaisie"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "Nouvelle-Calédonie"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Pays-Bas"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Norvège"
 
-#: ../../english/template/debian/countries.wml:326
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Nouvelle-Zélande"
 
-#: ../../english/template/debian/countries.wml:329
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:332
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Pérou"
 
-#: ../../english/template/debian/countries.wml:335
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "Polynésie française"
 
-#: ../../english/template/debian/countries.wml:338
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Philippines"
 
-#: ../../english/template/debian/countries.wml:341
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:344
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Pologne"
 
-#: ../../english/template/debian/countries.wml:347
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:350
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Roumanie"
 
-#: ../../english/template/debian/countries.wml:353
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "Serbie"
 
-#: ../../english/template/debian/countries.wml:356
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Russie"
 
-#: ../../english/template/debian/countries.wml:359
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Arabie saoudite"
 
-#: ../../english/template/debian/countries.wml:362
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Suède"
 
-#: ../../english/template/debian/countries.wml:365
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Singapour"
 
-#: ../../english/template/debian/countries.wml:368
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Slovénie"
 
-#: ../../english/template/debian/countries.wml:371
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Slovaquie"
 
-#: ../../english/template/debian/countries.wml:374
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "Salvador"
 
-#: ../../english/template/debian/countries.wml:377
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Thaïlande"
 
-#: ../../english/template/debian/countries.wml:380
+#: ../../english/template/debian/countries.wml:381
 msgid "Tajikistan"
 msgstr "Tadjikistan"
 
-#: ../../english/template/debian/countries.wml:383
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Tunisie"
 
-#: ../../english/template/debian/countries.wml:386
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Turquie"
 
-#: ../../english/template/debian/countries.wml:389
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Taïwan"
 
-#: ../../english/template/debian/countries.wml:392
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ukraine"
 
-#: ../../english/template/debian/countries.wml:395
-msgid "United Kingdom"
-msgstr "Royaume-Uni"
-
-#: ../../english/template/debian/countries.wml:398
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "États-Unis"
 
-#: ../../english/template/debian/countries.wml:401
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:404
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "Ouzbékistan"
 
-#: ../../english/template/debian/countries.wml:407
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:410
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Viêtnam"
 
-#: ../../english/template/debian/countries.wml:413
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Afrique du Sud"
+
+#~ msgid "Great Britain"
+#~ msgstr "Grande-Bretagne"
diff --git a/galician/po/countries.gl.po b/galician/po/countries.gl.po
index bd1c917b2e1..bf6e3b95221 100644
--- a/galician/po/countries.gl.po
+++ b/galician/po/countries.gl.po
@@ -1,422 +1,424 @@
 # Jorge Barreiro <yortx.barry@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: Jorge Barreiro <yortx.barry@gmail.com>\n"
-"PO-Revision-Date: 2012-11-07 00:40+0100\n"
 "Project-Id-Version: \n"
+"PO-Revision-Date: 2012-11-07 00:40+0100\n"
+"Last-Translator: Jorge Barreiro <yortx.barry@gmail.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
-"X-Generator: Lokalize 1.0\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Emiratos Árabes Unidos"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albania"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Arxentina"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Austria"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Australia"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia e Hercegovina"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Bélxica"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Bielorrusia"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Canadá"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Suíza"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Chile"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "China"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Alemaña"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr "Alxeria"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Estonia"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Exipto"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "España"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Etiopía"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Illas Feroe"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Francia"
 
-#: ../../english/template/debian/countries.wml:206
-msgid "Great Britain"
-msgstr "Gran Bretaña"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
+msgstr "Reino Unido"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Granada"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "Xeorxia"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Grenlandia"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Croacia"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Hungría"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr "Irán"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Israel"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "A India"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Islandia"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Italia"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Xordania"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Xapón"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Quenia"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Corea"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Kuvait"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "Kazakhstán"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Letonia"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Marrocos"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr "Moldavia"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "Montenegro"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:300
 msgid "Macedonia, Republic of"
 msgstr "Macedonia, República de"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "México"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malasia"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "Nova Caledonia"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Países Baixos"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../../english/template/debian/countries.wml:326
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Nova Celandia"
 
-#: ../../english/template/debian/countries.wml:329
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panamá"
 
-#: ../../english/template/debian/countries.wml:332
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Perú"
 
-#: ../../english/template/debian/countries.wml:335
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "Polinesia Francesa"
 
-#: ../../english/template/debian/countries.wml:338
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: ../../english/template/debian/countries.wml:341
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Paquistán"
 
-#: ../../english/template/debian/countries.wml:344
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../../english/template/debian/countries.wml:347
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:350
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Romanía"
 
-#: ../../english/template/debian/countries.wml:353
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "Serbia"
 
-#: ../../english/template/debian/countries.wml:356
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../../english/template/debian/countries.wml:359
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Arabia Saudí"
 
-#: ../../english/template/debian/countries.wml:362
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Suecia"
 
-#: ../../english/template/debian/countries.wml:365
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../../english/template/debian/countries.wml:368
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Eslovenia"
 
-#: ../../english/template/debian/countries.wml:371
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Eslovaquia"
 
-#: ../../english/template/debian/countries.wml:374
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "O Salvador"
 
-#: ../../english/template/debian/countries.wml:377
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Tailandia"
 
-#: ../../english/template/debian/countries.wml:380
+#: ../../english/template/debian/countries.wml:381
 msgid "Tajikistan"
 msgstr "Taxiquistán"
 
-#: ../../english/template/debian/countries.wml:383
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Tunicia"
 
-#: ../../english/template/debian/countries.wml:386
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Turquía"
 
-#: ../../english/template/debian/countries.wml:389
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Taiwán"
 
-#: ../../english/template/debian/countries.wml:392
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ucraína"
 
-#: ../../english/template/debian/countries.wml:395
-msgid "United Kingdom"
-msgstr "Reino Unido"
-
-#: ../../english/template/debian/countries.wml:398
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Estados Unidos de América"
 
-#: ../../english/template/debian/countries.wml:401
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: ../../english/template/debian/countries.wml:404
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "Uzbequistán"
 
-#: ../../english/template/debian/countries.wml:407
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:410
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:413
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatú"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "África do Sur"
 
-
+#~ msgid "Great Britain"
+#~ msgstr "Gran Bretaña"
diff --git a/german/po/countries.de.po b/german/po/countries.de.po
index d29eac55b8d..85b9f64b124 100644
--- a/german/po/countries.de.po
+++ b/german/po/countries.de.po
@@ -418,6 +418,10 @@ msgid "Vietnam"
 msgstr "Vietnam"
 
 #: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Südafrika"
 
diff --git a/greek/po/countries.el.po b/greek/po/countries.el.po
index b751a25532e..bd0eab48bdb 100644
--- a/greek/po/countries.el.po
+++ b/greek/po/countries.el.po
@@ -9,408 +9,423 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Ην. Αραβικά Εμιράτα"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Αλβανία"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Αρμενία"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Αργεντινή"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Αυστρία"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Αυστραλία"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Βοσνία και Ερζεγοβίνη"
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Μπαγκλαντές"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Βέλγιο"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Βουλγαρία"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Βραζιλία"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Λευκορωσία"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Καναδάς"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Ελβετία"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Χιλή"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Κίνα"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Κολομβία"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Κόστα Ρίκα"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "Τσεχική Δημοκρατία"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Γερμανία"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Δανία"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "Δομινικανή Δημοκρατία"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Εσθονία"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Αίγυπτος"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Ισπανία"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Εθιοπία"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Φινλανδία"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Νήσοι Φερόες"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Γαλλία"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
-msgstr "Μ. Βρετανία"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
+msgstr "Ην. Βασίλειο"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Γρενάδα"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Γροιλανδία"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Ελλάδα"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Γουατεμάλα"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Χονκ Κονκ"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Ονδούρες"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Κροατία"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Ουγγαρία"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Ινδονησία"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Ιρλανδία"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Ισραήλ"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "Ινδία"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Ισλανδία"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Ιταλία"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Ιορδανία"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Ιαπωνία"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Κένυα"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Κορέα"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Κουβέιτ"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 #, fuzzy
 #| msgid "Pakistan"
 msgid "Kazakhstan"
 msgstr "Πακιστάν"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Σρι-Λάνκα"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Λιθουανία"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Λουξεμβούργο"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Λετονία"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Μαρόκο"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 #, fuzzy
 #| msgid "Serbia and Montenegro"
 msgid "Montenegro"
 msgstr "Σερβία και Μοντενέγκρο"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Μαδαγασκάρη"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:300
+#, fuzzy
+#| msgid "Dominican Republic"
+msgid "Macedonia, Republic of"
+msgstr "Δομινικανή Δημοκρατία"
+
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Μεξικό"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Μαλαισία"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Νικαράγουα"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Ολλανδία"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Νορβηγία"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Νέα Ζηλανδία"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Παναμάς"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Περού"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Φιλιππίνες"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Πακιστάν"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Πολωνία"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Πορτογαλία"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Ρουμανία"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Ρωσία"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Σαουδική Αραβία"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Σουηδία"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Σιγκαπούρη"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Σλοβενία"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Σλοβακία"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "Ελ Σαλβαδόρ"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Ταϊλάνδη"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:381
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Tajikistan"
+msgstr "Πακιστάν"
+
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Τυνισία"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Τουρκία"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Ταΐβάν"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ουκρανία"
 
-#: ../../english/template/debian/countries.wml:305
-msgid "United Kingdom"
-msgstr "Ην. Βασίλειο"
-
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Ην. Πολιτείες"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Ουρουγουάη"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:402
 #, fuzzy
 #| msgid "Pakistan"
 msgid "Uzbekistan"
 msgstr "Πακιστάν"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Βενεζουέλα"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Βιετνάμ"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Νότια Αφρική"
+
+#~ msgid "Great Britain"
+#~ msgstr "Μ. Βρετανία"
diff --git a/hebrew/po/countries.he.po b/hebrew/po/countries.he.po
index 172de8fbc06..e15c0d751a1 100644
--- a/hebrew/po/countries.he.po
+++ b/hebrew/po/countries.he.po
@@ -9,402 +9,417 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "איחוד הנסיכויות הערביות"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "אלבניה"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "ארמניה"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "ארגנטינה"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "אוסטריה"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "אוסטרליה"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "בוסניה הרצגובינה"
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "בנגלדש"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "בלגיה"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "בולגריה"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "ברזיל"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "איי הבהאמאס"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "בלארוס"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "קנדה"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "שוויצריה"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "צ'ילה"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "סין"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "קולומביה"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "קוסטה ריקה"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "צ'כיה"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "גרמניה"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "דנמרק"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "הרפוליקה הדומיניקית"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "אקוודור"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "אסטוניה"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "מצרים"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "ספרד"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "אתיופיה"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "פינלנד"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "צרפת"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
 msgstr "בריטניה"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "גרנאדה"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "גיאורגיה"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "גרינלנד"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "יוון"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "גוואטמלה"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "הונג קונג"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "הונדורס"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "קרואטיה"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "הונגריה"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "אינדונזיה"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "אירלנד"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "ישראל"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "הודו"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "איסלנד"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "איטליה"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "ירדן"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "יפן"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "קניה"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "קוריאה"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "כוויית"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "קזחסטאן"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "סרי לנקה"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "ליטא"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "לוקסמבורג"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "לטביה"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "מרוקו"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "מונטנגרו"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "מדגסקר"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:300
+#, fuzzy
+#| msgid "Dominican Republic"
+msgid "Macedonia, Republic of"
+msgstr "הרפוליקה הדומיניקית"
+
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "מלטה"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "מקיסקו"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "מלזיה"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "ניקרגוואה"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "הולנד"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "נורווגיה"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "ניו זילנד"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "פנמה"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "פרו"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "פיליפינים"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "פקיסטאן"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "פולין"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "פורטוגל"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "רומניה"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "סרביה"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "רוסיה"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "ערב הסעודית"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "שוודיה"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "סינגפור"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "סלובניה"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "סלובקיה"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "אל סלוודור"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "תאילנד"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:381
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Tajikistan"
+msgstr "פקיסטאן"
+
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "תוניס"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "תורכיה"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "טאיואן"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "אוקראינה"
 
-#: ../../english/template/debian/countries.wml:305
-msgid "United Kingdom"
-msgstr "בריטניה"
-
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "ארצות הברית"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "אורוגוואי"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "אוזבקיסטן"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "וונצואלה"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "ויאטנם"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "דרום אפריקה"
+
+#~ msgid "Great Britain"
+#~ msgstr "בריטניה"
diff --git a/hungarian/po/countries.hu.po b/hungarian/po/countries.hu.po
index a91597bdfdd..d713df4c4a0 100644
--- a/hungarian/po/countries.hu.po
+++ b/hungarian/po/countries.hu.po
@@ -9,405 +9,416 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Egyesült Arab Emirátusok"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albánia"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Örményország"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentína"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Ausztria"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Ausztrália"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Bosznia-Hercegovina"
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Banglades"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Belgium"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bulgária"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brazília"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "Bahamák"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Fehéroroszország"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Svájc"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Chile"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Kína"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "Csehország"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Németország"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Dánia"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "Dominikai Köztársaság"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr "Algéria"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Észtország"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Egyiptom"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Spanyolország"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Etiópia"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finnország"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Feröer-szigetek"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Franciaország"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
 msgstr "Nagy-Britannia"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Granada"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "Grúzia"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Grönland"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Görögország"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Gvatemala"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Horvátország"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Magyarország"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonézia"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr "Irán"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Írország"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "India"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Izland"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Olaszország"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Jordánia"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Japán"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Korea"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Kuvait"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "Kazahsztán"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Litvánia"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Lettország"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Marokkó"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr "Moldova"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "Montenegró"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagaszkár"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:300
+msgid "Macedonia, Republic of"
+msgstr "Macedón Köztársaság"
+
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr "Mongólia"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "Málta"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Mexikó"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malajzia"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "Új Kaledónia"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Hollandia"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Norvégia"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Új-Zéland"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "Francia Polinézia"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Fülöp-szigetek"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Pakisztán"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Lengyelország"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugália"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Románia"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "Szerbia"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Oroszország"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Szaud-Arábia"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Svédország"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Szingapúr"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Szlovénia"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Szlovákia"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Thaiföld"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:381
+msgid "Tajikistan"
+msgstr "Tádzsikisztán"
+
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Tunézia"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Törökország"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ukrajna"
 
-#: ../../english/template/debian/countries.wml:305
-msgid "United Kingdom"
-msgstr "Nagy-Britannia"
-
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Egyesült Államok"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "Üzbegisztán"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Vietnám"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Dél-Afrika"
 
 #~ msgid "Yugoslavia"
 #~ msgstr "Jugoszlávia"
+
+#~ msgid "Great Britain"
+#~ msgstr "Nagy-Britannia"
diff --git a/indonesian/po/countries.id.po b/indonesian/po/countries.id.po
index a69ae1d5d24..93fec6e90dc 100644
--- a/indonesian/po/countries.id.po
+++ b/indonesian/po/countries.id.po
@@ -12,414 +12,423 @@ msgstr ""
 "X-Poedit-Language: Indonesian\n"
 "X-Poedit-Country: INDONESIA\n"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Amerika Serikat"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albania"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Austria"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Australia"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia Herzegovina"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Belarusia"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Swiss"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Cili"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Cina"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Kolombia"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "Republik Ceko"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Jerman"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Denmark"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "Republik Dominika"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Estonia"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Mesir"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Spanyol"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Ethiopia"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Kepulauan Faroe"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Perancis"
 
-#: ../../english/template/debian/countries.wml:206
-msgid "Great Britain"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
 msgstr "Inggris"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Granada"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Greenland"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Yunani"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Kroasia"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Hongaria"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Irlandia"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Israel"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "India"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Islandia"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Italia"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Jordania"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Jepang"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Korea"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:273
 #, fuzzy
 #| msgid "Pakistan"
 msgid "Kazakhstan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Latvia"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Maroko"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:294
 #, fuzzy
 #| msgid "Serbia and Montenegro"
 msgid "Montenegro"
 msgstr "Serbia Montenegro"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:300
 #, fuzzy
 #| msgid "Dominican Republic"
 msgid "Macedonia, Republic of"
 msgstr "Republik Dominika"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Meksiko"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Belanda"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Norwegia"
 
-#: ../../english/template/debian/countries.wml:326
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Selandia Baru"
 
-#: ../../english/template/debian/countries.wml:329
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:332
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:335
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:338
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Filipina"
 
-#: ../../english/template/debian/countries.wml:341
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:344
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Polandia"
 
-#: ../../english/template/debian/countries.wml:347
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:350
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Rumania"
 
-#: ../../english/template/debian/countries.wml:353
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:356
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../../english/template/debian/countries.wml:359
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Arab Saudi"
 
-#: ../../english/template/debian/countries.wml:362
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Swedia"
 
-#: ../../english/template/debian/countries.wml:365
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Singapura"
 
-#: ../../english/template/debian/countries.wml:368
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../../english/template/debian/countries.wml:371
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Slowakia"
 
-#: ../../english/template/debian/countries.wml:374
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:377
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../../english/template/debian/countries.wml:380
+#: ../../english/template/debian/countries.wml:381
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Tajikistan"
+msgstr "Pakistan"
+
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../../english/template/debian/countries.wml:383
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Turki"
 
-#: ../../english/template/debian/countries.wml:386
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Thailand"
 
-#: ../../english/template/debian/countries.wml:389
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../../english/template/debian/countries.wml:392
-msgid "United Kingdom"
-msgstr "Inggris"
-
-#: ../../english/template/debian/countries.wml:395
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Amerika Serikat"
 
-#: ../../english/template/debian/countries.wml:398
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:401
+#: ../../english/template/debian/countries.wml:402
 #, fuzzy
 #| msgid "Pakistan"
 msgid "Uzbekistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:404
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:407
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:410
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Afrika Selatan"
+
+#~ msgid "Great Britain"
+#~ msgstr "Inggris"
diff --git a/italian/po/countries.it.po b/italian/po/countries.it.po
index 8cf3485ebaa..b80fd417c6e 100644
--- a/italian/po/countries.it.po
+++ b/italian/po/countries.it.po
@@ -9,415 +9,418 @@ msgstr ""
 "PO-Revision-Date: 2012-03-03 11:24+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: debian-l10n-italian <debian-l10n-italian@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Emirati Arabi Uniti"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albania"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Austria"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Australia"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia Erzegovina"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Belgio"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brasile"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Bielorussia"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Canada"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Svizzera"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Cile"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Cina"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "Repubblica Ceca"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Germania"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Danimarca"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "Repubblica Dominicana"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr "Algeria"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Estonia"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Egitto"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Spagna"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Isole Faroe"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Francia"
 
-#: ../../english/template/debian/countries.wml:206
-msgid "Great Britain"
-msgstr "Gran Bretagna"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
+msgstr "Regno Unito"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "Georgia"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Groenlandia"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Croazia"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Ungheria"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr "Iran"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Israele"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "India"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Islanda"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Italia"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Giordania"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Giappone"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Corea"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "Kazakistan"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Lussemburgo"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Lettonia"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Marocco"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr "Moldavia"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "Montenegro"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:300
 msgid "Macedonia, Republic of"
 msgstr "Macedonia, Repubblica di"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Messico"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malesia"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "Nuova Caledonia"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Paesi Bassi"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Norvegia"
 
-#: ../../english/template/debian/countries.wml:326
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Nuova Zelanda"
 
-#: ../../english/template/debian/countries.wml:329
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:332
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Perù"
 
-#: ../../english/template/debian/countries.wml:335
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "Polinesia Francese"
 
-#: ../../english/template/debian/countries.wml:338
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Filippine"
 
-#: ../../english/template/debian/countries.wml:341
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:344
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../../english/template/debian/countries.wml:347
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portogallo"
 
-#: ../../english/template/debian/countries.wml:350
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Romania"
 
-#: ../../english/template/debian/countries.wml:353
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "Serbia"
 
-#: ../../english/template/debian/countries.wml:356
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Russia"
 
-#: ../../english/template/debian/countries.wml:359
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Arabia Saudita"
 
-#: ../../english/template/debian/countries.wml:362
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Svezia"
 
-#: ../../english/template/debian/countries.wml:365
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../../english/template/debian/countries.wml:368
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../../english/template/debian/countries.wml:371
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Slovacchia"
 
-#: ../../english/template/debian/countries.wml:374
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:377
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Tailandia"
 
-#: ../../english/template/debian/countries.wml:380
+#: ../../english/template/debian/countries.wml:381
 msgid "Tajikistan"
 msgstr "Tagikistan"
 
-#: ../../english/template/debian/countries.wml:383
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../../english/template/debian/countries.wml:386
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Turchia"
 
-#: ../../english/template/debian/countries.wml:389
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:392
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ucraina"
 
-#: ../../english/template/debian/countries.wml:395
-msgid "United Kingdom"
-msgstr "Regno Unito"
-
-#: ../../english/template/debian/countries.wml:398
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Stati Uniti"
 
-#: ../../english/template/debian/countries.wml:401
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:404
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../../english/template/debian/countries.wml:407
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:410
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:413
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Sud Africa"
+
+#~ msgid "Great Britain"
+#~ msgstr "Gran Bretagna"
diff --git a/japanese/po/countries.ja.po b/japanese/po/countries.ja.po
index a895a775393..1f2eae7c753 100644
--- a/japanese/po/countries.ja.po
+++ b/japanese/po/countries.ja.po
@@ -5,10 +5,10 @@ msgstr ""
 "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"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 
 #: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
@@ -411,6 +411,10 @@ msgid "Vietnam"
 msgstr "ベトナム"
 
 #: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "バヌアツ"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "南アフリカ"
 
diff --git a/korean/po/countries.ko.po b/korean/po/countries.ko.po
index 355b69211f2..b17c4b86537 100644
--- a/korean/po/countries.ko.po
+++ b/korean/po/countries.ko.po
@@ -13,407 +13,422 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "아랍 에미리트 연방"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "알바니아"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "아르메니아"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "아르헨티나"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "오스트리아"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "오스트레일리아"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "보스니아 헤르체코비나"
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "방글라데시"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "벨기에"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "불가리아"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "브라질"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "바하마"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "벨로루시"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "캐나다"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "스위스"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "칠레"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "중국"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "콜롬비아"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "코스타리카"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "체코 공화국"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "독일"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "덴마크"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "도미니카 공화국"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "에콰도르"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "에스토니아"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "이집트"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "스페인"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "에티오피아"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "핀란드"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "페로스 제도"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "프랑스"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
 msgstr "영국"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "그레나다"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "그린란드"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "그리스"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "과테말라"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "홍콩"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "온두라스"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "크로아티아"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "헝가리"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "인도네시아"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "아일랜드"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "이스라엘"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "인도"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "아이슬란드"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "이탈리아"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "요르단"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "일본"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "케냐"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "대한민국"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "쿠웨이트"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "카자흐스탄"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "스리랑카"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "리투아니아"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "룩셈부르크"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "라트비아"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "모로코"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "몬테그레노"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "마다가스카르"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:300
+#, fuzzy
+#| msgid "Dominican Republic"
+msgid "Macedonia, Republic of"
+msgstr "도미니카 공화국"
+
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "멕시코"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "말레이시아"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "니카라과"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "네덜란드"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "노르웨이"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "뉴질랜드"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "파나마"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "페루"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "필리핀"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "파키스탄"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "폴란드"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "포르투갈"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "루마니아"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "세르비아"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "러시아"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "사우디아라비아"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "스웨덴"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "싱가포르"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "슬로베니아"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "슬로바키아"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "엘살바도르"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "타이"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:381
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Tajikistan"
+msgstr "파키스탄"
+
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "튀니지"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "터키"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "타이완"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "우크라이나"
 
-#: ../../english/template/debian/countries.wml:305
-msgid "United Kingdom"
-msgstr "영국"
-
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "미국"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "우루과이"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:402
 #, fuzzy
 #| msgid "Pakistan"
 msgid "Uzbekistan"
 msgstr "파키스탄"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "베네수엘라"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "베트남"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "남아프리카 공화국"
 
 #~ msgid "Yugoslavia"
 #~ msgstr "Jugoslavia"
+
+#~ msgid "Great Britain"
+#~ msgstr "영국"
diff --git a/lithuanian/po/countries.lt.po b/lithuanian/po/countries.lt.po
index 8f0beecfd86..88fa2cf0508 100644
--- a/lithuanian/po/countries.lt.po
+++ b/lithuanian/po/countries.lt.po
@@ -11,402 +11,417 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Jungtiniai Arabų Emyratai"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albanija"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Armėnija"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Austrija"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Australija"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnija ir Hercegovina"
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Bangladešas"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bulgarija"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brazilija"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "Bahamos"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Baltarusija"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Šveicarija"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Čilė"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Kinija"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Kolumbija"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Kosta Rika"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "Čekijos Respublika"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Vokietija"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Danija"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "Dominykos Respublika"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "Ekvadoras"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Estija"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Egiptas"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Ispanija"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Etiopija"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Suomija"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Farerų Salos"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Prancūzija"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
-msgstr "Didžioji Britanija"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
+msgstr "Jungtinės Karalystės"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "Gruzija"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Grenlandija"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Graikija"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Gvatemala"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hongkongas"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Hondūras"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Kroatija"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Vengrija"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonezija"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Airija"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Izraelis"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "Indija"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Islandija"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Italija"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Jordanija"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Japonija"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Kenija"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Korėja"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Kuveitas"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "Kazachstanas"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Šri Lanka"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Lietuva"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Liuksemburgas"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Latvija"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Marokas"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "Juodkalnija"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagaskaras"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:300
+#, fuzzy
+#| msgid "Dominican Republic"
+msgid "Macedonia, Republic of"
+msgstr "Dominykos Respublika"
+
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Meksika"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malaizija"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "Naujoji Kaledonija"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nikaragva"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Olandija"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Norvegija"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Naujoji Zelandija"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "Prancūzijos Polinezija"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Filipinai"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Pakistanas"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Lenkija"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugalija"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Rumunija"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "Serbija"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Rusija"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Saudo Arabija"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Švedija"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Singapūras"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Slovėnija"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Slovakija"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "Salvadoras"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Tailandas"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:381
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Tajikistan"
+msgstr "Pakistanas"
+
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Tunisas"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Turkija"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Taivanas"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../../english/template/debian/countries.wml:305
-msgid "United Kingdom"
-msgstr "Jungtinės Karalystės"
-
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Jungtinės Valstijos"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Urugvajus"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "Uzbekistanas"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Venesuela"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Vietnamas"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Pietų Afrika"
+
+#~ msgid "Great Britain"
+#~ msgstr "Didžioji Britanija"
diff --git a/norwegian/po/countries.nb.po b/norwegian/po/countries.nb.po
index c3ee3b3ebc0..8f4e3cb10e7 100644
--- a/norwegian/po/countries.nb.po
+++ b/norwegian/po/countries.nb.po
@@ -9,405 +9,420 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "De forente arabiske emirater"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albania"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Østerrike"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Australia"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia-Hercegovina"
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Hviterussland"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Canada"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Sveits"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Chile"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Kina"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Colombia"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "Tsjekkia"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Danmark"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "Den dominikanske republikk"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr "Algerie"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Estland"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Egypt"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Spania"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finland"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Færøyene"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Frankrike"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
-msgstr "Storbritania"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
+msgstr "Storbritannia"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "Georgia"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Grønland"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Hellas"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Kroatia"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr "Iran"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Irland"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Israel"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "India"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Island"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Italia"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Jordan"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Japan"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Kenya"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Korea"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "Kasakhstan"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Latvia"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Marokko"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr "Moldova"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "Montenegro"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:300
+#, fuzzy
+#| msgid "Dominican Republic"
+msgid "Macedonia, Republic of"
+msgstr "Den dominikanske republikk"
+
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Mexico"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "Ny-Caledonia"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Norge"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "Fransk Polynesia"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Filippinene"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Polen"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Romania"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "Serbia"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Russland"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Saudiarabia"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Thailand"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:381
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Tajikistan"
+msgstr "Pakistan"
+
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Tyrkia"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../../english/template/debian/countries.wml:305
-msgid "United Kingdom"
-msgstr "Storbritannia"
-
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Forente stater"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Sørafrika"
 
 #~ msgid "Yugoslavia"
 #~ msgstr "Jugoslavia"
+
+#~ msgid "Great Britain"
+#~ msgstr "Storbritania"
diff --git a/persian/po/countries.fa.po b/persian/po/countries.fa.po
index c6e0d27a314..74df2f291e0 100644
--- a/persian/po/countries.fa.po
+++ b/persian/po/countries.fa.po
@@ -14,402 +14,417 @@ msgstr ""
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "امارات متحده عربی"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "آلبانی"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "ارمنستان"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "آرژانتین"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "اتریش"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "استرالیا"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "بوسنی و هرزگوین"
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "بنگلادش"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "بلژیک"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "بلغارستان"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "برزیل"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "باهاماس"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "بلاروس"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "کانادا"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "سوئیس"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "شیلی"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "چین"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "کلمبیا"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "کاستاریکا"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "جمهوری چک"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "آلمان"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "دانمارک"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "جمهوری دومینیکن"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr "الجزیره"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "اکوادور"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "استونی"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "مصر"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "اسپانیا"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "اتیوپی"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "فنلاند"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "جزایر فارو"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "فرانسه"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
-msgstr "بریتانیای کبیر"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
+msgstr "انگلستان"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "گرینادا"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "گرجستان"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "گرینلند"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "یونان"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "گواتمالا"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "هنگ‌کنگ"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "هندوراس"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "کرواسی"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "مجارستان"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "اندونزی"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr "ایران"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "ایرلند"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "اسرائیل"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "هند"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "ایسلند"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "ایتالیا"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "اردن"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "ژاپن"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "کنیا"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "کره"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "کویت"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "قزاقستان"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "سریلانکا"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "لیتوانی"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "لوکزامبورگ"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "لتونی"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "مراکش"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr "مالدیو"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "مونته‌نگرو"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "ماداگاسکار"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:300
+#, fuzzy
+#| msgid "Dominican Republic"
+msgid "Macedonia, Republic of"
+msgstr "جمهوری دومینیکن"
+
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr "مونگولیا"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "مالتا"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "مکزیک"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "مالزی"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "کالدونیای جدید"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "نیکاراگوئه"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "هلند"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "نروژ"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "زلاند نو"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "پاناما"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "پرو"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "پلینزی فرانسوی"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "فیلیپین"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "پاکستان"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "لهستان"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "پرتغال"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "رومانی"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "صربستان"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "روسیه"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "عربستان سعودی"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "سوئد"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "سنگاپور"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "اسلوونی"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "اسلواکی"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "السالوادور"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "تایلند"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:381
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Tajikistan"
+msgstr "پاکستان"
+
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "تونس"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "ترکیه"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "تایوان"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "اکراین"
 
-#: ../../english/template/debian/countries.wml:305
-msgid "United Kingdom"
-msgstr "انگلستان"
-
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "ایالات متحده"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "اروگوئه"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "ازبکستان"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "ونزوئلا"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "ویتنام"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "وانواتو"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "آفریقای جنوبی"
+
+#~ msgid "Great Britain"
+#~ msgstr "بریتانیای کبیر"
diff --git a/polish/po/countries.pl.po b/polish/po/countries.pl.po
index cfd5fb1a64c..338092a5b69 100644
--- a/polish/po/countries.pl.po
+++ b/polish/po/countries.pl.po
@@ -12,410 +12,413 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Zjednoczone Emiraty Arabskie"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albania"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentyna"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Austria"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Australia"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Bośnia i Hercegowina"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Bangladesz"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bułgaria"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brazylia"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "Bahamy"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Białoruś"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Szwajcaria"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Chile"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Chiny"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Kolumbia"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Kostaryka"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "Czechy"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Niemcy"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Dania"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "Dominikana"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr "Algieria"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "Ekwador"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Estonia"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Egipt"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Hiszpania"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finlandia"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Wyspy Owcze"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Francja"
 
-#: ../../english/template/debian/countries.wml:206
-msgid "Great Britain"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
 msgstr "Wielka Brytania"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Grenada"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "Gruzja"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Grenlandia"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Grecja"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Gwatemala"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hongkong"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Chorwacja"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Węgry"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonezja"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr "Iran"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Irlandia"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "Indie"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Islandia"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Włochy"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Jordania"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Japonia"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Kenia"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Korea"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Kuwejt"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "Kazachstan"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Litwa"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Łotwa"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Maroko"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr "Mołdawia"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "Czarnogóra"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:300
 msgid "Macedonia, Republic of"
 msgstr "Macedonia"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Meksyk"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malezja"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "Nowa Kaledonia"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nikaragua"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Holandia"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Norwegia"
 
-#: ../../english/template/debian/countries.wml:326
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Nowa Zelandia"
 
-#: ../../english/template/debian/countries.wml:329
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:332
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:335
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "Polinezja Francuska"
 
-#: ../../english/template/debian/countries.wml:338
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Filipiny"
 
-#: ../../english/template/debian/countries.wml:341
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:344
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Polska"
 
-#: ../../english/template/debian/countries.wml:347
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugalia"
 
-#: ../../english/template/debian/countries.wml:350
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Rumunia"
 
-#: ../../english/template/debian/countries.wml:353
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "Serbia"
 
-#: ../../english/template/debian/countries.wml:356
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Rosja"
 
-#: ../../english/template/debian/countries.wml:359
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Arabia Saudyjska"
 
-#: ../../english/template/debian/countries.wml:362
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Szwecja"
 
-#: ../../english/template/debian/countries.wml:365
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../../english/template/debian/countries.wml:368
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Słowenia"
 
-#: ../../english/template/debian/countries.wml:371
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Słowacja"
 
-#: ../../english/template/debian/countries.wml:374
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "Salwador"
 
-#: ../../english/template/debian/countries.wml:377
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Tajlandia"
 
-#: ../../english/template/debian/countries.wml:380
+#: ../../english/template/debian/countries.wml:381
 msgid "Tajikistan"
 msgstr "Tadżykistan"
 
-#: ../../english/template/debian/countries.wml:383
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Tunezja"
 
-#: ../../english/template/debian/countries.wml:386
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Turcja"
 
-#: ../../english/template/debian/countries.wml:389
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Tajwan"
 
-#: ../../english/template/debian/countries.wml:392
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: ../../english/template/debian/countries.wml:395
-msgid "United Kingdom"
-msgstr "Wielka Brytania"
-
-#: ../../english/template/debian/countries.wml:398
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Stany Zjednoczone"
 
-#: ../../english/template/debian/countries.wml:401
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Urugwaj"
 
-#: ../../english/template/debian/countries.wml:404
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: ../../english/template/debian/countries.wml:407
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Wenezuela"
 
-#: ../../english/template/debian/countries.wml:410
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Wietnam"
 
-#: ../../english/template/debian/countries.wml:413
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "RPA"
+
+#~ msgid "Great Britain"
+#~ msgstr "Wielka Brytania"
diff --git a/portuguese/po/countries.pt.po b/portuguese/po/countries.pt.po
index 11955e10d69..3d5eb565e2c 100644
--- a/portuguese/po/countries.pt.po
+++ b/portuguese/po/countries.pt.po
@@ -18,410 +18,413 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Emirados Árabes Unidos"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albânia"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Armênia"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Áustria"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Austrália"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Bósnia e Herzegovina"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Bélgica"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bulgária"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Bielorrússia"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Canadá"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Suíça"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Chile"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "China"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Colômbia"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "República Checa"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Alemanha"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Dinamarca"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "República Dominicana"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr "Argélia"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "Equador"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Estônia"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Egito"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Espanha"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Etiópia"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finlândia"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Ilhas Feroe"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "França"
 
-#: ../../english/template/debian/countries.wml:206
-msgid "Great Britain"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
 msgstr "Reino Unido"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Granada"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "Geórgia"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Groenlândia"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Grécia"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Croácia"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Hungria"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonésia"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr "Irã"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Israel"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "Índia"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Islândia"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Itália"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Jordânia"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Japão"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Quênia"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Coréia"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "Cazaquistão"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Lituânia"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Luxemburgo"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Letônia"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Marrocos"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr "Moldávia"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "Montenegro"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagáscar"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:300
 msgid "Macedonia, Republic of"
 msgstr "República da Macedônia"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr "Mongólia"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "Malta"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "México"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malásia"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "Nova Caledônia"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nicarágua"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Holanda"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Noruega"
 
-#: ../../english/template/debian/countries.wml:326
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Nova Zelândia"
 
-#: ../../english/template/debian/countries.wml:329
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panamá"
 
-#: ../../english/template/debian/countries.wml:332
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:335
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "Polinésia Francesa"
 
-#: ../../english/template/debian/countries.wml:338
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Filipinas"
 
-#: ../../english/template/debian/countries.wml:341
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Paquistão"
 
-#: ../../english/template/debian/countries.wml:344
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Polônia"
 
-#: ../../english/template/debian/countries.wml:347
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../../english/template/debian/countries.wml:350
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Romênia"
 
-#: ../../english/template/debian/countries.wml:353
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "Sérvia"
 
-#: ../../english/template/debian/countries.wml:356
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Rússia"
 
-#: ../../english/template/debian/countries.wml:359
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Arábia Saudita"
 
-#: ../../english/template/debian/countries.wml:362
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Suécia"
 
-#: ../../english/template/debian/countries.wml:365
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Singapura"
 
-#: ../../english/template/debian/countries.wml:368
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Eslovênia"
 
-#: ../../english/template/debian/countries.wml:371
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Eslováquia"
 
-#: ../../english/template/debian/countries.wml:374
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "Salvador"
 
-#: ../../english/template/debian/countries.wml:377
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Tailândia"
 
-#: ../../english/template/debian/countries.wml:380
+#: ../../english/template/debian/countries.wml:381
 msgid "Tajikistan"
 msgstr "Tajiquistão"
 
-#: ../../english/template/debian/countries.wml:383
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Tunísia"
 
-#: ../../english/template/debian/countries.wml:386
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Turquia"
 
-#: ../../english/template/debian/countries.wml:389
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../../english/template/debian/countries.wml:392
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ucrânia"
 
-#: ../../english/template/debian/countries.wml:395
-msgid "United Kingdom"
-msgstr "Reino Unido"
-
-#: ../../english/template/debian/countries.wml:398
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Estados Unidos"
 
-#: ../../english/template/debian/countries.wml:401
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Uruguai"
 
-#: ../../english/template/debian/countries.wml:404
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "Uzbequistão"
 
-#: ../../english/template/debian/countries.wml:407
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:410
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Vietnã"
 
-#: ../../english/template/debian/countries.wml:413
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "África do Sul"
+
+#~ msgid "Great Britain"
+#~ msgstr "Reino Unido"
diff --git a/romanian/po/countries.ro.po b/romanian/po/countries.ro.po
index 64650555ed0..5c8ea5157b7 100644
--- a/romanian/po/countries.ro.po
+++ b/romanian/po/countries.ro.po
@@ -4,398 +4,434 @@ msgstr ""
 "PO-Revision-Date: 2006-08-12 17:48+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"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 #, fuzzy
 msgid "United Arab Emirates"
 msgstr "Statele&nbsp;Unite"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Albania"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Armenia"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Austria"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Australia"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brazilia"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 #, fuzzy
 msgid "Bahamas"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Bielorusia"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Elve&#355;ia"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Columbia"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Costa&nbsp;Rica"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "Cehia"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Germania"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Danemarca"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "Republica&nbsp;Dominican&#259;"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
+msgid "Algeria"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Spania"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finlanda"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Insulele&nbsp;Faroe"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Fran&#355;a"
 
-#: ../../english/template/debian/countries.wml:119
-msgid "Great Britain"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
 msgstr "Marea&nbsp;Britanie"
 
-#: ../../english/template/debian/countries.wml:122
+#: ../../english/template/debian/countries.wml:210
 #, fuzzy
 msgid "Grenada"
 msgstr "Groenlanda"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Groenlanda"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Grecia"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hong&nbsp;Kong"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Croa&#355;ia"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Ungaria"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonezia"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:240
+msgid "Iran"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Irlanda"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Islanda"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Italia"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Japonia"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:264
 #, fuzzy
 msgid "Kenya"
 msgstr "Coreea"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Coreea"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:273
 #, fuzzy
 #| msgid "Pakistan"
 msgid "Kazakhstan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Lituania"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Luxemburg"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Letonia"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:291
+msgid "Moldova"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:294
 #, fuzzy
 msgid "Montenegro"
 msgstr "Serbia&nbsp;&#351;i&nbsp;Montenero"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:297
+msgid "Madagascar"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:300
+#, fuzzy
+#| msgid "Dominican Republic"
+msgid "Macedonia, Republic of"
+msgstr "Republica&nbsp;Dominican&#259;"
+
+#: ../../english/template/debian/countries.wml:303
+msgid "Mongolia"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:306
 #, fuzzy
 #| msgid "Malaysia"
 msgid "Malta"
 msgstr "Malaiezia"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Mexic"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malaiezia"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Olanda"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Norvegia"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Noua&nbsp;Zeeland&#259;"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Panama"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Filipine"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Polonia"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugalia"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Rom&acirc;nia"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Rusia"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Arabia&nbsp;Saudit&#259;"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Suedia"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Slovacia"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Tailanda"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:381
+#, fuzzy
+#| msgid "Pakistan"
+msgid "Tajikistan"
+msgstr "Pakistan"
+
+#: ../../english/template/debian/countries.wml:384
 #, fuzzy
 msgid "Tunisia"
 msgstr "Rusia"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Turcia"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Taivan"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Ucraina"
 
-#: ../../english/template/debian/countries.wml:290
-msgid "United Kingdom"
-msgstr "Marea&nbsp;Britanie"
-
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Statele&nbsp;Unite"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:402
 #, fuzzy
 #| msgid "Pakistan"
 msgid "Uzbekistan"
 msgstr "Pakistan"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: ../../english/template/debian/countries.wml:305
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Africa&nbsp;de&nbsp;Sud"
+
+#~ msgid "Great Britain"
+#~ msgstr "Marea&nbsp;Britanie"
diff --git a/russian/po/countries.ru.po b/russian/po/countries.ru.po
index 54e9cea8586..0e387eac695 100644
--- a/russian/po/countries.ru.po
+++ b/russian/po/countries.ru.po
@@ -270,7 +270,6 @@ msgid "Madagascar"
 msgstr "Мадагаскар"
 
 #: ../../english/template/debian/countries.wml:300
-#| msgid "Dominican Republic"
 msgid "Macedonia, Republic of"
 msgstr "Республика Македония"
 
@@ -379,7 +378,6 @@ msgid "Thailand"
 msgstr "Таиланд"
 
 #: ../../english/template/debian/countries.wml:381
-#| msgid "Pakistan"
 msgid "Tajikistan"
 msgstr "Таджикистан"
 
@@ -420,6 +418,10 @@ msgid "Vietnam"
 msgstr "Вьетнам"
 
 #: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Вануату"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Южная Африка"
 
diff --git a/slovak/po/countries.sk.po b/slovak/po/countries.sk.po
index 2128ee38a54..4236c4cd9f8 100644
--- a/slovak/po/countries.sk.po
+++ b/slovak/po/countries.sk.po
@@ -11,10 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2011-02-13 18:34+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <debian-l10n-slovak@lists.debian.org>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 
 #: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
@@ -417,1028 +417,1029 @@ msgid "Vietnam"
 msgstr "Vietnam"
 
 #: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Južná Afrika"
 
-#~ msgid "Great Britain"
-#~ msgstr "Spojené kráľovstvo"
+#~ 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"
+#~ msgid "Kingdom of Bahrain"
+#~ msgstr "Bhutánske kráľovstvo"
 
-#, fuzzy
-#~ 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 "Taiwan, Province of China"
-#~ msgstr "Taiwan, provincia Číny"
+#~ msgid "Congo, The Democratic Republic of the"
+#~ msgstr "Konžská demokratická republika"
 
-#~ msgid "Syrian Arab Republic"
-#~ msgstr "Sýrska arabská republika"
+#~ msgid "Cook Islands"
+#~ msgstr "Cookove ostrovy"
 
-#~ msgid "Swiss Confederation"
-#~ msgstr "Švajčiarska konfederácia"
+#~ msgid "Republic of Costa Rica"
+#~ msgstr "Kostarická republika"
 
-#~ msgid "Kingdom of Sweden"
-#~ msgstr "Švédske kráľovstvo"
+#~ msgid "Côte d'Ivoire"
+#~ msgstr "Pobrežie Slonoviny"
 
-#~ msgid "Kingdom of Swaziland"
-#~ msgstr "Svazijské kráľovstvo"
+#, fuzzy
+#~ msgid "Republic of Côte d'Ivoire"
+#~ msgstr "Republika Pobrežia Slonoviny"
 
-#~ msgid "Swaziland"
-#~ msgstr "Svazijsko"
+#~ msgid "Republic of Croatia"
+#~ msgstr "Chorvátska republika"
 
-#~ msgid "Svalbard and Jan Mayen"
-#~ msgstr "Svalbard a Jan Mayen"
+#~ msgid "Cuba"
+#~ msgstr "Kuba"
 
-#~ msgid "Republic of Suriname"
-#~ msgstr "Surinamská republika"
+#~ msgid "Republic of Cuba"
+#~ msgstr "Kubánska republika"
 
-#~ msgid "Suriname"
-#~ msgstr "Surinam"
+#~ msgid "Cyprus"
+#~ msgstr "Cyprus"
 
-#~ msgid "Republic of the Sudan"
-#~ msgstr "Sudánska republika"
+#~ msgid "Republic of Cyprus"
+#~ msgstr "Cyperská republika"
 
-#~ msgid "Sudan"
-#~ msgstr "Sudán"
+#~ msgid "Kingdom of Denmark"
+#~ msgstr "Dánske kráľovstvo"
 
-#~ msgid "Democratic Socialist Republic of Sri Lanka"
-#~ msgstr "Srílanská demokratická socialistická republika"
+#~ msgid "Djibouti"
+#~ msgstr "Džibutsko"
 
-#~ msgid "Kingdom of Spain"
-#~ msgstr "Španielske kráľovstvo"
+#~ msgid "Republic of Djibouti"
+#~ msgstr "Džibutská republika"
 
-#~ msgid "South Georgia and the South Sandwich Islands"
-#~ msgstr "Južná Georgia a Južné Sandwichove ostrovy"
+#~ msgid "Dominica"
+#~ msgstr "Dominika"
 
-#~ msgid "Republic of South Africa"
-#~ msgstr "Juhoafrická republika"
+#~ msgid "Commonwealth of Dominica"
+#~ msgstr "Dominické spoločenstvo"
 
-#~ msgid "Somali Republic"
-#~ msgstr "Somálska republika"
+#~ msgid "Republic of Ecuador"
+#~ msgstr "Ekvádorská republika"
 
-#~ msgid "Somalia"
-#~ msgstr "Somálsko"
+#~ msgid "Arab Republic of Egypt"
+#~ msgstr "Egyptská arabská republika"
 
-#~ msgid "Solomon Islands"
-#~ msgstr "Šalamúnove ostrovy"
+#~ msgid "Republic of El Salvador"
+#~ msgstr "Salvádorská republika"
 
-#~ msgid "Republic of Slovenia"
-#~ msgstr "Slovinská republika"
+#~ msgid "Equatorial Guinea"
+#~ msgstr "Rovníková Guinea"
 
-#~ msgid "Slovak Republic"
-#~ msgstr "Slovenská republika"
+#~ msgid "Republic of Equatorial Guinea"
+#~ msgstr "Republika Rovníkovej Guiney"
 
-#~ msgid "Republic of Singapore"
-#~ msgstr "Singapurská republika"
+#~ msgid "Eritrea"
+#~ msgstr "Eritrea"
 
-#~ msgid "Republic of Sierra Leone"
-#~ msgstr "Sierraleonská republika"
+#~ msgid "Republic of Estonia"
+#~ msgstr "Estónska republika"
 
-#~ msgid "Sierra Leone"
-#~ msgstr "Sierra Leone"
+#~ msgid "Federal Democratic Republic of Ethiopia"
+#~ msgstr "Etiópska federatívna demokratická republika"
 
-#~ msgid "Republic of Seychelles"
-#~ msgstr "Seychelská republika"
+#~ msgid "Falkland Islands (Malvinas)"
+#~ msgstr "Falklandy (Malvíny)"
 
-#~ msgid "Seychelles"
-#~ msgstr "Seychely"
+#~ msgid "Fiji"
+#~ msgstr "Fidži"
 
-#~ msgid "Republic of Serbia"
-#~ msgstr "Srbská republika"
+#~ msgid "Republic of the Fiji Islands"
+#~ msgstr "Republika Fidžijských ostrovov"
 
-#~ msgid "Republic of Senegal"
-#~ msgstr "Senegalská republika"
+#~ msgid "Republic of Finland"
+#~ msgstr "Fínska republika"
 
-#~ msgid "Senegal"
-#~ msgstr "Senegal"
+#~ msgid "French Republic"
+#~ msgstr "Francúzska republika"
 
-#~ msgid "Kingdom of Saudi Arabia"
-#~ msgstr "Saudskoarabské kráľovstvo"
+#~ msgid "French Guiana"
+#~ msgstr "Francúzska Guyana"
 
-#~ msgid "Democratic Republic of Sao Tome and Principe"
-#~ msgstr "Demokratická republika Svätého Tomáša a Princovho ostrova"
+#~ msgid "French Southern Territories"
+#~ msgstr "Francúzske južné a antarktické územia"
 
-#~ msgid "Sao Tome and Principe"
-#~ msgstr "Svätý Tomáš a Princov ostrov"
+#~ msgid "Gabon"
+#~ msgstr "Gabon"
 
-#~ msgid "Republic of San Marino"
-#~ msgstr "Sanmarínska republika"
+#~ msgid "Gabonese Republic"
+#~ msgstr "Gabonská republika"
 
-#~ msgid "San Marino"
-#~ msgstr "San Maríno"
+#~ msgid "Gambia"
+#~ msgstr "Gambia"
 
-#~ msgid "Independent State of Samoa"
-#~ msgstr "Samojský nezávislý štát"
+#~ msgid "Republic of the Gambia"
+#~ msgstr "Gambijská republika"
 
-#~ msgid "Samoa"
-#~ msgstr "Samoa"
+#~ msgid "Federal Republic of Germany"
+#~ msgstr "Nemecká spolková republika"
 
-#~ msgid "Saint Vincent and the Grenadines"
-#~ msgstr "Svätý Vincent a Grenadíny"
+#~ msgid "Ghana"
+#~ msgstr "Ghana"
 
-#~ msgid "Saint Pierre and Miquelon"
-#~ msgstr "Saint Pierre a Miquelon"
+#~ msgid "Republic of Ghana"
+#~ msgstr "Ghanská republika"
 
-#~ msgid "Saint Lucia"
-#~ msgstr "Svätá Lucia"
+#~ msgid "Gibraltar"
+#~ msgstr "Gibraltár"
 
-#~ msgid "Saint Kitts and Nevis"
-#~ msgstr "Svätý Krištof a Nevis"
+# 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 "Saint Helena"
-#~ msgstr "Svätá Helena"
+#~ msgid "Guadeloupe"
+#~ msgstr "Guadeloupe"
 
-#~ msgid "Rwandese Republic"
-#~ msgstr "Rwandská republika"
+#~ msgid "Guam"
+#~ msgstr "Guam"
 
-#~ msgid "Rwanda"
-#~ msgstr "Rwanda"
+#~ msgid "Republic of Guatemala"
+#~ msgstr "Guatemalská republika"
 
-#~ msgid "Russian Federation"
-#~ msgstr "Ruská federácia"
+#~ msgid "Guernsey"
+#~ msgstr "Guernsey"
 
-#~ msgid "Reunion"
-#~ msgstr "Réunion"
+#~ msgid "Guinea"
+#~ msgstr "Guinea"
 
-#~ msgid "State of Qatar"
-#~ msgstr "Katarský štát"
+#~ msgid "Republic of Guinea"
+#~ msgstr "Guinejská republika"
 
-#~ msgid "Qatar"
-#~ msgstr "Katar"
+#~ msgid "Guinea-Bissau"
+#~ msgstr "Guinea-Bissau"
 
-#~ msgid "Puerto Rico"
-#~ msgstr "Portoriko"
+#~ msgid "Republic of Guinea-Bissau"
+#~ msgstr "Guinejsko-bissauská republika"
 
-#~ msgid "Portuguese Republic"
-#~ msgstr "Portugalská republika"
+#~ msgid "Guyana"
+#~ msgstr "Guyana"
 
-#~ msgid "Republic of Poland"
-#~ msgstr "Poľská republika"
+#~ msgid "Republic of Guyana"
+#~ msgstr "Guyanská kooperatívna republika"
 
-#~ msgid "Pitcairn"
-#~ msgstr "Pitcairnove ostrovy"
+#~ msgid "Haiti"
+#~ msgstr "Haiti"
 
-#~ msgid "Republic of the Philippines"
-#~ msgstr "Filipínska republika"
+#~ msgid "Republic of Haiti"
+#~ msgstr "Haitská republika"
 
-#~ msgid "Republic of Peru"
-#~ msgstr "Peruánska republika"
+#~ msgid "Heard Island and McDonald Islands"
+#~ msgstr "Heardov ostrov"
 
-#~ msgid "Republic of Paraguay"
-#~ msgstr "Paraguajská republika"
+#~ msgid "Holy See (Vatican City State)"
+#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
 
-#~ msgid "Paraguay"
-#~ msgstr "Paraguaj"
+#~ msgid "Republic of Honduras"
+#~ msgstr "Honduraská republika"
 
-#~ msgid "Papua New Guinea"
-#~ msgstr "Papua - Nová Guinea"
+#~ msgid "Hong Kong Special Administrative Region of China"
+#~ msgstr "Osobitná administratívna oblasť Číny Hongkong"
 
-#~ msgid "Republic of Panama"
-#~ msgstr "Panamská republika"
+#~ msgid "Republic of Hungary"
+#~ msgstr "Maďarská republika"
 
-#~ msgid "Occupied Palestinian Territory"
-#~ msgstr "Okupované palestínske územie"
+#~ msgid "Republic of Iceland"
+#~ msgstr "Islandská republika"
 
-#~ msgid "Palestinian Territory, Occupied"
-#~ msgstr "palestínske územie, Okupované"
+#~ msgid "Republic of India"
+#~ msgstr "Indická republika"
 
-#~ msgid "Republic of Palau"
-#~ msgstr "Palauská republika"
+#~ msgid "Republic of Indonesia"
+#~ msgstr "Indonézska republika"
 
-#~ msgid "Palau"
-#~ msgstr "Palau"
+#~ msgid "Iran, Islamic Republic of"
+#~ msgstr "Iránska islamská republika"
 
-#~ msgid "Islamic Republic of Pakistan"
-#~ msgstr "Pakistanská islamská republika"
+#~ msgid "Islamic Republic of Iran"
+#~ msgstr "Iránska islamská republika"
 
-#~ msgid "Sultanate of Oman"
-#~ msgstr "Ománsky sultanát"
+#~ msgid "Republic of Iraq"
+#~ msgstr "Iracká republika"
 
-#~ msgid "Oman"
-#~ msgstr "Omán"
+#~ msgid "Isle of Man"
+#~ msgstr "Man"
 
-#~ msgid "Kingdom of Norway"
-#~ msgstr "Nórske kráľovstvo"
+#~ msgid "State of Israel"
+#~ msgstr "Izraelský štát"
 
-#~ msgid "Commonwealth of the Northern Mariana Islands"
-#~ msgstr "Spoločenstvo Severných Marián"
+#~ msgid "Italian Republic"
+#~ msgstr "Talianska republika"
 
-#~ msgid "Northern Mariana Islands"
-#~ msgstr "Severné Mariány"
+#~ msgid "Jamaica"
+#~ msgstr "Jamajka"
 
-#~ msgid "Norfolk Island"
-#~ msgstr "Norfolk"
+#~ msgid "Jersey"
+#~ msgstr "Jersey"
 
-#~ msgid "Republic of Niue"
-#~ msgstr "Republika Niue"
+#~ msgid "Hashemite Kingdom of Jordan"
+#~ msgstr "Jordánske hášimovské kráľovstvo"
 
-#~ msgid "Niue"
-#~ msgstr "Niue"
+#~ msgid "Republic of Kazakhstan"
+#~ msgstr "Kazašská republika"
 
-#~ msgid "Federal Republic of Nigeria"
-#~ msgstr "Nigérijská federatívna republika"
+#~ msgid "Republic of Kenya"
+#~ msgstr "Kenská republika"
 
-#~ msgid "Nigeria"
-#~ msgstr "Nigéria"
+#~ msgid "Kiribati"
+#~ msgstr "Kiribati"
 
-#~ msgid "Republic of the Niger"
-#~ msgstr "Nigerská republika"
+#~ msgid "Republic of Kiribati"
+#~ msgstr "Kiribatská republika"
 
-#~ msgid "Niger"
-#~ msgstr "Niger"
+#~ msgid "Korea, Democratic People's Republic of"
+#~ msgstr "Kórejská ľudovodemokratická republika"
 
-#~ msgid "Republic of Nicaragua"
-#~ msgstr "Nikaragujská republika"
+#~ msgid "Democratic People's Republic of Korea"
+#~ msgstr "Kórejská ľudovodemokratická republika"
 
-#~ msgid "Netherlands Antilles"
-#~ msgstr "Holandské Antily"
+#~ msgid "Korea, Republic of"
+#~ msgstr "Kórejská republika"
 
-#~ msgid "Kingdom of the Netherlands"
-#~ msgstr "Holandské kráľovstvo"
+#~ msgid "State of Kuwait"
+#~ msgstr "Kuvajtský štát"
 
-#, fuzzy
-#~ msgid "Federal Democratic Republic of Nepal"
-#~ msgstr "Etiópska federatívna demokratická republika"
+#~ msgid "Kyrgyzstan"
+#~ msgstr "Kirgizsko"
 
-#~ msgid "Nepal"
-#~ msgstr "Nepál"
+#~ msgid "Kyrgyz Republic"
+#~ msgstr "Kirgizská republika"
 
-#~ msgid "Republic of Nauru"
-#~ msgstr "Nauruská republika"
+#~ msgid "Lao People's Democratic Republic"
+#~ msgstr "Laoská ľudovodemokratická republika"
 
-#~ msgid "Nauru"
-#~ msgstr "Nauru"
+#~ msgid "Republic of Latvia"
+#~ msgstr "Lotyšská republika"
 
-#~ msgid "Republic of Namibia"
-#~ msgstr "Namíbijská republika"
+#~ msgid "Lebanon"
+#~ msgstr "Libanon"
 
-#~ msgid "Namibia"
-#~ msgstr "Namíbia"
+#~ msgid "Lebanese Republic"
+#~ msgstr "Libanonská republika"
 
-#~ msgid "Union of Myanmar"
-#~ msgstr "Mjanmarský zväz"
+#~ msgid "Lesotho"
+#~ msgstr "Lesotho"
 
-#~ msgid "Myanmar"
-#~ msgstr "Mjanmarsko"
+#~ msgid "Kingdom of Lesotho"
+#~ msgstr "Lesothské kráľovstvo"
 
-#~ msgid "Republic of Mozambique"
-#~ msgstr "Mozambická republika"
+#~ msgid "Liberia"
+#~ msgstr "Libéria"
 
-#~ msgid "Mozambique"
-#~ msgstr "Mozambik"
+#~ msgid "Republic of Liberia"
+#~ msgstr "Libérijská republika"
 
-#~ msgid "Kingdom of Morocco"
-#~ msgstr "Marocké kráľovstvo"
+#~ msgid "Libyan Arab Jamahiriya"
+#~ msgstr "Líbya"
 
-#~ msgid "Montserrat"
-#~ msgstr "Montserrat"
+#~ msgid "Socialist People's Libyan Arab Jamahiriya"
+#~ msgstr "Líbyjská arabská ľudová socialistická džamahírija"
 
-#~ msgid "Principality of Monaco"
-#~ msgstr "Monacké kniežatstvo"
+#~ msgid "Liechtenstein"
+#~ msgstr "Lichtenštajnsko"
 
-#~ msgid "Monaco"
-#~ msgstr "Monako"
+#~ msgid "Principality of Liechtenstein"
+#~ msgstr "Lichtenštajnské kniežatstvo"
 
-#~ msgid "Republic of Moldova"
-#~ msgstr "Moldavská republika"
+#~ msgid "Republic of Lithuania"
+#~ msgstr "Litovská republika"
 
-#~ msgid "Federated States of Micronesia"
-#~ msgstr "Mikronézske federatívne štáty"
+#~ msgid "Grand Duchy of Luxembourg"
+#~ msgstr "Luxemburské veľkovojvodstvo"
 
-#~ msgid "Micronesia, Federated States of"
-#~ msgstr "Mikronézske federatívne štáty"
+#~ msgid "Macao"
+#~ msgstr "Macao"
 
-#~ msgid "United Mexican States"
-#~ msgstr "Spojené štáty mexické"
+#~ msgid "Macao Special Administrative Region of China"
+#~ msgstr "Osobitná administratívna oblasť Číny Macao"
 
-#~ msgid "Mayotte"
-#~ msgstr "Mayotte"
+#~ msgid "The Former Yugoslav Republic of Macedonia"
+#~ msgstr "Bývalá juhoslovanská republika Macedónsko"
 
-#~ msgid "Republic of Mauritius"
-#~ msgstr "Maurícijská republika"
+#~ msgid "Republic of Madagascar"
+#~ msgstr "Madagaskarská republika"
 
-#~ msgid "Mauritius"
-#~ msgstr "Maurícius"
+#~ msgid "Malawi"
+#~ msgstr "Malawi"
 
-#~ msgid "Islamic Republic of Mauritania"
-#~ msgstr "Mauritánska islamská republika"
+#~ msgid "Republic of Malawi"
+#~ msgstr "Malawijská republika"
 
-#~ msgid "Mauritania"
-#~ msgstr "Mauritánia"
+#~ msgid "Maldives"
+#~ msgstr "Maldivy"
 
-#~ msgid "Martinique"
-#~ msgstr "Martinik"
+#~ msgid "Republic of Maldives"
+#~ msgstr "Maldivská republika"
 
-#~ msgid "Republic of the Marshall Islands"
-#~ msgstr "Republika Marshallových ostrovov"
+#~ msgid "Mali"
+#~ msgstr "Mali"
 
-#~ msgid "Marshall Islands"
-#~ msgstr "Marshallove ostrovy"
+#~ msgid "Republic of Mali"
+#~ msgstr "Malijská republika"
 
 #~ msgid "Republic of Malta"
 #~ msgstr "Maltská republika"
 
-#~ msgid "Republic of Mali"
-#~ msgstr "Malijská republika"
-
-#~ msgid "Mali"
-#~ msgstr "Mali"
+#~ msgid "Marshall Islands"
+#~ msgstr "Marshallove ostrovy"
 
-#~ msgid "Republic of Maldives"
-#~ msgstr "Maldivská republika"
+#~ msgid "Republic of the Marshall Islands"
+#~ msgstr "Republika Marshallových ostrovov"
 
-#~ msgid "Maldives"
-#~ msgstr "Maldivy"
+#~ msgid "Martinique"
+#~ msgstr "Martinik"
 
-#~ msgid "Republic of Malawi"
-#~ msgstr "Malawijská republika"
+#~ msgid "Mauritania"
+#~ msgstr "Mauritánia"
 
-#~ msgid "Malawi"
-#~ msgstr "Malawi"
+#~ msgid "Islamic Republic of Mauritania"
+#~ msgstr "Mauritánska islamská republika"
 
-#~ msgid "Republic of Madagascar"
-#~ msgstr "Madagaskarská republika"
+#~ msgid "Mauritius"
+#~ msgstr "Maurícius"
 
-#~ msgid "The Former Yugoslav Republic of Macedonia"
-#~ msgstr "Bývalá juhoslovanská republika Macedónsko"
+#~ msgid "Republic of Mauritius"
+#~ msgstr "Maurícijská republika"
 
-#~ msgid "Macao Special Administrative Region of China"
-#~ msgstr "Osobitná administratívna oblasť Číny Macao"
+#~ msgid "Mayotte"
+#~ msgstr "Mayotte"
 
-#~ msgid "Macao"
-#~ msgstr "Macao"
+#~ msgid "United Mexican States"
+#~ msgstr "Spojené štáty mexické"
 
-#~ msgid "Grand Duchy of Luxembourg"
-#~ msgstr "Luxemburské veľkovojvodstvo"
+#~ msgid "Micronesia, Federated States of"
+#~ msgstr "Mikronézske federatívne štáty"
 
-#~ msgid "Republic of Lithuania"
-#~ msgstr "Litovská republika"
+#~ msgid "Federated States of Micronesia"
+#~ msgstr "Mikronézske federatívne štáty"
 
-#~ msgid "Principality of Liechtenstein"
-#~ msgstr "Lichtenštajnské kniežatstvo"
+#~ msgid "Republic of Moldova"
+#~ msgstr "Moldavská republika"
 
-#~ msgid "Liechtenstein"
-#~ msgstr "Lichtenštajnsko"
+#~ msgid "Monaco"
+#~ msgstr "Monako"
 
-#~ msgid "Socialist People's Libyan Arab Jamahiriya"
-#~ msgstr "Líbyjská arabská ľudová socialistická džamahírija"
+#~ msgid "Principality of Monaco"
+#~ msgstr "Monacké kniežatstvo"
 
-#~ msgid "Libyan Arab Jamahiriya"
-#~ msgstr "Líbya"
+#~ msgid "Montserrat"
+#~ msgstr "Montserrat"
 
-#~ msgid "Republic of Liberia"
-#~ msgstr "Libérijská republika"
+#~ msgid "Kingdom of Morocco"
+#~ msgstr "Marocké kráľovstvo"
 
-#~ msgid "Liberia"
-#~ msgstr "Libéria"
+#~ msgid "Mozambique"
+#~ msgstr "Mozambik"
 
-#~ msgid "Kingdom of Lesotho"
-#~ msgstr "Lesothské kráľovstvo"
+#~ msgid "Republic of Mozambique"
+#~ msgstr "Mozambická republika"
 
-#~ msgid "Lesotho"
-#~ msgstr "Lesotho"
+#~ msgid "Myanmar"
+#~ msgstr "Mjanmarsko"
 
-#~ msgid "Lebanese Republic"
-#~ msgstr "Libanonská republika"
+#~ msgid "Union of Myanmar"
+#~ msgstr "Mjanmarský zväz"
 
-#~ msgid "Lebanon"
-#~ msgstr "Libanon"
+#~ msgid "Namibia"
+#~ msgstr "Namíbia"
 
-#~ msgid "Republic of Latvia"
-#~ msgstr "Lotyšská republika"
+#~ msgid "Republic of Namibia"
+#~ msgstr "Namíbijská republika"
 
-#~ msgid "Lao People's Democratic Republic"
-#~ msgstr "Laoská ľudovodemokratická republika"
+#~ msgid "Nauru"
+#~ msgstr "Nauru"
 
-#~ msgid "Kyrgyz Republic"
-#~ msgstr "Kirgizská republika"
+#~ msgid "Republic of Nauru"
+#~ msgstr "Nauruská republika"
 
-#~ msgid "Kyrgyzstan"
-#~ msgstr "Kirgizsko"
+#~ msgid "Nepal"
+#~ msgstr "Nepál"
 
-#~ msgid "State of Kuwait"
-#~ msgstr "Kuvajtský štát"
+#, fuzzy
+#~ msgid "Federal Democratic Republic of Nepal"
+#~ msgstr "Etiópska federatívna demokratická republika"
 
-#~ msgid "Korea, Republic of"
-#~ msgstr "Kórejská republika"
+#~ msgid "Kingdom of the Netherlands"
+#~ msgstr "Holandské kráľovstvo"
 
-#~ msgid "Democratic People's Republic of Korea"
-#~ msgstr "Kórejská ľudovodemokratická republika"
+#~ msgid "Netherlands Antilles"
+#~ msgstr "Holandské Antily"
 
-#~ msgid "Korea, Democratic People's Republic of"
-#~ msgstr "Kórejská ľudovodemokratická republika"
+#~ msgid "Republic of Nicaragua"
+#~ msgstr "Nikaragujská republika"
 
-#~ msgid "Republic of Kiribati"
-#~ msgstr "Kiribatská republika"
+#~ msgid "Niger"
+#~ msgstr "Niger"
 
-#~ msgid "Kiribati"
-#~ msgstr "Kiribati"
+#~ msgid "Republic of the Niger"
+#~ msgstr "Nigerská republika"
 
-#~ msgid "Republic of Kenya"
-#~ msgstr "Kenská republika"
+#~ msgid "Nigeria"
+#~ msgstr "Nigéria"
 
-#~ msgid "Republic of Kazakhstan"
-#~ msgstr "Kazašská republika"
+#~ msgid "Federal Republic of Nigeria"
+#~ msgstr "Nigérijská federatívna republika"
 
-#~ msgid "Hashemite Kingdom of Jordan"
-#~ msgstr "Jordánske hášimovské kráľovstvo"
+#~ msgid "Niue"
+#~ msgstr "Niue"
 
-#~ msgid "Jersey"
-#~ msgstr "Jersey"
+#~ msgid "Republic of Niue"
+#~ msgstr "Republika Niue"
 
-#~ msgid "Jamaica"
-#~ msgstr "Jamajka"
+#~ msgid "Norfolk Island"
+#~ msgstr "Norfolk"
 
-#~ msgid "Italian Republic"
-#~ msgstr "Talianska republika"
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "Severné Mariány"
 
-#~ msgid "State of Israel"
-#~ msgstr "Izraelský štát"
+#~ msgid "Commonwealth of the Northern Mariana Islands"
+#~ msgstr "Spoločenstvo Severných Marián"
 
-#~ msgid "Isle of Man"
-#~ msgstr "Man"
+#~ msgid "Kingdom of Norway"
+#~ msgstr "Nórske kráľovstvo"
 
-#~ msgid "Republic of Iraq"
-#~ msgstr "Iracká republika"
+#~ msgid "Oman"
+#~ msgstr "Omán"
 
-#~ msgid "Islamic Republic of Iran"
-#~ msgstr "Iránska islamská republika"
+#~ msgid "Sultanate of Oman"
+#~ msgstr "Ománsky sultanát"
 
-#~ msgid "Iran, Islamic Republic of"
-#~ msgstr "Iránska islamská republika"
+#~ msgid "Islamic Republic of Pakistan"
+#~ msgstr "Pakistanská islamská republika"
 
-#~ msgid "Republic of Indonesia"
-#~ msgstr "Indonézska republika"
+#~ msgid "Palau"
+#~ msgstr "Palau"
 
-#~ msgid "Republic of India"
-#~ msgstr "Indická republika"
+#~ msgid "Republic of Palau"
+#~ msgstr "Palauská republika"
 
-#~ msgid "Republic of Iceland"
-#~ msgstr "Islandská republika"
+#~ msgid "Palestinian Territory, Occupied"
+#~ msgstr "palestínske územie, Okupované"
 
-#~ msgid "Republic of Hungary"
-#~ msgstr "Maďarská republika"
+#~ msgid "Occupied Palestinian Territory"
+#~ msgstr "Okupované palestínske územie"
 
-#~ msgid "Hong Kong Special Administrative Region of China"
-#~ msgstr "Osobitná administratívna oblasť Číny Hongkong"
+#~ msgid "Republic of Panama"
+#~ msgstr "Panamská republika"
 
-#~ msgid "Republic of Honduras"
-#~ msgstr "Honduraská republika"
+#~ msgid "Papua New Guinea"
+#~ msgstr "Papua - Nová Guinea"
 
-#~ msgid "Holy See (Vatican City State)"
-#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
+#~ msgid "Paraguay"
+#~ msgstr "Paraguaj"
 
-#~ msgid "Heard Island and McDonald Islands"
-#~ msgstr "Heardov ostrov"
+#~ msgid "Republic of Paraguay"
+#~ msgstr "Paraguajská republika"
 
-#~ msgid "Republic of Haiti"
-#~ msgstr "Haitská republika"
+#~ msgid "Republic of Peru"
+#~ msgstr "Peruánska republika"
 
-#~ msgid "Haiti"
-#~ msgstr "Haiti"
+#~ msgid "Republic of the Philippines"
+#~ msgstr "Filipínska republika"
 
-#~ msgid "Republic of Guyana"
-#~ msgstr "Guyanská kooperatívna republika"
+#~ msgid "Pitcairn"
+#~ msgstr "Pitcairnove ostrovy"
 
-#~ msgid "Guyana"
-#~ msgstr "Guyana"
+#~ msgid "Republic of Poland"
+#~ msgstr "Poľská republika"
 
-#~ msgid "Republic of Guinea-Bissau"
-#~ msgstr "Guinejsko-bissauská republika"
+#~ msgid "Portuguese Republic"
+#~ msgstr "Portugalská republika"
 
-#~ msgid "Guinea-Bissau"
-#~ msgstr "Guinea-Bissau"
+#~ msgid "Puerto Rico"
+#~ msgstr "Portoriko"
 
-#~ msgid "Republic of Guinea"
-#~ msgstr "Guinejská republika"
+#~ msgid "Qatar"
+#~ msgstr "Katar"
 
-#~ msgid "Guinea"
-#~ msgstr "Guinea"
+#~ msgid "State of Qatar"
+#~ msgstr "Katarský štát"
 
-#~ msgid "Guernsey"
-#~ msgstr "Guernsey"
+#~ msgid "Reunion"
+#~ msgstr "Réunion"
 
-#~ msgid "Republic of Guatemala"
-#~ msgstr "Guatemalská republika"
+#~ msgid "Russian Federation"
+#~ msgstr "Ruská federácia"
 
-#~ msgid "Guam"
-#~ msgstr "Guam"
+#~ msgid "Rwanda"
+#~ msgstr "Rwanda"
 
-#~ msgid "Guadeloupe"
-#~ msgstr "Guadeloupe"
+#~ msgid "Rwandese Republic"
+#~ msgstr "Rwandská republika"
 
-# 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 "Saint Helena"
+#~ msgstr "Svätá Helena"
 
-#~ msgid "Gibraltar"
-#~ msgstr "Gibraltár"
+#~ msgid "Saint Kitts and Nevis"
+#~ msgstr "Svätý Krištof a Nevis"
 
-#~ msgid "Republic of Ghana"
-#~ msgstr "Ghanská republika"
+#~ msgid "Saint Lucia"
+#~ msgstr "Svätá Lucia"
 
-#~ msgid "Ghana"
-#~ msgstr "Ghana"
+#~ msgid "Saint Pierre and Miquelon"
+#~ msgstr "Saint Pierre a Miquelon"
 
-#~ msgid "Federal Republic of Germany"
-#~ msgstr "Nemecká spolková republika"
+#~ msgid "Saint Vincent and the Grenadines"
+#~ msgstr "Svätý Vincent a Grenadíny"
 
-#~ msgid "Republic of the Gambia"
-#~ msgstr "Gambijská republika"
+#~ msgid "Samoa"
+#~ msgstr "Samoa"
 
-#~ msgid "Gambia"
-#~ msgstr "Gambia"
+#~ msgid "Independent State of Samoa"
+#~ msgstr "Samojský nezávislý štát"
 
-#~ msgid "Gabonese Republic"
-#~ msgstr "Gabonská republika"
+#~ msgid "San Marino"
+#~ msgstr "San Maríno"
 
-#~ msgid "Gabon"
-#~ msgstr "Gabon"
+#~ msgid "Republic of San Marino"
+#~ msgstr "Sanmarínska republika"
 
-#~ msgid "French Southern Territories"
-#~ msgstr "Francúzske južné a antarktické územia"
+#~ msgid "Sao Tome and Principe"
+#~ msgstr "Svätý Tomáš a Princov ostrov"
 
-#~ msgid "French Guiana"
-#~ msgstr "Francúzska Guyana"
+#~ msgid "Democratic Republic of Sao Tome and Principe"
+#~ msgstr "Demokratická republika Svätého Tomáša a Princovho ostrova"
 
-#~ msgid "French Republic"
-#~ msgstr "Francúzska republika"
+#~ msgid "Kingdom of Saudi Arabia"
+#~ msgstr "Saudskoarabské kráľovstvo"
 
-#~ msgid "Republic of Finland"
-#~ msgstr "Fínska republika"
+#~ msgid "Senegal"
+#~ msgstr "Senegal"
 
-#~ msgid "Republic of the Fiji Islands"
-#~ msgstr "Republika Fidžijských ostrovov"
+#~ msgid "Republic of Senegal"
+#~ msgstr "Senegalská republika"
 
-#~ msgid "Fiji"
-#~ msgstr "Fidži"
+#~ msgid "Republic of Serbia"
+#~ msgstr "Srbská republika"
 
-#~ msgid "Falkland Islands (Malvinas)"
-#~ msgstr "Falklandy (Malvíny)"
+#~ msgid "Seychelles"
+#~ msgstr "Seychely"
 
-#~ msgid "Federal Democratic Republic of Ethiopia"
-#~ msgstr "Etiópska federatívna demokratická republika"
+#~ msgid "Republic of Seychelles"
+#~ msgstr "Seychelská republika"
 
-#~ msgid "Republic of Estonia"
-#~ msgstr "Estónska republika"
+#~ msgid "Sierra Leone"
+#~ msgstr "Sierra Leone"
 
-#~ msgid "Eritrea"
-#~ msgstr "Eritrea"
+#~ msgid "Republic of Sierra Leone"
+#~ msgstr "Sierraleonská republika"
 
-#~ msgid "Republic of Equatorial Guinea"
-#~ msgstr "Republika Rovníkovej Guiney"
+#~ msgid "Republic of Singapore"
+#~ msgstr "Singapurská republika"
 
-#~ msgid "Equatorial Guinea"
-#~ msgstr "Rovníková Guinea"
+#~ msgid "Slovak Republic"
+#~ msgstr "Slovenská republika"
 
-#~ msgid "Republic of El Salvador"
-#~ msgstr "Salvádorská republika"
+#~ msgid "Republic of Slovenia"
+#~ msgstr "Slovinská republika"
 
-#~ msgid "Arab Republic of Egypt"
-#~ msgstr "Egyptská arabská republika"
+#~ msgid "Solomon Islands"
+#~ msgstr "Šalamúnove ostrovy"
 
-#~ msgid "Republic of Ecuador"
-#~ msgstr "Ekvádorská republika"
+#~ msgid "Somalia"
+#~ msgstr "Somálsko"
 
-#~ msgid "Commonwealth of Dominica"
-#~ msgstr "Dominické spoločenstvo"
+#~ msgid "Somali Republic"
+#~ msgstr "Somálska republika"
 
-#~ msgid "Dominica"
-#~ msgstr "Dominika"
+#~ msgid "Republic of South Africa"
+#~ msgstr "Juhoafrická republika"
 
-#~ msgid "Republic of Djibouti"
-#~ msgstr "Džibutská republika"
+#~ msgid "South Georgia and the South Sandwich Islands"
+#~ msgstr "Južná Georgia a Južné Sandwichove ostrovy"
 
-#~ msgid "Djibouti"
-#~ msgstr "Džibutsko"
+#~ msgid "Kingdom of Spain"
+#~ msgstr "Španielske kráľovstvo"
 
-#~ msgid "Kingdom of Denmark"
-#~ msgstr "Dánske kráľovstvo"
+#~ msgid "Democratic Socialist Republic of Sri Lanka"
+#~ msgstr "Srílanská demokratická socialistická republika"
 
-#~ msgid "Republic of Cyprus"
-#~ msgstr "Cyperská republika"
+#~ msgid "Sudan"
+#~ msgstr "Sudán"
 
-#~ msgid "Cyprus"
-#~ msgstr "Cyprus"
+#~ msgid "Republic of the Sudan"
+#~ msgstr "Sudánska republika"
 
-#~ msgid "Republic of Cuba"
-#~ msgstr "Kubánska republika"
+#~ msgid "Suriname"
+#~ msgstr "Surinam"
 
-#~ msgid "Cuba"
-#~ msgstr "Kuba"
+#~ msgid "Republic of Suriname"
+#~ msgstr "Surinamská republika"
 
-#~ msgid "Republic of Croatia"
-#~ msgstr "Chorvátska republika"
+#~ msgid "Svalbard and Jan Mayen"
+#~ msgstr "Svalbard a Jan Mayen"
 
-#, fuzzy
-#~ msgid "Republic of Côte d'Ivoire"
-#~ msgstr "Republika Pobrežia Slonoviny"
+#~ msgid "Swaziland"
+#~ msgstr "Svazijsko"
 
-#~ msgid "Côte d'Ivoire"
-#~ msgstr "Pobrežie Slonoviny"
+#~ msgid "Kingdom of Swaziland"
+#~ msgstr "Svazijské kráľovstvo"
 
-#~ msgid "Republic of Costa Rica"
-#~ msgstr "Kostarická republika"
+#~ msgid "Kingdom of Sweden"
+#~ msgstr "Švédske kráľovstvo"
 
-#~ msgid "Cook Islands"
-#~ msgstr "Cookove ostrovy"
+#~ msgid "Swiss Confederation"
+#~ msgstr "Švajčiarska konfederácia"
 
-#~ msgid "Congo, The Democratic Republic of the"
-#~ msgstr "Konžská demokratická republika"
+#~ msgid "Syrian Arab Republic"
+#~ msgstr "Sýrska arabská republika"
 
-#~ msgid "Republic of the Congo"
-#~ msgstr "Konžská republika"
+#~ msgid "Taiwan, Province of China"
+#~ msgstr "Taiwan, provincia Číny"
 
-#~ msgid "Congo"
-#~ msgstr "Kongo"
+#~ msgid "Republic of Tajikistan"
+#~ msgstr "Tadžická republika"
 
-#~ msgid "Union of the Comoros"
-#~ msgstr "Komorský zväz"
+#~ msgid "Tanzania, United Republic of"
+#~ msgstr "Tanzánijská zjednotená republika"
 
-#~ msgid "Comoros"
-#~ msgstr "Komory"
+#~ msgid "United Republic of Tanzania"
+#~ msgstr "Tanzánijská zjednotená republika"
 
-#~ msgid "Republic of Colombia"
-#~ msgstr "Kolumbijská republika"
+#~ msgid "Kingdom of Thailand"
+#~ msgstr "Thajské kráľovstvo"
 
-#~ msgid "Cocos (Keeling) Islands"
-#~ msgstr "Kokosové ostrovy"
+#~ msgid "Timor-Leste"
+#~ msgstr "Východný Timor"
 
-#~ msgid "Christmas Island"
-#~ msgstr "Vianočný ostrov"
+#~ msgid "Democratic Republic of Timor-Leste"
+#~ msgstr "Východotimorská demokratická republika"
 
-#~ msgid "People's Republic of China"
-#~ msgstr "Čínska ľudová republika"
+#~ msgid "Togo"
+#~ msgstr "Togo"
 
-#~ msgid "Republic of Chile"
-#~ msgstr "Čilská republika"
+#~ msgid "Togolese Republic"
+#~ msgstr "Togská republika"
 
-#~ msgid "Republic of Chad"
-#~ msgstr "Čadská republika"
+#~ msgid "Tokelau"
+#~ msgstr "Tokelau"
 
-#~ msgid "Chad"
-#~ msgstr "Čad"
+#~ msgid "Tonga"
+#~ msgstr "Tonga"
 
-#~ msgid "Central African Republic"
-#~ msgstr "Stredoafrická republika"
+#~ msgid "Kingdom of Tonga"
+#~ msgstr "Tongské kráľovstvo"
 
-#~ msgid "Cayman Islands"
-#~ msgstr "Kajmanie ostrovy"
+#~ msgid "Trinidad and Tobago"
+#~ msgstr "Trinidad a Tobago"
 
-#~ msgid "Republic of Cape Verde"
-#~ msgstr "Kapverdská republika"
+#~ msgid "Republic of Trinidad and Tobago"
+#~ msgstr "Republika Trinidadu a Tobaga"
 
-#~ msgid "Cape Verde"
-#~ msgstr "Kapverdy"
+#~ msgid "Republic of Tunisia"
+#~ msgstr "Tuniská republika"
 
-#~ msgid "Republic of Cameroon"
-#~ msgstr "Kamerunská republika"
+#~ msgid "Republic of Turkey"
+#~ msgstr "Turecká republika"
 
-#~ msgid "Cameroon"
-#~ msgstr "Kamerun"
+#~ msgid "Turkmenistan"
+#~ msgstr "Turkménsko"
 
-#~ msgid "Kingdom of Cambodia"
-#~ msgstr "Kambodžské kráľovstvo"
+#~ msgid "Turks and Caicos Islands"
+#~ msgstr "Ostrovy Turks a Caicos"
 
-#~ msgid "Cambodia"
-#~ msgstr "Kambodža"
+#~ msgid "Tuvalu"
+#~ msgstr "Tuvalu"
 
-#~ msgid "Republic of Burundi"
-#~ msgstr "Burundská republika"
+#~ msgid "Uganda"
+#~ msgstr "Uganda"
 
-#~ msgid "Burundi"
-#~ msgstr "Burundi"
+#~ msgid "Republic of Uganda"
+#~ msgstr "Ugandská republika"
 
-#~ 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 "Republic of Bulgaria"
-#~ msgstr "Bulharská republika"
+#~ msgid "United States of America"
+#~ msgstr "Spojené štáty americké"
 
-#~ 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 "British Indian Ocean Territory"
-#~ msgstr "Britské indickooceánske územie"
+#~ msgid "Eastern Republic of Uruguay"
+#~ msgstr "Uruguajská východná republika"
 
-#~ msgid "Federative Republic of Brazil"
-#~ msgstr "Brazílska federatívna republika"
+#~ msgid "Republic of Uzbekistan"
+#~ msgstr "Uzbecká republika"
 
-#~ msgid "Bouvet Island"
-#~ msgstr "Bouvetov ostrov"
+#~ msgid "Republic of Vanuatu"
+#~ msgstr "Vanuatská republika"
 
-#~ msgid "Republic of Botswana"
-#~ msgstr "Botswanská republika"
+#~ msgid "Bolivarian Republic of Venezuela"
+#~ msgstr "Venezuelská bolívarovská republika"
 
-#~ msgid "Botswana"
-#~ msgstr "Botswana"
+#~ msgid "Socialist Republic of Viet Nam"
+#~ msgstr "Vietnamská socialistická republika"
 
-#~ msgid "Republic of Bosnia and Herzegovina"
-#~ msgstr "Republika Bosny a Hercegoviny"
+#~ msgid "Virgin Islands, British"
+#~ msgstr "Panenské ostrovy, Britské"
 
-#~ msgid "Republic of Bolivia"
-#~ msgstr "Bolívijská republika"
+#~ msgid "British Virgin Islands"
+#~ msgstr "Britské Panenské ostrovy"
 
-#~ msgid "Bolivia"
-#~ msgstr "Bolívia"
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "Panenské ostrovy, Americké"
 
-#~ msgid "Kingdom of Bhutan"
-#~ msgstr "Bhutánske kráľovstvo"
+#~ msgid "Virgin Islands of the United States"
+#~ msgstr "Panenské ostrovy Spojených štátov"
 
-#~ msgid "Bhutan"
-#~ msgstr "Bhután"
+#~ msgid "Wallis and Futuna"
+#~ msgstr "Wallis a Futuna"
 
-#~ msgid "Bermuda"
-#~ msgstr "Bermudy"
+#~ msgid "Western Sahara"
+#~ msgstr "Západná Sahara"
 
-#~ msgid "Republic of Benin"
-#~ msgstr "Beninská republika"
+#~ msgid "Yemen"
+#~ msgstr "Jemen"
 
-#~ msgid "Benin"
-#~ msgstr "Benin"
+#~ msgid "Republic of Yemen"
+#~ msgstr "Jemenská republika"
 
-#~ msgid "Belize"
-#~ msgstr "Belize"
+#~ msgid "Zambia"
+#~ msgstr "Zambia"
 
-#~ msgid "Kingdom of Belgium"
-#~ msgstr "Belgické kráľovstvo"
+#~ msgid "Republic of Zambia"
+#~ msgstr "Zambijská republika"
 
-#~ msgid "Republic of Belarus"
-#~ msgstr "Bieloruská republika"
+#~ msgid "Zimbabwe"
+#~ msgstr "Zimbabwe"
 
-#~ msgid "Barbados"
-#~ msgstr "Barbados"
+#~ msgid "Republic of Zimbabwe"
+#~ msgstr "Zimbabwianska republika"
 
-#~ msgid "People's Republic of Bangladesh"
-#~ msgstr "Bangladéšska ľudová republika"
+#, fuzzy
+#~ msgid "British Antarctic Territory"
+#~ msgstr "Britské indickooceánske územie"
 
 #, fuzzy
-#~ msgid "Kingdom of Bahrain"
-#~ msgstr "Bhutánske kráľovstvo"
+#~ msgid "Burma, Socialist Republic of the Union of"
+#~ msgstr "Vietnamská socialistická republika"
 
-#~ msgid "Bahrain"
-#~ msgstr "Bahrajn"
+#, fuzzy
+#~ msgid "French Southern and Antarctic Territories"
+#~ msgstr "Francúzske južné a antarktické územia"
 
-#~ msgid "Commonwealth of the Bahamas"
-#~ msgstr "Bahamské spoločenstvo"
+#, fuzzy
+#~ msgid "German Democratic Republic"
+#~ msgstr "Laoská ľudovodemokratická republika"
 
-#~ msgid "Republic of Azerbaijan"
-#~ msgstr "Azerbajdžanská republika"
+#, fuzzy
+#~ msgid "Germany, Federal Republic of"
+#~ msgstr "Nemecká spolková republika"
 
-#~ msgid "Azerbaijan"
-#~ msgstr "Azerbajdžan"
+#, fuzzy
+#~ msgid "Gilbert and Ellice Islands"
+#~ msgstr "Ostrovy Turks a Caicos"
 
-#~ msgid "Republic of Austria"
-#~ msgstr "Rakúska republika"
+#, fuzzy
+#~ msgid "Johnston Island"
+#~ msgstr "Cookove ostrovy"
 
-#~ msgid "Aruba"
-#~ msgstr "Aruba"
+#, fuzzy
+#~ msgid "Midway Islands"
+#~ msgstr "Kajmanie ostrovy"
 
-#~ msgid "Republic of Armenia"
-#~ msgstr "Arménska republika"
+#, fuzzy
+#~ msgid "Panama, Republic of"
+#~ msgstr "Macedónska republika"
 
-#~ msgid "Argentine Republic"
-#~ msgstr "Argentínska republika"
+#, fuzzy
+#~ msgid "Romania, Socialist Republic of"
+#~ msgstr "Vietnamská socialistická republika"
 
-#~ msgid "Antigua and Barbuda"
-#~ msgstr "Antigua a Barbuda"
+#, fuzzy
+#~ msgid "Serbia and Montenegro"
+#~ msgstr "Čiernohorská republika"
 
-#~ msgid "Antarctica"
-#~ msgstr "Antarktída"
+#, fuzzy
+#~ msgid "Upper Volta, Republic of"
+#~ msgstr "Moldavská republika"
 
-#~ msgid "Anguilla"
-#~ msgstr "Anguilla"
+#, fuzzy
+#~ msgid "Vatican City State (Holy See)"
+#~ msgstr "Svätá stolica (Vatikánsky mestský štát)"
 
-#~ msgid "Republic of Angola"
-#~ msgstr "Angolská republika"
+#, fuzzy
+#~ msgid "Viet-Nam, Democratic Republic of"
+#~ msgstr "Kórejská ľudovodemokratická republika"
 
-#~ msgid "Angola"
-#~ msgstr "Angola"
+#, fuzzy
+#~ msgid "Wake Island"
+#~ msgstr "Faerské ostrovy"
 
-#~ msgid "Principality of Andorra"
-#~ msgstr "Andorrské kniežatstvo"
+#, fuzzy
+#~ msgid "Yemen, Democratic, People's Democratic Republic of"
+#~ msgstr "Kórejská ľudovodemokratická republika"
 
-#~ msgid "Andorra"
-#~ msgstr "Andorra"
+#, fuzzy
+#~ msgid "Yemen, Yemen Arab Republic"
+#~ msgstr "Sýrska arabská republika"
 
-#~ msgid "American Samoa"
-#~ msgstr "Americká Samoa"
+#, fuzzy
+#~ msgid "Yugoslavia, Socialist Federal Republic of"
+#~ msgstr "Tanzánijská zjednotená republika"
 
-#~ msgid "People's Democratic Republic of Algeria"
-#~ msgstr "Alžírska demokratická ľudová republika"
+#, fuzzy
+#~ msgid "Zaire, Republic of"
+#~ msgstr "Kórejská republika"
 
-#~ msgid "Republic of Albania"
-#~ msgstr "Albánska republika"
+#~ msgid "The Transitional Islamic State of Afghanistan"
+#~ msgstr "Dočasný afganský islamský štát"
 
-#~ msgid "Åland Islands"
-#~ msgstr "Ålandy"
+#~ msgid "State of Bahrain"
+#~ msgstr "Bahrajnské kráľovstvo"
 
-#, fuzzy
-#~ msgid "Islamic Republic of Afghanistan"
-#~ msgstr "Pakistanská islamská republika"
+#~ msgid "Kingdom of Nepal"
+#~ msgstr "Nepálske kráľovstvo"
 
-#~ msgid "Afghanistan"
-#~ msgstr "Afganistan"
+#~ msgid "Great Britain"
+#~ msgstr "Spojené kráľovstvo"
diff --git a/slovene/po/countries.sl.po b/slovene/po/countries.sl.po
index c85133542d2..5a7bf8f11c4 100644
--- a/slovene/po/countries.sl.po
+++ b/slovene/po/countries.sl.po
@@ -9,413 +9,426 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 #, fuzzy
 msgid "United Arab Emirates"
 msgstr "Združene države Amerike"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 #, fuzzy
 msgid "Armenia"
 msgstr "Argentina"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Avstrija"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Avstralija"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Bolgarija"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Brazilija"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Belorusija"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Švica"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Čile"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Kitajska"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Kolumbija"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "Češka"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Nemčija"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Danska"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "Dominikanska republika"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Estonija"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Španija"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 #, fuzzy
 msgid "Ethiopia"
 msgstr "Estonija"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Finska"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Ferski otoki"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Francija"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
-msgstr "Velika Britanija"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
+msgstr "Združeno kraljestvo"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 #, fuzzy
 msgid "Grenada"
 msgstr "Grenlandija"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Grenlandija"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Grčija"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Honduras"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Hrvaška"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Madžarska"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Indonezija"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Irska"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "Indija"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Islandija"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Italija"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Japonska"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 #, fuzzy
 msgid "Kenya"
 msgstr "Koreja"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Koreja"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Kuvajt"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Šri lanka"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Litva"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Latvija"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:300
+#, fuzzy
+#| msgid "Dominican Republic"
+msgid "Macedonia, Republic of"
+msgstr "Dominikanska republika"
+
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Mehika"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Malezija"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Nizozemska"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Norveška"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Nova Zelandija"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:330
 #, fuzzy
 msgid "Panama"
 msgstr "Kanada"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Peru"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Filipini"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Poljska"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Portugalska"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Romunija"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Rusija"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Savdska Arabija"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Švedska"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Slovenija"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Slovaška"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Tajska"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:381
+msgid "Tajikistan"
+msgstr ""
+
+#: ../../english/template/debian/countries.wml:384
 #, fuzzy
 msgid "Tunisia"
 msgstr "Rusija"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Turčija"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:393
 #, fuzzy
 msgid "Ukraine"
 msgstr "Francija"
 
-#: ../../english/template/debian/countries.wml:305
-msgid "United Kingdom"
-msgstr "Združeno kraljestvo"
-
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Združene države Amerike"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Venecuela"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
-msgstr ""
+msgstr "Vietnam"
+
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Južna Afrika"
 
 #~ msgid "Yugoslavia"
 #~ msgstr "Jugoslavija"
+
+#~ msgid "Great Britain"
+#~ msgstr "Velika Britanija"
diff --git a/spanish/po/countries.es.po b/spanish/po/countries.es.po
index f35d10e2dd7..76c31bbdca8 100644
--- a/spanish/po/countries.es.po
+++ b/spanish/po/countries.es.po
@@ -415,11 +415,15 @@ msgid "Vietnam"
 msgstr "Vietnam"
 
 #: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Sudáfrica"
 
-#~ msgid "Yugoslavia"
-#~ msgstr "Yugoslavia"
-
 #~ msgid "Great Britain"
 #~ msgstr "Reino Unido"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "Yugoslavia"
diff --git a/swedish/po/countries.sv.po b/swedish/po/countries.sv.po
index c6544d48d4b..73c1039cd7d 100644
--- a/swedish/po/countries.sv.po
+++ b/swedish/po/countries.sv.po
@@ -417,6 +417,10 @@ msgid "Vietnam"
 msgstr "Vietnam"
 
 #: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Sydafrika"
 
diff --git a/tamil/po/countries.ta.po b/tamil/po/countries.ta.po
index 3d42c88d6cb..4345064fab2 100644
--- a/tamil/po/countries.ta.po
+++ b/tamil/po/countries.ta.po
@@ -13,404 +13,415 @@ msgstr ""
 "X-Poedit-Country: INDIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../../english/template/debian/countries.wml:26
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "ஐக்கிய அரபு எமிரேயம்"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "அல்பானியா"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "அர்மேனியா"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "அர்ஜன்டைனா"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "ஆஸ்டிரியா"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "ஆஸ்திரேலியா"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "போஸ்னியா மற்றும் ஹெர்சகோவினா"
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "வங்காளதேசம்"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "பெல்ஜியம்"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "பல்கேரியா"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "பிரேசில்"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "பஹாமஸ்"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "பெலாரஸ்"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "கனடா"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "சுவிட்சர்லாந்து"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "சிலி"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "சைனா"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "கொலம்பியா"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "காஸ்டா ரிகா"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "செக் குடியரசு"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "ஜெர்மனி"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "டெமார்க்"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "டொமினிகன் குடியரசு"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "ஈகுவேடார்"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "எஸ்டோனியா"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "எகிப்து"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "ஸ்பெயின்"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "எதியோபியா"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "பிஃன்லாந்து"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "பாஃரோ தீவு"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "பிரான்ஸ்"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
-msgstr "அகண்ட பிரிட்டன்"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
+msgstr "இக்கிய இராஜ்ஜியம்"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "கிரெனாடா"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "கிரீன்லாந்து"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "கிரேக்கம்"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "குவஹாத்திமாலா"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "ஹாங்காங்"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "ஹோன்டுராஸ்"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "குரோயேஷியா"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "ஹங்கேரி"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "இந்தோனேஷியா"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "அயர்லாந்து"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "இஸ்ரேல்"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "பாரதம்"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "ஐஸ்லாந்து"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "இத்தாலி"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "ஜோர்டான்"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "ஜப்பான்"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "கென்யா"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "கொரியா"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "குவைத்"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "கஜகஸ்தான்"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "இலங்கை"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "லித்துவானியா"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "லக்ஸம்பரக்"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "லத்வியா"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "மொராகோ"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "மான்டெனெக்ரோ"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "மடகாஸகர"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:300
+msgid "Macedonia, Republic of"
+msgstr "மெசிடோனியா குடியரசு"
+
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "மெக்ஸிகோ"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "மலேசியா"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "நீகுரகோவா"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "நெதர்லாந்து"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "நார்வே"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "நியூசிலாந்து"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "பனாமா"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "பெரு"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr ""
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "பிலிப்பைன்ஸ்"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "பாகிஸ்தான்"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "போலாந்து"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "போர்ட்சுகல்"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "ருமேனியா"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "செர்பியா"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "ரஷ்யா"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "சவுதி அரேபியா"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "ஸ்வீடன்"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "சிங்கப்பூர்"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "ஸ்லோவேனியா"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "ஸ்லோவேகியா"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "எல் சல்வேடார்"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "தாய்லாந்து"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:381
+msgid "Tajikistan"
+msgstr "தசிக்கிசுதான்"
+
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "துனிஷியா"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "துருக்கி"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "தைவான்"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "யுக்ரைன்"
 
-#: ../../english/template/debian/countries.wml:305
-msgid "United Kingdom"
-msgstr "இக்கிய இராஜ்ஜியம்"
-
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "ஐக்கிய மாகாணங்கள்"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "உருகுவே"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:402
 #, fuzzy
 #| msgid "Pakistan"
 msgid "Uzbekistan"
 msgstr "பாகிஸ்தான்"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "வெனிசுலா"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "வியட்னாம்"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "வனாட்டு"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "தென்னாப்பிக்கா"
+
+#~ msgid "Great Britain"
+#~ msgstr "அகண்ட பிரிட்டன்"
diff --git a/turkish/po/countries.tr.po b/turkish/po/countries.tr.po
index 37caaa47775..8700c3892c3 100644
--- a/turkish/po/countries.tr.po
+++ b/turkish/po/countries.tr.po
@@ -21,10 +21,8 @@ msgstr ""
 "Plural-Forms:  nplurals=1; plural=0;\n"
 
 #: ../../english/template/debian/countries.wml:111
-#, fuzzy
-#| msgid "United States"
 msgid "United Arab Emirates"
-msgstr "ABD"
+msgstr "Birleşik Arap Emirlikleri"
 
 #: ../../english/template/debian/countries.wml:114
 msgid "Albania"
@@ -423,5 +421,9 @@ msgid "Vietnam"
 msgstr "Vietnam"
 
 #: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Güney Afrika"
diff --git a/ukrainian/po/countries.uk.po b/ukrainian/po/countries.uk.po
index be1cc1b6f2f..638072aa40c 100644
--- a/ukrainian/po/countries.uk.po
+++ b/ukrainian/po/countries.uk.po
@@ -14,402 +14,413 @@ msgstr ""
 "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
+#: ../../english/template/debian/countries.wml:111
 msgid "United Arab Emirates"
 msgstr "Об’єднані Арабські Емірати"
 
-#: ../../english/template/debian/countries.wml:29
+#: ../../english/template/debian/countries.wml:114
 msgid "Albania"
 msgstr "Албанія"
 
-#: ../../english/template/debian/countries.wml:32
+#: ../../english/template/debian/countries.wml:117
 msgid "Armenia"
 msgstr "Вірменія"
 
-#: ../../english/template/debian/countries.wml:35
+#: ../../english/template/debian/countries.wml:120
 msgid "Argentina"
 msgstr "Аргентина"
 
-#: ../../english/template/debian/countries.wml:38
+#: ../../english/template/debian/countries.wml:123
 msgid "Austria"
 msgstr "Австрія"
 
-#: ../../english/template/debian/countries.wml:41
+#: ../../english/template/debian/countries.wml:126
 msgid "Australia"
 msgstr "Австралія"
 
-#: ../../english/template/debian/countries.wml:44
+#: ../../english/template/debian/countries.wml:129
 msgid "Bosnia and Herzegovina"
 msgstr "Боснія і Герцеговина"
 
-#: ../../english/template/debian/countries.wml:47
+#: ../../english/template/debian/countries.wml:132
 msgid "Bangladesh"
 msgstr "Бангладеш"
 
-#: ../../english/template/debian/countries.wml:50
+#: ../../english/template/debian/countries.wml:135
 msgid "Belgium"
 msgstr "Бельгія"
 
-#: ../../english/template/debian/countries.wml:53
+#: ../../english/template/debian/countries.wml:138
 msgid "Bulgaria"
 msgstr "Болгарія"
 
-#: ../../english/template/debian/countries.wml:56
+#: ../../english/template/debian/countries.wml:141
 msgid "Brazil"
 msgstr "Бразилія"
 
-#: ../../english/template/debian/countries.wml:59
+#: ../../english/template/debian/countries.wml:144
 msgid "Bahamas"
 msgstr "Багамські острови"
 
-#: ../../english/template/debian/countries.wml:62
+#: ../../english/template/debian/countries.wml:147
 msgid "Belarus"
 msgstr "Білорусь"
 
-#: ../../english/template/debian/countries.wml:65
+#: ../../english/template/debian/countries.wml:150
 msgid "Canada"
 msgstr "Канада"
 
-#: ../../english/template/debian/countries.wml:68
+#: ../../english/template/debian/countries.wml:153
 msgid "Switzerland"
 msgstr "Швейцарія"
 
-#: ../../english/template/debian/countries.wml:71
+#: ../../english/template/debian/countries.wml:156
 msgid "Chile"
 msgstr "Чилі"
 
-#: ../../english/template/debian/countries.wml:74
+#: ../../english/template/debian/countries.wml:159
 msgid "China"
 msgstr "Китай"
 
-#: ../../english/template/debian/countries.wml:77
+#: ../../english/template/debian/countries.wml:162
 msgid "Colombia"
 msgstr "Колумбія"
 
-#: ../../english/template/debian/countries.wml:80
+#: ../../english/template/debian/countries.wml:165
 msgid "Costa Rica"
 msgstr "Коста-Ріка"
 
-#: ../../english/template/debian/countries.wml:83
+#: ../../english/template/debian/countries.wml:168
 msgid "Czech Republic"
 msgstr "Чеська Республіка"
 
-#: ../../english/template/debian/countries.wml:86
+#: ../../english/template/debian/countries.wml:171
 msgid "Germany"
 msgstr "Німеччина"
 
-#: ../../english/template/debian/countries.wml:89
+#: ../../english/template/debian/countries.wml:174
 msgid "Denmark"
 msgstr "Данія"
 
-#: ../../english/template/debian/countries.wml:92
+#: ../../english/template/debian/countries.wml:177
 msgid "Dominican Republic"
 msgstr "Домініканська Республіка"
 
-#: ../../english/template/debian/countries.wml:95
+#: ../../english/template/debian/countries.wml:180
 msgid "Algeria"
 msgstr "Алжир"
 
-#: ../../english/template/debian/countries.wml:98
+#: ../../english/template/debian/countries.wml:183
 msgid "Ecuador"
 msgstr "Еквадор"
 
-#: ../../english/template/debian/countries.wml:101
+#: ../../english/template/debian/countries.wml:186
 msgid "Estonia"
 msgstr "Естонія"
 
-#: ../../english/template/debian/countries.wml:104
+#: ../../english/template/debian/countries.wml:189
 msgid "Egypt"
 msgstr "Єгипет"
 
-#: ../../english/template/debian/countries.wml:107
+#: ../../english/template/debian/countries.wml:192
 msgid "Spain"
 msgstr "Іспанія"
 
-#: ../../english/template/debian/countries.wml:110
+#: ../../english/template/debian/countries.wml:195
 msgid "Ethiopia"
 msgstr "Ефіопія"
 
-#: ../../english/template/debian/countries.wml:113
+#: ../../english/template/debian/countries.wml:198
 msgid "Finland"
 msgstr "Фінляндія"
 
-#: ../../english/template/debian/countries.wml:116
+#: ../../english/template/debian/countries.wml:201
 msgid "Faroe Islands"
 msgstr "Фарерські Острови"
 
-#: ../../english/template/debian/countries.wml:119
+#: ../../english/template/debian/countries.wml:204
 msgid "France"
 msgstr "Франція"
 
-#: ../../english/template/debian/countries.wml:122
-msgid "Great Britain"
+#: ../../english/template/debian/countries.wml:207
+msgid "United Kingdom"
 msgstr "Великобританія"
 
-#: ../../english/template/debian/countries.wml:125
+#: ../../english/template/debian/countries.wml:210
 msgid "Grenada"
 msgstr "Гренада"
 
-#: ../../english/template/debian/countries.wml:128
+#: ../../english/template/debian/countries.wml:213
 msgid "Georgia"
 msgstr "Грузія"
 
-#: ../../english/template/debian/countries.wml:131
+#: ../../english/template/debian/countries.wml:216
 msgid "Greenland"
 msgstr "Гренландія"
 
-#: ../../english/template/debian/countries.wml:134
+#: ../../english/template/debian/countries.wml:219
 msgid "Greece"
 msgstr "Греція"
 
-#: ../../english/template/debian/countries.wml:137
+#: ../../english/template/debian/countries.wml:222
 msgid "Guatemala"
 msgstr "Гватемала"
 
-#: ../../english/template/debian/countries.wml:140
+#: ../../english/template/debian/countries.wml:225
 msgid "Hong Kong"
 msgstr "Гонконг"
 
-#: ../../english/template/debian/countries.wml:143
+#: ../../english/template/debian/countries.wml:228
 msgid "Honduras"
 msgstr "Гондурас"
 
-#: ../../english/template/debian/countries.wml:146
+#: ../../english/template/debian/countries.wml:231
 msgid "Croatia"
 msgstr "Хорватія"
 
-#: ../../english/template/debian/countries.wml:149
+#: ../../english/template/debian/countries.wml:234
 msgid "Hungary"
 msgstr "Угорщина"
 
-#: ../../english/template/debian/countries.wml:152
+#: ../../english/template/debian/countries.wml:237
 msgid "Indonesia"
 msgstr "Індонезія"
 
-#: ../../english/template/debian/countries.wml:155
+#: ../../english/template/debian/countries.wml:240
 msgid "Iran"
 msgstr "Іран"
 
-#: ../../english/template/debian/countries.wml:158
+#: ../../english/template/debian/countries.wml:243
 msgid "Ireland"
 msgstr "Ірландія"
 
-#: ../../english/template/debian/countries.wml:161
+#: ../../english/template/debian/countries.wml:246
 msgid "Israel"
 msgstr "Ізраїль"
 
-#: ../../english/template/debian/countries.wml:164
+#: ../../english/template/debian/countries.wml:249
 msgid "India"
 msgstr "Індія"
 
-#: ../../english/template/debian/countries.wml:167
+#: ../../english/template/debian/countries.wml:252
 msgid "Iceland"
 msgstr "Ісландія"
 
-#: ../../english/template/debian/countries.wml:170
+#: ../../english/template/debian/countries.wml:255
 msgid "Italy"
 msgstr "Італія"
 
-#: ../../english/template/debian/countries.wml:173
+#: ../../english/template/debian/countries.wml:258
 msgid "Jordan"
 msgstr "Йорданія"
 
-#: ../../english/template/debian/countries.wml:176
+#: ../../english/template/debian/countries.wml:261
 msgid "Japan"
 msgstr "Японія"
 
-#: ../../english/template/debian/countries.wml:179
+#: ../../english/template/debian/countries.wml:264
 msgid "Kenya"
 msgstr "Кенія"
 
-#: ../../english/template/debian/countries.wml:182
+#: ../../english/template/debian/countries.wml:267
 msgid "Korea"
 msgstr "Корея"
 
-#: ../../english/template/debian/countries.wml:185
+#: ../../english/template/debian/countries.wml:270
 msgid "Kuwait"
 msgstr "Кувейт"
 
-#: ../../english/template/debian/countries.wml:188
+#: ../../english/template/debian/countries.wml:273
 msgid "Kazakhstan"
 msgstr "Казахстан"
 
-#: ../../english/template/debian/countries.wml:191
+#: ../../english/template/debian/countries.wml:276
 msgid "Sri Lanka"
 msgstr "Шрі-Ланка"
 
-#: ../../english/template/debian/countries.wml:194
+#: ../../english/template/debian/countries.wml:279
 msgid "Lithuania"
 msgstr "Литва"
 
-#: ../../english/template/debian/countries.wml:197
+#: ../../english/template/debian/countries.wml:282
 msgid "Luxembourg"
 msgstr "Люксембург"
 
-#: ../../english/template/debian/countries.wml:200
+#: ../../english/template/debian/countries.wml:285
 msgid "Latvia"
 msgstr "Латвія"
 
-#: ../../english/template/debian/countries.wml:203
+#: ../../english/template/debian/countries.wml:288
 msgid "Morocco"
 msgstr "Марокко"
 
-#: ../../english/template/debian/countries.wml:206
+#: ../../english/template/debian/countries.wml:291
 msgid "Moldova"
 msgstr "Молдова"
 
-#: ../../english/template/debian/countries.wml:209
+#: ../../english/template/debian/countries.wml:294
 msgid "Montenegro"
 msgstr "Чорногорія"
 
-#: ../../english/template/debian/countries.wml:212
+#: ../../english/template/debian/countries.wml:297
 msgid "Madagascar"
 msgstr "Мадагаскар"
 
-#: ../../english/template/debian/countries.wml:215
+#: ../../english/template/debian/countries.wml:300
+msgid "Macedonia, Republic of"
+msgstr "Македонія"
+
+#: ../../english/template/debian/countries.wml:303
 msgid "Mongolia"
 msgstr "Монголія"
 
-#: ../../english/template/debian/countries.wml:218
+#: ../../english/template/debian/countries.wml:306
 msgid "Malta"
 msgstr "Мальта"
 
-#: ../../english/template/debian/countries.wml:221
+#: ../../english/template/debian/countries.wml:309
 msgid "Mexico"
 msgstr "Мексика"
 
-#: ../../english/template/debian/countries.wml:224
+#: ../../english/template/debian/countries.wml:312
 msgid "Malaysia"
 msgstr "Малайзія"
 
-#: ../../english/template/debian/countries.wml:227
+#: ../../english/template/debian/countries.wml:315
 msgid "New Caledonia"
 msgstr "Нова Каледонія"
 
-#: ../../english/template/debian/countries.wml:230
+#: ../../english/template/debian/countries.wml:318
 msgid "Nicaragua"
 msgstr "Нікарагуа"
 
-#: ../../english/template/debian/countries.wml:233
+#: ../../english/template/debian/countries.wml:321
 msgid "Netherlands"
 msgstr "Нідерланди"
 
-#: ../../english/template/debian/countries.wml:236
+#: ../../english/template/debian/countries.wml:324
 msgid "Norway"
 msgstr "Норвегія"
 
-#: ../../english/template/debian/countries.wml:239
+#: ../../english/template/debian/countries.wml:327
 msgid "New Zealand"
 msgstr "Нова Зеландія"
 
-#: ../../english/template/debian/countries.wml:242
+#: ../../english/template/debian/countries.wml:330
 msgid "Panama"
 msgstr "Панама"
 
-#: ../../english/template/debian/countries.wml:245
+#: ../../english/template/debian/countries.wml:333
 msgid "Peru"
 msgstr "Перу"
 
-#: ../../english/template/debian/countries.wml:248
+#: ../../english/template/debian/countries.wml:336
 msgid "French Polynesia"
 msgstr "Французька Полінезія"
 
-#: ../../english/template/debian/countries.wml:251
+#: ../../english/template/debian/countries.wml:339
 msgid "Philippines"
 msgstr "Філіппіни"
 
-#: ../../english/template/debian/countries.wml:254
+#: ../../english/template/debian/countries.wml:342
 msgid "Pakistan"
 msgstr "Пакистан"
 
-#: ../../english/template/debian/countries.wml:257
+#: ../../english/template/debian/countries.wml:345
 msgid "Poland"
 msgstr "Польща"
 
-#: ../../english/template/debian/countries.wml:260
+#: ../../english/template/debian/countries.wml:348
 msgid "Portugal"
 msgstr "Португалія"
 
-#: ../../english/template/debian/countries.wml:263
+#: ../../english/template/debian/countries.wml:351
 msgid "Romania"
 msgstr "Румунія"
 
-#: ../../english/template/debian/countries.wml:266
+#: ../../english/template/debian/countries.wml:354
 msgid "Serbia"
 msgstr "Сербія"
 
-#: ../../english/template/debian/countries.wml:269
+#: ../../english/template/debian/countries.wml:357
 msgid "Russia"
 msgstr "Росія"
 
-#: ../../english/template/debian/countries.wml:272
+#: ../../english/template/debian/countries.wml:360
 msgid "Saudi Arabia"
 msgstr "Саудівська Аравія"
 
-#: ../../english/template/debian/countries.wml:275
+#: ../../english/template/debian/countries.wml:363
 msgid "Sweden"
 msgstr "Швеція"
 
-#: ../../english/template/debian/countries.wml:278
+#: ../../english/template/debian/countries.wml:366
 msgid "Singapore"
 msgstr "Сінгапур"
 
-#: ../../english/template/debian/countries.wml:281
+#: ../../english/template/debian/countries.wml:369
 msgid "Slovenia"
 msgstr "Словенія"
 
-#: ../../english/template/debian/countries.wml:284
+#: ../../english/template/debian/countries.wml:372
 msgid "Slovakia"
 msgstr "Словаччина"
 
-#: ../../english/template/debian/countries.wml:287
+#: ../../english/template/debian/countries.wml:375
 msgid "El Salvador"
 msgstr "Сальвадор"
 
-#: ../../english/template/debian/countries.wml:290
+#: ../../english/template/debian/countries.wml:378
 msgid "Thailand"
 msgstr "Таїланд"
 
-#: ../../english/template/debian/countries.wml:293
+#: ../../english/template/debian/countries.wml:381
+msgid "Tajikistan"
+msgstr "Таджикистан"
+
+#: ../../english/template/debian/countries.wml:384
 msgid "Tunisia"
 msgstr "Туніс"
 
-#: ../../english/template/debian/countries.wml:296
+#: ../../english/template/debian/countries.wml:387
 msgid "Turkey"
 msgstr "Туреччина"
 
-#: ../../english/template/debian/countries.wml:299
+#: ../../english/template/debian/countries.wml:390
 msgid "Taiwan"
 msgstr "Тайвань"
 
-#: ../../english/template/debian/countries.wml:302
+#: ../../english/template/debian/countries.wml:393
 msgid "Ukraine"
 msgstr "Україна"
 
-#: ../../english/template/debian/countries.wml:305
-msgid "United Kingdom"
-msgstr "Великобританія"
-
-#: ../../english/template/debian/countries.wml:308
+#: ../../english/template/debian/countries.wml:396
 msgid "United States"
 msgstr "Сполучені Штати"
 
-#: ../../english/template/debian/countries.wml:311
+#: ../../english/template/debian/countries.wml:399
 msgid "Uruguay"
 msgstr "Уругвай"
 
-#: ../../english/template/debian/countries.wml:314
+#: ../../english/template/debian/countries.wml:402
 msgid "Uzbekistan"
 msgstr "Узбекистан"
 
-#: ../../english/template/debian/countries.wml:317
+#: ../../english/template/debian/countries.wml:405
 msgid "Venezuela"
 msgstr "Венесуела"
 
-#: ../../english/template/debian/countries.wml:320
+#: ../../english/template/debian/countries.wml:408
 msgid "Vietnam"
 msgstr "В'єтнам"
 
-#: ../../english/template/debian/countries.wml:323
+#: ../../english/template/debian/countries.wml:411
+msgid "Vanuatu"
+msgstr "Вануату"
+
+#: ../../english/template/debian/countries.wml:414
 msgid "South Africa"
 msgstr "Південна Африка"
+
+#~ msgid "Great Britain"
+#~ msgstr "Великобританія"