diff --git a/README.md b/README.md
index c9424d8a..865ff2a6 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ PHP ISO Codes
 This library used to get localized names of countries, currencies, languages and scripts.
 Based on Python's [pycountry](https://pypi.python.org/pypi/pycountry) and Debian's [iso-codes](http://pkg-isocodes.alioth.debian.org/).
 
-Database version: iso-codes-3.77-329-g63b320d from 2018-01-05 11:44
+Database version: iso-codes-3.77-332-g813a2e9a from 2018-03-13 22:51
 
 ISO Standarts
 -------------
diff --git a/messages/ab/LC_MESSAGES/3166-1.mo b/messages/ab/LC_MESSAGES/3166-1.mo
index 01311bb8..194cc82e 100644
Binary files a/messages/ab/LC_MESSAGES/3166-1.mo and b/messages/ab/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ab/LC_MESSAGES/3166-1.po b/messages/ab/LC_MESSAGES/3166-1.po
index 1bf55780..46ce5f18 100644
--- a/messages/ab/LC_MESSAGES/3166-1.po
+++ b/messages/ab/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Abkhazian
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ace/LC_MESSAGES/3166-1.mo b/messages/ace/LC_MESSAGES/3166-1.mo
index 95be0f2f..f12c383c 100644
Binary files a/messages/ace/LC_MESSAGES/3166-1.mo and b/messages/ace/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ace/LC_MESSAGES/3166-1.po b/messages/ace/LC_MESSAGES/3166-1.po
index 6435dd1a..28332892 100644
--- a/messages/ace/LC_MESSAGES/3166-1.po
+++ b/messages/ace/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Achinese
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ach/LC_MESSAGES/3166-1.mo b/messages/ach/LC_MESSAGES/3166-1.mo
index 60851a3f..1ebc5d31 100644
Binary files a/messages/ach/LC_MESSAGES/3166-1.mo and b/messages/ach/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ach/LC_MESSAGES/3166-1.po b/messages/ach/LC_MESSAGES/3166-1.po
index 84dd6e92..7c101b86 100644
--- a/messages/ach/LC_MESSAGES/3166-1.po
+++ b/messages/ach/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Acoli
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/af/LC_MESSAGES/3166-1.mo b/messages/af/LC_MESSAGES/3166-1.mo
index 8fc7f5f8..915c828e 100644
Binary files a/messages/af/LC_MESSAGES/3166-1.mo and b/messages/af/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/af/LC_MESSAGES/3166-1.po b/messages/af/LC_MESSAGES/3166-1.po
index 5de845d7..06eb4142 100644
--- a/messages/af/LC_MESSAGES/3166-1.po
+++ b/messages/af/LC_MESSAGES/3166-1.po
@@ -1,15 +1,13 @@
-# Translation of ISO-3166 (country names) to Afrikaans
+# Translation of ISO 3166-1 to Afrikaans
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002,2004
-#   Alastair McKinstry <mckinstry@computer.org>, 2002.
-#   Translations from KDE desktop.po: 
-#   - Frikkie Thirion <frix@engineer.com>, 2001.
-#   Further data from the ICU project, 3.0 beta, 2004.
-#   Friedel Wolff <friedel BY translate.org.za>, 2007
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002.
+# Frikkie Thirion <frix@engineer.com>, 2001.
+# Friedel Wolff <friedel@translate.org.za>, 2007
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/af/LC_MESSAGES/3166-3.mo b/messages/af/LC_MESSAGES/3166-3.mo
index af1339c0..10c8638f 100644
Binary files a/messages/af/LC_MESSAGES/3166-3.mo and b/messages/af/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/af/LC_MESSAGES/639-2.mo b/messages/af/LC_MESSAGES/639-2.mo
index 33ab8b0b..840e13f6 100644
Binary files a/messages/af/LC_MESSAGES/639-2.mo and b/messages/af/LC_MESSAGES/639-2.mo differ
diff --git a/messages/af/LC_MESSAGES/639-2.po b/messages/af/LC_MESSAGES/639-2.po
index 4e554b4e..60414a43 100644
--- a/messages/af/LC_MESSAGES/639-2.po
+++ b/messages/af/LC_MESSAGES/639-2.po
@@ -1,14 +1,14 @@
-# Translation of ISO-639 (language names) to Afrikaans
+# Translation of ISO 639-2 to Afrikaans
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Frikkie Thirion <frix@engineer.com>, 2001.
-#   Alastair McKinstry <mckinstry@computer.org>, 2002.
-#   Free Software Foundation, Inc., 2004
-#   Ysbeer <ysbeer@af.org.za>, 2004.
-#   Friedel Wolff <friedel BY translate.org.za>, 2007.
-#
+# Copyright ©
+# Frikkie Thirion <frix@engineer.com>, 2001.
+# Alastair McKinstry <mckinstry@computer.org>, 2002.
+# Ysbeer <ysbeer@af.org.za>, 2004.
+# Friedel Wolff <friedel@translate.org.za>, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/af/LC_MESSAGES/639-3.mo b/messages/af/LC_MESSAGES/639-3.mo
index 259dce97..18f7bb67 100644
Binary files a/messages/af/LC_MESSAGES/639-3.mo and b/messages/af/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ak/LC_MESSAGES/3166-1.mo b/messages/ak/LC_MESSAGES/3166-1.mo
index 35e34bc4..9eaa1b7f 100644
Binary files a/messages/ak/LC_MESSAGES/3166-1.mo and b/messages/ak/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ak/LC_MESSAGES/3166-1.po b/messages/ak/LC_MESSAGES/3166-1.po
index e8de9cfd..efd821dd 100644
--- a/messages/ak/LC_MESSAGES/3166-1.po
+++ b/messages/ak/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Akan
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/am/LC_MESSAGES/3166-1.mo b/messages/am/LC_MESSAGES/3166-1.mo
index 8236272a..7beff395 100644
Binary files a/messages/am/LC_MESSAGES/3166-1.mo and b/messages/am/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/am/LC_MESSAGES/3166-1.po b/messages/am/LC_MESSAGES/3166-1.po
index 55332909..4a640745 100644
--- a/messages/am/LC_MESSAGES/3166-1.po
+++ b/messages/am/LC_MESSAGES/3166-1.po
@@ -1,13 +1,12 @@
-# Translation of ISO-3166 (country names) to Amharic
+# Translation of ISO 3166-1 to Amharic
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#   Data taken from ICU-2.8; contributed by:
-#   - Daniel Yacob <yacob@geez.org>, Ge'ez Frontier Foundation
-#
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
+# Daniel Yacob <yacob@geez.org>
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/am/LC_MESSAGES/3166-3.mo b/messages/am/LC_MESSAGES/3166-3.mo
index 9741575f..87fdd448 100644
Binary files a/messages/am/LC_MESSAGES/3166-3.mo and b/messages/am/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/am/LC_MESSAGES/639-2.mo b/messages/am/LC_MESSAGES/639-2.mo
index 1205774a..aed90f4e 100644
Binary files a/messages/am/LC_MESSAGES/639-2.mo and b/messages/am/LC_MESSAGES/639-2.mo differ
diff --git a/messages/am/LC_MESSAGES/639-2.po b/messages/am/LC_MESSAGES/639-2.po
index e031831a..5cda7410 100644
--- a/messages/am/LC_MESSAGES/639-2.po
+++ b/messages/am/LC_MESSAGES/639-2.po
@@ -1,10 +1,11 @@
-# Translation of ISO-639 (language names) to Amharic
+# Translation of ISO 639-2 to Amharic
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/am/LC_MESSAGES/639-3.mo b/messages/am/LC_MESSAGES/639-3.mo
index e5f57e0e..dfdb90dd 100644
Binary files a/messages/am/LC_MESSAGES/639-3.mo and b/messages/am/LC_MESSAGES/639-3.mo differ
diff --git a/messages/an/LC_MESSAGES/3166-1.mo b/messages/an/LC_MESSAGES/3166-1.mo
index 27aa6b24..9bdf5235 100644
Binary files a/messages/an/LC_MESSAGES/3166-1.mo and b/messages/an/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/an/LC_MESSAGES/3166-1.po b/messages/an/LC_MESSAGES/3166-1.po
index fd27d51a..047a01fa 100644
--- a/messages/an/LC_MESSAGES/3166-1.po
+++ b/messages/an/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Aragonese
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ar/LC_MESSAGES/15924.mo b/messages/ar/LC_MESSAGES/15924.mo
index eb8c4ecf..2ef2b9b6 100644
Binary files a/messages/ar/LC_MESSAGES/15924.mo and b/messages/ar/LC_MESSAGES/15924.mo differ
diff --git a/messages/ar/LC_MESSAGES/3166-1.mo b/messages/ar/LC_MESSAGES/3166-1.mo
index 554eb687..2c8173a1 100644
Binary files a/messages/ar/LC_MESSAGES/3166-1.mo and b/messages/ar/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ar/LC_MESSAGES/3166-1.po b/messages/ar/LC_MESSAGES/3166-1.po
index cee4400b..badea0c3 100644
--- a/messages/ar/LC_MESSAGES/3166-1.po
+++ b/messages/ar/LC_MESSAGES/3166-1.po
@@ -1,8 +1,10 @@
-# translation of iso-codes_iso_3166.po to Arabic
-# Arabic translations of ISO-3166 element names
-# Copyright (C) 2001,2003, 2004, 2006, 2008 Free Software Foundation, Inc.
-# Translations taken from KDE desktop.mo
+# Translation of ISO 3166-1 to Arabic
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
+# This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Alastair McKinstry <mckinstry@computer.org>, 2002F.
 # Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>, 2004.
 # Ossama M. Khayat <okhayat@yahoo.com>, 2006, 2008, 2010.
diff --git a/messages/ar/LC_MESSAGES/3166-3.mo b/messages/ar/LC_MESSAGES/3166-3.mo
index 094591b2..07641740 100644
Binary files a/messages/ar/LC_MESSAGES/3166-3.mo and b/messages/ar/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ar/LC_MESSAGES/639-2.mo b/messages/ar/LC_MESSAGES/639-2.mo
index 04c16c1c..0f7a6f54 100644
Binary files a/messages/ar/LC_MESSAGES/639-2.mo and b/messages/ar/LC_MESSAGES/639-2.mo differ
diff --git a/messages/ar/LC_MESSAGES/639-2.po b/messages/ar/LC_MESSAGES/639-2.po
index 2a86cb6a..0cae2dd0 100644
--- a/messages/ar/LC_MESSAGES/639-2.po
+++ b/messages/ar/LC_MESSAGES/639-2.po
@@ -1,13 +1,12 @@
-# Translation of ISO-639 (language names) to Arabic
+# Translation of ISO 639-2 to Arabic
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002, 2004
-#   Alastair McKinstry <mckinstry@computer.org>, 2002.
-#   Translations from kde-i18n/desktop.po: 
-#   Mohammad Gamal <f2c2001@yahoo.com>, 2001.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002.
+# Mohammad Gamal <f2c2001@yahoo.com>, 2001.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/ar/LC_MESSAGES/639-3.mo b/messages/ar/LC_MESSAGES/639-3.mo
index 33e60708..f9cad18f 100644
Binary files a/messages/ar/LC_MESSAGES/639-3.mo and b/messages/ar/LC_MESSAGES/639-3.mo differ
diff --git a/messages/as/LC_MESSAGES/3166-1.mo b/messages/as/LC_MESSAGES/3166-1.mo
index c78c294a..df521f1a 100644
Binary files a/messages/as/LC_MESSAGES/3166-1.mo and b/messages/as/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/as/LC_MESSAGES/3166-1.po b/messages/as/LC_MESSAGES/3166-1.po
index 5f8e7fd7..69d86a20 100644
--- a/messages/as/LC_MESSAGES/3166-1.po
+++ b/messages/as/LC_MESSAGES/3166-1.po
@@ -1,4 +1,6 @@
-# Translation of ISO 3166 (country names) to Assamese
+# Translation of ISO 3166-1 to Assamese
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
diff --git a/messages/as/LC_MESSAGES/3166-3.mo b/messages/as/LC_MESSAGES/3166-3.mo
index b2442f36..90392466 100644
Binary files a/messages/as/LC_MESSAGES/3166-3.mo and b/messages/as/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/as/LC_MESSAGES/639-2.mo b/messages/as/LC_MESSAGES/639-2.mo
index 4bb3ab96..92430fde 100644
Binary files a/messages/as/LC_MESSAGES/639-2.mo and b/messages/as/LC_MESSAGES/639-2.mo differ
diff --git a/messages/as/LC_MESSAGES/639-2.po b/messages/as/LC_MESSAGES/639-2.po
index f4b6a349..2ec78087 100644
--- a/messages/as/LC_MESSAGES/639-2.po
+++ b/messages/as/LC_MESSAGES/639-2.po
@@ -1,4 +1,6 @@
-# Translation of ISO 639 (language names) to Assamese
+# Translation of ISO 639-2 to Assamese
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
diff --git a/messages/ast/LC_MESSAGES/3166-1.mo b/messages/ast/LC_MESSAGES/3166-1.mo
index 362fa803..ded1e879 100644
Binary files a/messages/ast/LC_MESSAGES/3166-1.mo and b/messages/ast/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ast/LC_MESSAGES/3166-1.po b/messages/ast/LC_MESSAGES/3166-1.po
index 7aaed7f0..05c3fa9c 100644
--- a/messages/ast/LC_MESSAGES/3166-1.po
+++ b/messages/ast/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO 3166 (country names) to Asturian
+# Translation of ISO 3166-1 to Asturian; Bable; Leonese; Asturleonese
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Marcos Alvarez Costales <marcoscostales@gmail.com>, 2009, 2010.
-#
+# Copyright ©
+# Marcos Alvarez Costales <marcoscostales@gmail.com>, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ast/LC_MESSAGES/3166-3.mo b/messages/ast/LC_MESSAGES/3166-3.mo
index aea1ae25..325f31d7 100644
Binary files a/messages/ast/LC_MESSAGES/3166-3.mo and b/messages/ast/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ast/LC_MESSAGES/639-2.mo b/messages/ast/LC_MESSAGES/639-2.mo
index 8d88175f..060f0fb2 100644
Binary files a/messages/ast/LC_MESSAGES/639-2.mo and b/messages/ast/LC_MESSAGES/639-2.mo differ
diff --git a/messages/ast/LC_MESSAGES/639-2.po b/messages/ast/LC_MESSAGES/639-2.po
index d3a0f9a7..cae639d3 100644
--- a/messages/ast/LC_MESSAGES/639-2.po
+++ b/messages/ast/LC_MESSAGES/639-2.po
@@ -1,8 +1,11 @@
-# Asturian translation for iso_639
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# Translation of ISO 639-2 to Asturian; Bable; Leonese; Asturleonese
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
-# Marquinos <maacub@gmail.com>, 2008.
 #
+# Copyright ©
+# Marquinos <maacub@gmail.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/ast/LC_MESSAGES/639-3.mo b/messages/ast/LC_MESSAGES/639-3.mo
index b812feac..0cd43f43 100644
Binary files a/messages/ast/LC_MESSAGES/639-3.mo and b/messages/ast/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ay/LC_MESSAGES/3166-1.mo b/messages/ay/LC_MESSAGES/3166-1.mo
index 534d60e4..ac4d1241 100644
Binary files a/messages/ay/LC_MESSAGES/3166-1.mo and b/messages/ay/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ay/LC_MESSAGES/3166-1.po b/messages/ay/LC_MESSAGES/3166-1.po
index 9729570d..e48e4a0c 100644
--- a/messages/ay/LC_MESSAGES/3166-1.po
+++ b/messages/ay/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Aymara
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/az/LC_MESSAGES/3166-1.mo b/messages/az/LC_MESSAGES/3166-1.mo
index 9c838020..830bf3ad 100644
Binary files a/messages/az/LC_MESSAGES/3166-1.mo and b/messages/az/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/az/LC_MESSAGES/3166-1.po b/messages/az/LC_MESSAGES/3166-1.po
index 8bb91a0c..de2498ca 100644
--- a/messages/az/LC_MESSAGES/3166-1.po
+++ b/messages/az/LC_MESSAGES/3166-1.po
@@ -1,14 +1,12 @@
-# Translation of ISO-3166 (country names) to Azerbaijani
+# Translation of ISO 3166-1 to Azerbaijani
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2004
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   (Translations from drakfw)
-#   Mətin Əmirov <metin@karegen.com>, 2004.
-#   Alastair McKinstry - further translations from ICU-3.0
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Mətin Əmirov <metin@karegen.com>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/az/LC_MESSAGES/3166-2.mo b/messages/az/LC_MESSAGES/3166-2.mo
index 9cacded2..64a15a2c 100644
Binary files a/messages/az/LC_MESSAGES/3166-2.mo and b/messages/az/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/az/LC_MESSAGES/3166-3.mo b/messages/az/LC_MESSAGES/3166-3.mo
index f1eb218e..7ebdeb89 100644
Binary files a/messages/az/LC_MESSAGES/3166-3.mo and b/messages/az/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/az/LC_MESSAGES/639-2.mo b/messages/az/LC_MESSAGES/639-2.mo
index 1b1bcfbb..542ee925 100644
Binary files a/messages/az/LC_MESSAGES/639-2.mo and b/messages/az/LC_MESSAGES/639-2.mo differ
diff --git a/messages/az/LC_MESSAGES/639-2.po b/messages/az/LC_MESSAGES/639-2.po
index a740f6d2..48a5a2b7 100644
--- a/messages/az/LC_MESSAGES/639-2.po
+++ b/messages/az/LC_MESSAGES/639-2.po
@@ -1,12 +1,12 @@
-# Translation of ISO-639 (language names) to Azerbaijani
+# Translation of ISO 639-2 to Azerbaijani
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2001
-#   Vasif Ismailoglu MD <azerb_linux@hotmail.com>, 2001. (translations from gnucash)
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#
+# Copyright ©
+# Vasif Ismailoglu MD <azerb_linux@hotmail.com>, 2001.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/az/LC_MESSAGES/639-3.mo b/messages/az/LC_MESSAGES/639-3.mo
index cb504eac..cbf805fd 100644
Binary files a/messages/az/LC_MESSAGES/639-3.mo and b/messages/az/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ba/LC_MESSAGES/3166-1.mo b/messages/ba/LC_MESSAGES/3166-1.mo
index 418aff64..6b294a68 100644
Binary files a/messages/ba/LC_MESSAGES/3166-1.mo and b/messages/ba/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ba/LC_MESSAGES/3166-1.po b/messages/ba/LC_MESSAGES/3166-1.po
index 6c1f4186..ced82b1c 100644
--- a/messages/ba/LC_MESSAGES/3166-1.po
+++ b/messages/ba/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Bashkir
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/bar/LC_MESSAGES/3166-1.mo b/messages/bar/LC_MESSAGES/3166-1.mo
index 23859c5b..107e4b70 100644
Binary files a/messages/bar/LC_MESSAGES/3166-1.mo and b/messages/bar/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/bar/LC_MESSAGES/3166-1.po b/messages/bar/LC_MESSAGES/3166-1.po
index 5607487a..53c6382e 100644
--- a/messages/bar/LC_MESSAGES/3166-1.po
+++ b/messages/bar/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Bavarian
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/be/LC_MESSAGES/15924.mo b/messages/be/LC_MESSAGES/15924.mo
index ea8e932d..d045bf9b 100644
Binary files a/messages/be/LC_MESSAGES/15924.mo and b/messages/be/LC_MESSAGES/15924.mo differ
diff --git a/messages/be/LC_MESSAGES/3166-1.mo b/messages/be/LC_MESSAGES/3166-1.mo
index 006eb1a4..fc4e5304 100644
Binary files a/messages/be/LC_MESSAGES/3166-1.mo and b/messages/be/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/be/LC_MESSAGES/3166-1.po b/messages/be/LC_MESSAGES/3166-1.po
index 7ece77ee..8a8c261a 100644
--- a/messages/be/LC_MESSAGES/3166-1.po
+++ b/messages/be/LC_MESSAGES/3166-1.po
@@ -1,5 +1,10 @@
-# Translation of ISO-3166 (country names) to Belarusian
+# Translation of ISO 3166-1 to Belarusian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Alastair McKinstry <mckinstry@debian.org>, 2004.
 # Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2007, 2010-2013.
 # Viktar Siarheichyk <vics@fsfe.org>, 2015.
diff --git a/messages/be/LC_MESSAGES/3166-2.mo b/messages/be/LC_MESSAGES/3166-2.mo
index 15491bf1..90622482 100644
Binary files a/messages/be/LC_MESSAGES/3166-2.mo and b/messages/be/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/be/LC_MESSAGES/3166-3.mo b/messages/be/LC_MESSAGES/3166-3.mo
index ed470e36..a5dae818 100644
Binary files a/messages/be/LC_MESSAGES/3166-3.mo and b/messages/be/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/be/LC_MESSAGES/4217.mo b/messages/be/LC_MESSAGES/4217.mo
index 9fca5912..900d3242 100644
Binary files a/messages/be/LC_MESSAGES/4217.mo and b/messages/be/LC_MESSAGES/4217.mo differ
diff --git a/messages/be/LC_MESSAGES/639-2.mo b/messages/be/LC_MESSAGES/639-2.mo
index 7bd702b4..57d61115 100644
Binary files a/messages/be/LC_MESSAGES/639-2.mo and b/messages/be/LC_MESSAGES/639-2.mo differ
diff --git a/messages/be/LC_MESSAGES/639-2.po b/messages/be/LC_MESSAGES/639-2.po
index 9869635d..65895974 100644
--- a/messages/be/LC_MESSAGES/639-2.po
+++ b/messages/be/LC_MESSAGES/639-2.po
@@ -1,5 +1,10 @@
-# Translation of ISO-639 (language names) to Belarusian
+# Translation of ISO 639-2 to Belarusian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Alastair McKinstry <mckinstry@debian.org>, 2004.
 # Alexander Nyakhaychyk <nyakhaychyk@gmail.com>, 2009.
 # Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2007, 2010, 2012, 2013.
diff --git a/messages/be/LC_MESSAGES/639-5.mo b/messages/be/LC_MESSAGES/639-5.mo
index d05e5381..70d27068 100644
Binary files a/messages/be/LC_MESSAGES/639-5.mo and b/messages/be/LC_MESSAGES/639-5.mo differ
diff --git a/messages/bg/LC_MESSAGES/15924.mo b/messages/bg/LC_MESSAGES/15924.mo
index e01929b5..3f7be4d7 100644
Binary files a/messages/bg/LC_MESSAGES/15924.mo and b/messages/bg/LC_MESSAGES/15924.mo differ
diff --git a/messages/bg/LC_MESSAGES/3166-1.mo b/messages/bg/LC_MESSAGES/3166-1.mo
index eb80243f..3d45b4c8 100644
Binary files a/messages/bg/LC_MESSAGES/3166-1.mo and b/messages/bg/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/bg/LC_MESSAGES/3166-1.po b/messages/bg/LC_MESSAGES/3166-1.po
index 3331ab51..0101eeaf 100644
--- a/messages/bg/LC_MESSAGES/3166-1.po
+++ b/messages/bg/LC_MESSAGES/3166-1.po
@@ -1,15 +1,14 @@
-# Translation of ISO-3166 (country names) to Bulgarian
+# Translation of ISO 3166-1 to Bulgarian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-#   Free Software Foundation, Inc., 2004.
-#   Georgi Georgiev <assenov_g@operamail.com>, 2001, 2004.
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Ognyan Kulev <ogi@fmi.uni-sofia.bg>, 2004.
-#   Damyan Ivanov <dmn@debian.org>, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2014, 2016.
-# Copyright (C)
-#   (translations from drakfw)
-#   - further translations from ICU-3.9
+# Copyright ©
+# Georgi Georgiev <assenov_g@operamail.com>, 2001, 2004.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Ognyan Kulev <ogi@fmi.uni-sofia.bg>, 2004.
+# Damyan Ivanov <dmn@debian.org>, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2014, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/bg/LC_MESSAGES/3166-2.mo b/messages/bg/LC_MESSAGES/3166-2.mo
index 2d3cfefa..81b3c14a 100644
Binary files a/messages/bg/LC_MESSAGES/3166-2.mo and b/messages/bg/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/bg/LC_MESSAGES/3166-3.mo b/messages/bg/LC_MESSAGES/3166-3.mo
index 5329b7e9..2e44ff29 100644
Binary files a/messages/bg/LC_MESSAGES/3166-3.mo and b/messages/bg/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/bg/LC_MESSAGES/639-2.mo b/messages/bg/LC_MESSAGES/639-2.mo
index 22c0cc62..ee66be16 100644
Binary files a/messages/bg/LC_MESSAGES/639-2.mo and b/messages/bg/LC_MESSAGES/639-2.mo differ
diff --git a/messages/bg/LC_MESSAGES/639-2.po b/messages/bg/LC_MESSAGES/639-2.po
index a3c1902d..dabf81f7 100644
--- a/messages/bg/LC_MESSAGES/639-2.po
+++ b/messages/bg/LC_MESSAGES/639-2.po
@@ -1,10 +1,11 @@
-# Translation of ISO 639 (language names) to Bulgarian
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
-# This file is distributed under the same license as the iso-codes package.
+# Translation of ISO 639-2 to Bulgarian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
-# Copyright (C)
-#   Roumen Petrov <transl@roumenpetrov.info>, 2010-2014.
+# This file is distributed under the same license as the iso-codes package.
 #
+# Copyright ©
+# Roumen Petrov <transl@roumenpetrov.info>, 2010-2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/bg/LC_MESSAGES/639-3.mo b/messages/bg/LC_MESSAGES/639-3.mo
index 4b065f03..741a7bb0 100644
Binary files a/messages/bg/LC_MESSAGES/639-3.mo and b/messages/bg/LC_MESSAGES/639-3.mo differ
diff --git a/messages/bi/LC_MESSAGES/3166-1.mo b/messages/bi/LC_MESSAGES/3166-1.mo
index 5691d648..68b03291 100644
Binary files a/messages/bi/LC_MESSAGES/3166-1.mo and b/messages/bi/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/bi/LC_MESSAGES/3166-1.po b/messages/bi/LC_MESSAGES/3166-1.po
index fcf2053d..dfdca77e 100644
--- a/messages/bi/LC_MESSAGES/3166-1.po
+++ b/messages/bi/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Bislama
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/bn/LC_MESSAGES/3166-1.mo b/messages/bn/LC_MESSAGES/3166-1.mo
index 7442a50d..671b3c99 100644
Binary files a/messages/bn/LC_MESSAGES/3166-1.mo and b/messages/bn/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/bn/LC_MESSAGES/3166-1.po b/messages/bn/LC_MESSAGES/3166-1.po
index c7ff9745..d32b0053 100644
--- a/messages/bn/LC_MESSAGES/3166-1.po
+++ b/messages/bn/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO 3166 (country names) to Bengali
+# Translation of ISO 3166-1 to Bengali
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
 # Nasir Khan <nasir.khan@bdosn.org>, 2013.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/bn/LC_MESSAGES/3166-3.mo b/messages/bn/LC_MESSAGES/3166-3.mo
index 855e3055..12e236f4 100644
Binary files a/messages/bn/LC_MESSAGES/3166-3.mo and b/messages/bn/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/bn/LC_MESSAGES/639-2.mo b/messages/bn/LC_MESSAGES/639-2.mo
index ff4ce6ca..ee0a9d4a 100644
Binary files a/messages/bn/LC_MESSAGES/639-2.mo and b/messages/bn/LC_MESSAGES/639-2.mo differ
diff --git a/messages/bn/LC_MESSAGES/639-2.po b/messages/bn/LC_MESSAGES/639-2.po
index 376471e1..db8b0909 100644
--- a/messages/bn/LC_MESSAGES/639-2.po
+++ b/messages/bn/LC_MESSAGES/639-2.po
@@ -1,10 +1,11 @@
-# Translation of ISO 639 (language names) to Bengali
+# Translation of ISO 639-2 to Bengali
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
 # Nasir Khan <nasir.khan@bdosn.org>, 2013.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/bn/LC_MESSAGES/639-3.mo b/messages/bn/LC_MESSAGES/639-3.mo
index dc3f95ce..7c5a9143 100644
Binary files a/messages/bn/LC_MESSAGES/639-3.mo and b/messages/bn/LC_MESSAGES/639-3.mo differ
diff --git a/messages/bn_IN/LC_MESSAGES/3166-1.mo b/messages/bn_IN/LC_MESSAGES/3166-1.mo
index 5725c19c..c15a4f3e 100644
Binary files a/messages/bn_IN/LC_MESSAGES/3166-1.mo and b/messages/bn_IN/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/bn_IN/LC_MESSAGES/3166-1.po b/messages/bn_IN/LC_MESSAGES/3166-1.po
index fde849cb..9f240e14 100644
--- a/messages/bn_IN/LC_MESSAGES/3166-1.po
+++ b/messages/bn_IN/LC_MESSAGES/3166-1.po
@@ -1,10 +1,10 @@
-# translation of bn_IN.po to Bengali INDIA
-# Translation of ISO 3166 (country names) to Bengali India
+# Translation of ISO 3166-1 to Bengali (India)
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-#
 # Runa Bhattacharjee <runabh@gmail.com>, 2009, 2010.
 msgid ""
 msgstr ""
diff --git a/messages/bn_IN/LC_MESSAGES/3166-3.mo b/messages/bn_IN/LC_MESSAGES/3166-3.mo
index 8bded6f9..fd332ff6 100644
Binary files a/messages/bn_IN/LC_MESSAGES/3166-3.mo and b/messages/bn_IN/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/br/LC_MESSAGES/15924.mo b/messages/br/LC_MESSAGES/15924.mo
index 1bdcc93b..3001b6af 100644
Binary files a/messages/br/LC_MESSAGES/15924.mo and b/messages/br/LC_MESSAGES/15924.mo differ
diff --git a/messages/br/LC_MESSAGES/3166-1.mo b/messages/br/LC_MESSAGES/3166-1.mo
index 40d5023d..917ca467 100644
Binary files a/messages/br/LC_MESSAGES/3166-1.mo and b/messages/br/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/br/LC_MESSAGES/3166-1.po b/messages/br/LC_MESSAGES/3166-1.po
index 9ca0fe4d..b2babe46 100644
--- a/messages/br/LC_MESSAGES/3166-1.po
+++ b/messages/br/LC_MESSAGES/3166-1.po
@@ -1,4 +1,6 @@
-# Translation of ISO-3166 (country names) to Breton
+# Translation of ISO 3166-1 to Breton
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
@@ -7,7 +9,6 @@
 # Alastair McKinstry, <mckinstry@computer.org>, 2002.
 # Denis Arnaud <denisarnuad@yahoo.fr>, 2008-2009
 # Jamy <jamybzh@free.fr>, 2009
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/br/LC_MESSAGES/3166-3.mo b/messages/br/LC_MESSAGES/3166-3.mo
index 81eab5c2..8ca5bf33 100644
Binary files a/messages/br/LC_MESSAGES/3166-3.mo and b/messages/br/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/br/LC_MESSAGES/4217.mo b/messages/br/LC_MESSAGES/4217.mo
index 7e431c78..f7619374 100644
Binary files a/messages/br/LC_MESSAGES/4217.mo and b/messages/br/LC_MESSAGES/4217.mo differ
diff --git a/messages/br/LC_MESSAGES/639-2.mo b/messages/br/LC_MESSAGES/639-2.mo
index da06de17..0fdd69c9 100644
Binary files a/messages/br/LC_MESSAGES/639-2.mo and b/messages/br/LC_MESSAGES/639-2.mo differ
diff --git a/messages/br/LC_MESSAGES/639-2.po b/messages/br/LC_MESSAGES/639-2.po
index 895a0a6e..f71018d3 100644
--- a/messages/br/LC_MESSAGES/639-2.po
+++ b/messages/br/LC_MESSAGES/639-2.po
@@ -1,4 +1,6 @@
-# Translation of ISO-639 (language names) to Breton
+# Translation of ISO 639-2 to Breton
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
diff --git a/messages/br/LC_MESSAGES/639-3.mo b/messages/br/LC_MESSAGES/639-3.mo
index 90bbf286..31cebee2 100644
Binary files a/messages/br/LC_MESSAGES/639-3.mo and b/messages/br/LC_MESSAGES/639-3.mo differ
diff --git a/messages/bs/LC_MESSAGES/3166-1.mo b/messages/bs/LC_MESSAGES/3166-1.mo
index 06cd4f5b..0546f8db 100644
Binary files a/messages/bs/LC_MESSAGES/3166-1.mo and b/messages/bs/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/bs/LC_MESSAGES/3166-1.po b/messages/bs/LC_MESSAGES/3166-1.po
index 5581e81d..972eafc2 100644
--- a/messages/bs/LC_MESSAGES/3166-1.po
+++ b/messages/bs/LC_MESSAGES/3166-1.po
@@ -1,14 +1,13 @@
-# Translation of ISO-3166 (country names) to Bosnian
+# Translation of ISO 3166-1 to Bosnian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2001,2003
-#   Vedran Ljubovic <vljubovic@smartnet.ba>, 2001
-#   (translations from drakfw).
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Safir Šećerović <sapphire@linux.org.ba>, 2004,2006.
-#
+# Copyright ©
+# Vedran Ljubovic <vljubovic@smartnet.ba>, 2001
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Safir Šećerović <sapphire@linux.org.ba>, 2004,2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/bs/LC_MESSAGES/3166-2.mo b/messages/bs/LC_MESSAGES/3166-2.mo
index 11d2d552..c236c935 100644
Binary files a/messages/bs/LC_MESSAGES/3166-2.mo and b/messages/bs/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/bs/LC_MESSAGES/3166-3.mo b/messages/bs/LC_MESSAGES/3166-3.mo
index 1983624a..4e6b152d 100644
Binary files a/messages/bs/LC_MESSAGES/3166-3.mo and b/messages/bs/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/bs/LC_MESSAGES/639-2.mo b/messages/bs/LC_MESSAGES/639-2.mo
index 1e19a9c6..4e45282c 100644
Binary files a/messages/bs/LC_MESSAGES/639-2.mo and b/messages/bs/LC_MESSAGES/639-2.mo differ
diff --git a/messages/bs/LC_MESSAGES/639-2.po b/messages/bs/LC_MESSAGES/639-2.po
index 341dacea..37c293ee 100644
--- a/messages/bs/LC_MESSAGES/639-2.po
+++ b/messages/bs/LC_MESSAGES/639-2.po
@@ -1,14 +1,13 @@
-# Translation of ISO-639 (language names) to Bosnian
+# Translation of ISO 639-2 to Bosnian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002,2004
-#   Alastair McKinstry <mckinstry@computer.org>, 2002
-#   Translations from KDE:
-#   Nesiren Armin <bianchi@lugbih.org>, 2002
-#   Vedran Ljubovic <vljubovic@smartnet.ba>, 2002
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002
+# Nesiren Armin <bianchi@lugbih.org>, 2002
+# Vedran Ljubovic <vljubovic@smartnet.ba>, 2002
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/bs/LC_MESSAGES/639-3.mo b/messages/bs/LC_MESSAGES/639-3.mo
index c19df349..9a3b4d80 100644
Binary files a/messages/bs/LC_MESSAGES/639-3.mo and b/messages/bs/LC_MESSAGES/639-3.mo differ
diff --git a/messages/byn/LC_MESSAGES/3166-1.mo b/messages/byn/LC_MESSAGES/3166-1.mo
index c8a852dd..3493070e 100644
Binary files a/messages/byn/LC_MESSAGES/3166-1.mo and b/messages/byn/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/byn/LC_MESSAGES/3166-1.po b/messages/byn/LC_MESSAGES/3166-1.po
index d711d624..78d82182 100644
--- a/messages/byn/LC_MESSAGES/3166-1.po
+++ b/messages/byn/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO-3166 (country names) to Blin
+# Translation of ISO 3166-1 to Blin; Bilin
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/byn/LC_MESSAGES/3166-3.mo b/messages/byn/LC_MESSAGES/3166-3.mo
index 175ece51..5dbd0d9f 100644
Binary files a/messages/byn/LC_MESSAGES/3166-3.mo and b/messages/byn/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/byn/LC_MESSAGES/639-2.mo b/messages/byn/LC_MESSAGES/639-2.mo
index 6ee13943..ad4145f3 100644
Binary files a/messages/byn/LC_MESSAGES/639-2.mo and b/messages/byn/LC_MESSAGES/639-2.mo differ
diff --git a/messages/byn/LC_MESSAGES/639-2.po b/messages/byn/LC_MESSAGES/639-2.po
index 33f985a8..19549555 100644
--- a/messages/byn/LC_MESSAGES/639-2.po
+++ b/messages/byn/LC_MESSAGES/639-2.po
@@ -1,10 +1,11 @@
-# Translation of ISO-639 (language names) to Blin
+# Translation of ISO 639-2 to Blin; Bilin
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/byn/LC_MESSAGES/639-3.mo b/messages/byn/LC_MESSAGES/639-3.mo
index 26d8049b..74c703bd 100644
Binary files a/messages/byn/LC_MESSAGES/639-3.mo and b/messages/byn/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ca/LC_MESSAGES/15924.mo b/messages/ca/LC_MESSAGES/15924.mo
index 4729e10d..c69e1581 100644
Binary files a/messages/ca/LC_MESSAGES/15924.mo and b/messages/ca/LC_MESSAGES/15924.mo differ
diff --git a/messages/ca/LC_MESSAGES/3166-1.mo b/messages/ca/LC_MESSAGES/3166-1.mo
index 2ead8748..b71fb3c9 100644
Binary files a/messages/ca/LC_MESSAGES/3166-1.mo and b/messages/ca/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ca/LC_MESSAGES/3166-1.po b/messages/ca/LC_MESSAGES/3166-1.po
index c1b238e2..d74147d5 100644
--- a/messages/ca/LC_MESSAGES/3166-1.po
+++ b/messages/ca/LC_MESSAGES/3166-1.po
@@ -1,10 +1,16 @@
-# Translation of ISO-3166 (country names) to Catalan
+# Translation of ISO 3166-1 to Catalan; Valencian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
-# Copyright (C)
-# Free Software Foundation, Inc., 2006
+#
+# Notes:
+# He usat la nomenclatura de http://www.traduim.com/
+#
+# Copyright ©
 # Softcatalà <info@softcatala.org>, 2001.
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
-# Orestes Mas i Casals <orestes@tsc.upc.es>, 2004-2006. (orestes: He usat la nomenclatura de http://www.traduim.com/)
+# Orestes Mas i Casals <orestes@tsc.upc.es>, 2004-2006.
 # Toni Hermoso Pulido <toniher@softcatala.org>, 2010-2012.
 msgid ""
 msgstr ""
diff --git a/messages/ca/LC_MESSAGES/3166-2.mo b/messages/ca/LC_MESSAGES/3166-2.mo
index 66ce733a..8540e6e7 100644
Binary files a/messages/ca/LC_MESSAGES/3166-2.mo and b/messages/ca/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/ca/LC_MESSAGES/3166-3.mo b/messages/ca/LC_MESSAGES/3166-3.mo
index efd49238..04cfcd89 100644
Binary files a/messages/ca/LC_MESSAGES/3166-3.mo and b/messages/ca/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ca/LC_MESSAGES/4217.mo b/messages/ca/LC_MESSAGES/4217.mo
index 6b7cdefc..32fb62a9 100644
Binary files a/messages/ca/LC_MESSAGES/4217.mo and b/messages/ca/LC_MESSAGES/4217.mo differ
diff --git a/messages/ca/LC_MESSAGES/639-2.mo b/messages/ca/LC_MESSAGES/639-2.mo
index d7a4ab33..cb3bf8f2 100644
Binary files a/messages/ca/LC_MESSAGES/639-2.mo and b/messages/ca/LC_MESSAGES/639-2.mo differ
diff --git a/messages/ca/LC_MESSAGES/639-2.po b/messages/ca/LC_MESSAGES/639-2.po
index ea9b3e48..a11255aa 100644
--- a/messages/ca/LC_MESSAGES/639-2.po
+++ b/messages/ca/LC_MESSAGES/639-2.po
@@ -1,9 +1,12 @@
-# Translation of ISO-639 (language names) to Catalan
+# Translation of ISO 639-2 to Catalan; Valencian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
-# Copyright (C)
-# Free Software Foundation, Inc., 2002,2004
+#
+# Copyright ©
 # Softcatalà <info@softcatala.org>, 2000-2001
-# Traductor: Jordi Ferré <jordiferre@catalonia.altranet.fr>
+# Jordi Ferré <jordiferre@catalonia.altranet.fr>
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
 # Toni Hermoso Pulido <toniher@softcatala.cat>, 2010.
 # Toni Hermoso Pulido <toniher@softcatala.org>, 2010.
diff --git a/messages/ca/LC_MESSAGES/639-3.mo b/messages/ca/LC_MESSAGES/639-3.mo
index a47e15e0..be34b568 100644
Binary files a/messages/ca/LC_MESSAGES/639-3.mo and b/messages/ca/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ce/LC_MESSAGES/3166-1.mo b/messages/ce/LC_MESSAGES/3166-1.mo
index c4476f2a..1632fc4d 100644
Binary files a/messages/ce/LC_MESSAGES/3166-1.mo and b/messages/ce/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ce/LC_MESSAGES/3166-1.po b/messages/ce/LC_MESSAGES/3166-1.po
index e5c2205d..57a394ed 100644
--- a/messages/ce/LC_MESSAGES/3166-1.po
+++ b/messages/ce/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Chechen
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ch/LC_MESSAGES/3166-1.mo b/messages/ch/LC_MESSAGES/3166-1.mo
index 4dd845c0..c3b0407b 100644
Binary files a/messages/ch/LC_MESSAGES/3166-1.mo and b/messages/ch/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ch/LC_MESSAGES/3166-1.po b/messages/ch/LC_MESSAGES/3166-1.po
index 8d7a9211..720a2de4 100644
--- a/messages/ch/LC_MESSAGES/3166-1.po
+++ b/messages/ch/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Chamorro
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/chr/LC_MESSAGES/3166-1.mo b/messages/chr/LC_MESSAGES/3166-1.mo
index 294b4640..f169003d 100644
Binary files a/messages/chr/LC_MESSAGES/3166-1.mo and b/messages/chr/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/chr/LC_MESSAGES/3166-1.po b/messages/chr/LC_MESSAGES/3166-1.po
index fd49db63..42e6a54e 100644
--- a/messages/chr/LC_MESSAGES/3166-1.po
+++ b/messages/chr/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Cherokee
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ckb/LC_MESSAGES/3166-1.mo b/messages/ckb/LC_MESSAGES/3166-1.mo
index 045ba3e5..f61c7970 100644
Binary files a/messages/ckb/LC_MESSAGES/3166-1.mo and b/messages/ckb/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ckb/LC_MESSAGES/3166-1.po b/messages/ckb/LC_MESSAGES/3166-1.po
index 9e1a99e5..88cc4e10 100644
--- a/messages/ckb/LC_MESSAGES/3166-1.po
+++ b/messages/ckb/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Sorani
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/crh/LC_MESSAGES/3166-1.mo b/messages/crh/LC_MESSAGES/3166-1.mo
index 8979101b..ed955969 100644
Binary files a/messages/crh/LC_MESSAGES/3166-1.mo and b/messages/crh/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/crh/LC_MESSAGES/3166-1.po b/messages/crh/LC_MESSAGES/3166-1.po
index ad81f1c2..2af985e2 100644
--- a/messages/crh/LC_MESSAGES/3166-1.po
+++ b/messages/crh/LC_MESSAGES/3166-1.po
@@ -1,8 +1,14 @@
-# Qırımtatarca ISO-3166 (country names)
+# Translation of ISO 3166-1 to Crimean Tatar; Crimean Turkish
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
 #
-# Reşat SABIQ <tilde.birlik@gmail.com>, 2009.
+# Notes:
 # Türkçeden çabik uyarlama.
+#
+# Copyright ©
+# Reşat SABIQ <tilde.birlik@gmail.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/crh/LC_MESSAGES/3166-2.mo b/messages/crh/LC_MESSAGES/3166-2.mo
index f49212d2..03047ca2 100644
Binary files a/messages/crh/LC_MESSAGES/3166-2.mo and b/messages/crh/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/crh/LC_MESSAGES/3166-3.mo b/messages/crh/LC_MESSAGES/3166-3.mo
index 7a25561c..e418d95a 100644
Binary files a/messages/crh/LC_MESSAGES/3166-3.mo and b/messages/crh/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/crh/LC_MESSAGES/639-2.mo b/messages/crh/LC_MESSAGES/639-2.mo
index cd994de5..72a715f0 100644
Binary files a/messages/crh/LC_MESSAGES/639-2.mo and b/messages/crh/LC_MESSAGES/639-2.mo differ
diff --git a/messages/crh/LC_MESSAGES/639-2.po b/messages/crh/LC_MESSAGES/639-2.po
index 31bf2d2e..d57ead99 100644
--- a/messages/crh/LC_MESSAGES/639-2.po
+++ b/messages/crh/LC_MESSAGES/639-2.po
@@ -1,8 +1,14 @@
-# Qırımtatarca ISO-639 (language names)
+# Translation of ISO 639-2 to Crimean Tatar; Crimean Turkish
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
 #
-# Reşat SABIQ <tilde.birlik@gmail.com>, 2009.
+# Notes:
 # Türkçeden çabik uyarlama.
+#
+# Copyright ©
+# Reşat SABIQ <tilde.birlik@gmail.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/crh/LC_MESSAGES/639-3.mo b/messages/crh/LC_MESSAGES/639-3.mo
index abeb1c7d..e32cbcff 100644
Binary files a/messages/crh/LC_MESSAGES/639-3.mo and b/messages/crh/LC_MESSAGES/639-3.mo differ
diff --git a/messages/cs/LC_MESSAGES/15924.mo b/messages/cs/LC_MESSAGES/15924.mo
index 4205520b..0898f694 100644
Binary files a/messages/cs/LC_MESSAGES/15924.mo and b/messages/cs/LC_MESSAGES/15924.mo differ
diff --git a/messages/cs/LC_MESSAGES/3166-1.mo b/messages/cs/LC_MESSAGES/3166-1.mo
index 3051b183..ba9858c1 100644
Binary files a/messages/cs/LC_MESSAGES/3166-1.mo and b/messages/cs/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/cs/LC_MESSAGES/3166-1.po b/messages/cs/LC_MESSAGES/3166-1.po
index 7c20f252..59992ec1 100644
--- a/messages/cs/LC_MESSAGES/3166-1.po
+++ b/messages/cs/LC_MESSAGES/3166-1.po
@@ -1,12 +1,12 @@
-# Translation of ISO-3166 (country names) to Czech
+# Translation of ISO 3166-1 to Czech
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2004
-#   Miroslav Kure <kurem@debian.cz>, 2004--2017
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#
+# Copyright ©
+# Miroslav Kure <kurem@debian.cz>, 2004--2017
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/cs/LC_MESSAGES/3166-2.mo b/messages/cs/LC_MESSAGES/3166-2.mo
index c86cae16..a8a1b637 100644
Binary files a/messages/cs/LC_MESSAGES/3166-2.mo and b/messages/cs/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/cs/LC_MESSAGES/3166-3.mo b/messages/cs/LC_MESSAGES/3166-3.mo
index 038702a0..aa54ff73 100644
Binary files a/messages/cs/LC_MESSAGES/3166-3.mo and b/messages/cs/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/cs/LC_MESSAGES/4217.mo b/messages/cs/LC_MESSAGES/4217.mo
index 283e52fa..d978b311 100644
Binary files a/messages/cs/LC_MESSAGES/4217.mo and b/messages/cs/LC_MESSAGES/4217.mo differ
diff --git a/messages/cs/LC_MESSAGES/639-2.mo b/messages/cs/LC_MESSAGES/639-2.mo
index cacfb9c9..d724d632 100644
Binary files a/messages/cs/LC_MESSAGES/639-2.mo and b/messages/cs/LC_MESSAGES/639-2.mo differ
diff --git a/messages/cs/LC_MESSAGES/639-2.po b/messages/cs/LC_MESSAGES/639-2.po
index edeff64e..6b4bd55f 100644
--- a/messages/cs/LC_MESSAGES/639-2.po
+++ b/messages/cs/LC_MESSAGES/639-2.po
@@ -1,14 +1,14 @@
-# Translation of ISO-639 (language names) to Czech
+# Translation of ISO 639-2 to Czech
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, 2002,2004 
-#   Petr Cech <cech@debian.org> (Petr Čech), 2000.
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Stanislav Brabec <utx@penguin.cz>, 2001.
-#   Miroslav Kure <kurem@debian.cz>, 2004--2017.
-#
+# Copyright ©
+# Petr Cech <cech@debian.org> (Petr Čech), 2000.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Stanislav Brabec <utx@penguin.cz>, 2001.
+# Miroslav Kure <kurem@debian.cz>, 2004--2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/cs/LC_MESSAGES/639-3.mo b/messages/cs/LC_MESSAGES/639-3.mo
index d99c563d..20283bf5 100644
Binary files a/messages/cs/LC_MESSAGES/639-3.mo and b/messages/cs/LC_MESSAGES/639-3.mo differ
diff --git a/messages/csb/LC_MESSAGES/3166-1.mo b/messages/csb/LC_MESSAGES/3166-1.mo
index 72b540a0..83c49bbf 100644
Binary files a/messages/csb/LC_MESSAGES/3166-1.mo and b/messages/csb/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/csb/LC_MESSAGES/3166-1.po b/messages/csb/LC_MESSAGES/3166-1.po
index 97a7b536..a275a5eb 100644
--- a/messages/csb/LC_MESSAGES/3166-1.po
+++ b/messages/csb/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Kashubian
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/cv/LC_MESSAGES/3166-1.mo b/messages/cv/LC_MESSAGES/3166-1.mo
index e01f04c5..74124a8e 100644
Binary files a/messages/cv/LC_MESSAGES/3166-1.mo and b/messages/cv/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/cv/LC_MESSAGES/3166-1.po b/messages/cv/LC_MESSAGES/3166-1.po
index df187db4..75b14f87 100644
--- a/messages/cv/LC_MESSAGES/3166-1.po
+++ b/messages/cv/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Chuvash
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/cy/LC_MESSAGES/3166-1.mo b/messages/cy/LC_MESSAGES/3166-1.mo
index d44643b5..c339fa79 100644
Binary files a/messages/cy/LC_MESSAGES/3166-1.mo and b/messages/cy/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/cy/LC_MESSAGES/3166-1.po b/messages/cy/LC_MESSAGES/3166-1.po
index 7cc27606..4c5cf149 100644
--- a/messages/cy/LC_MESSAGES/3166-1.po
+++ b/messages/cy/LC_MESSAGES/3166-1.po
@@ -1,12 +1,12 @@
-# Translation of ISO-3166 (country names) to Welsh
+# Translation of ISO 3166-1 to Welsh
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#   - translations from ICU-3.0
-#   Dafydd Harries <daf@muse.19inch.net>, 2004,2006.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
+# Dafydd Harries <daf@muse.19inch.net>, 2004,2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/cy/LC_MESSAGES/3166-3.mo b/messages/cy/LC_MESSAGES/3166-3.mo
index 87e1f456..ec2c3eb8 100644
Binary files a/messages/cy/LC_MESSAGES/3166-3.mo and b/messages/cy/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/cy/LC_MESSAGES/639-2.mo b/messages/cy/LC_MESSAGES/639-2.mo
index 5d365979..40bbf8fa 100644
Binary files a/messages/cy/LC_MESSAGES/639-2.mo and b/messages/cy/LC_MESSAGES/639-2.mo differ
diff --git a/messages/cy/LC_MESSAGES/639-2.po b/messages/cy/LC_MESSAGES/639-2.po
index 125cdfbf..487373f7 100644
--- a/messages/cy/LC_MESSAGES/639-2.po
+++ b/messages/cy/LC_MESSAGES/639-2.po
@@ -1,12 +1,12 @@
-# Translation of ISO-639 (language names) to Welsh
+# Translation of ISO 639-2 to Welsh
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002,2004
-#   Alastair McKinstry <mckinstry@computer.org>, 2001
-#   Dafydd Tomos <dafydd.tomos@imaginet.co.uk>, 2002
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2001
+# Dafydd Tomos <dafydd.tomos@imaginet.co.uk>, 2002
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/cy/LC_MESSAGES/639-3.mo b/messages/cy/LC_MESSAGES/639-3.mo
index 4822716e..e2873478 100644
Binary files a/messages/cy/LC_MESSAGES/639-3.mo and b/messages/cy/LC_MESSAGES/639-3.mo differ
diff --git a/messages/da/LC_MESSAGES/15924.mo b/messages/da/LC_MESSAGES/15924.mo
index 1dead6d1..67524830 100644
Binary files a/messages/da/LC_MESSAGES/15924.mo and b/messages/da/LC_MESSAGES/15924.mo differ
diff --git a/messages/da/LC_MESSAGES/3166-1.mo b/messages/da/LC_MESSAGES/3166-1.mo
index 955410cc..2e470b3e 100644
Binary files a/messages/da/LC_MESSAGES/3166-1.mo and b/messages/da/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/da/LC_MESSAGES/3166-1.po b/messages/da/LC_MESSAGES/3166-1.po
index 400376b3..46fe22c7 100644
--- a/messages/da/LC_MESSAGES/3166-1.po
+++ b/messages/da/LC_MESSAGES/3166-1.po
@@ -1,16 +1,19 @@
-# Translation of ISO-3166 (country names) to Danish
+# Translation of ISO 3166-1 to Danish
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
-# Copyright (C) Free Software Foundation, Inc., 2006.
+#
+# Notes:
+# This European Union Resource page was very helpful:
+# http://eur-op.eu.int/code/da/da-5000500.htm
+#
+# Copyright ©
 # Keld Simonsen <keld@dkuug.dk>, 2001.
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
 # Claus Hindsgaul <claus_h@image.dk>, 2004.
 # Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2006.
 # Joe Hansen <joedalton2@yahoo.dk>, 2010, 2011, 2012, 2013, 2015.
-#
-# This European Union Resource page was very helpful:
-# http://eur-op.eu.int/code/da/da-5000500.htm
-#   - further translations from ICU-3.0
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/da/LC_MESSAGES/3166-2.mo b/messages/da/LC_MESSAGES/3166-2.mo
index 513c31e7..a8d5338a 100644
Binary files a/messages/da/LC_MESSAGES/3166-2.mo and b/messages/da/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/da/LC_MESSAGES/3166-3.mo b/messages/da/LC_MESSAGES/3166-3.mo
index ee7e395f..aa263656 100644
Binary files a/messages/da/LC_MESSAGES/3166-3.mo and b/messages/da/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/da/LC_MESSAGES/4217.mo b/messages/da/LC_MESSAGES/4217.mo
index 5b91ea82..a77d8742 100644
Binary files a/messages/da/LC_MESSAGES/4217.mo and b/messages/da/LC_MESSAGES/4217.mo differ
diff --git a/messages/da/LC_MESSAGES/639-2.mo b/messages/da/LC_MESSAGES/639-2.mo
index 3d5bd8ed..241b0500 100644
Binary files a/messages/da/LC_MESSAGES/639-2.mo and b/messages/da/LC_MESSAGES/639-2.mo differ
diff --git a/messages/da/LC_MESSAGES/639-2.po b/messages/da/LC_MESSAGES/639-2.po
index dc759522..b978db4a 100644
--- a/messages/da/LC_MESSAGES/639-2.po
+++ b/messages/da/LC_MESSAGES/639-2.po
@@ -1,21 +1,24 @@
-# Danish translation of the iso_639 package.
-# Copyright (C) 2013 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Danish
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
 #
+# Notes:
 # Many of these iso--639 translations were adopted from the state library department:
 # http://www.kat-format.dk/danMARC2/Danmarc2.a8.htm
 #
 # Sprognavne er på dansk med lille begyndelsesbogstav
 #
-#  Free Software Foundation, 2000, 2004, 2005.
-#  Kenneth Christiansen <kenneth@gnu.org>, 2000.
-#  Keld Simonsen <keld@dkuug.dk>, 2000, 2001, 2008.
-#  Ole Laursen <olau@hardworking.dk>, 2001.
-#  Alastair McKinstry <mckinstry@computer.org>, 2001.
-#  Claus Hindsgaul <claus_h@image.dk>, 2004, 2005, 2006.
-#  Frederik 'Freso' S. Olesen <freso.dk@gmail.com>, 2008.
-#  Keld Simonsen <keld@keldix.com>, 2010.
-#  Joe Hansen <joedalton2@yahoo.dk>, 2013.
+# Copyright ©
+# Kenneth Christiansen <kenneth@gnu.org>, 2000.
+# Keld Simonsen <keld@dkuug.dk>, 2000, 2001, 2008.
+# Ole Laursen <olau@hardworking.dk>, 2001.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Claus Hindsgaul <claus_h@image.dk>, 2004, 2005, 2006.
+# Frederik 'Freso' S. Olesen <freso.dk@gmail.com>, 2008.
+# Keld Simonsen <keld@keldix.com>, 2010.
+# Joe Hansen <joedalton2@yahoo.dk>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/da/LC_MESSAGES/639-3.mo b/messages/da/LC_MESSAGES/639-3.mo
index ed8b02fd..0c96389f 100644
Binary files a/messages/da/LC_MESSAGES/639-3.mo and b/messages/da/LC_MESSAGES/639-3.mo differ
diff --git a/messages/de/LC_MESSAGES/15924.mo b/messages/de/LC_MESSAGES/15924.mo
index 0d1b235f..c8ba0f21 100644
Binary files a/messages/de/LC_MESSAGES/15924.mo and b/messages/de/LC_MESSAGES/15924.mo differ
diff --git a/messages/de/LC_MESSAGES/3166-1.mo b/messages/de/LC_MESSAGES/3166-1.mo
index 29b16308..82b1f88a 100644
Binary files a/messages/de/LC_MESSAGES/3166-1.mo and b/messages/de/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/de/LC_MESSAGES/3166-1.po b/messages/de/LC_MESSAGES/3166-1.po
index d3adbcdb..1183b832 100644
--- a/messages/de/LC_MESSAGES/3166-1.po
+++ b/messages/de/LC_MESSAGES/3166-1.po
@@ -1,14 +1,16 @@
-# Translation of ISO-3166 (country names) to German
+# Translation of ISO 3166-1 to German
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-#   Stefan Siegel <siegel@mandrakesoft.com>, 2001.
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Simon Hürlimann <simon.huerlimann@access.unizh.ch>, 2004.
-#   Dennis Stampfer <seppy@debian.org>, 2004.
-#   Christian Stimming <stimming@tuhh.de>, 2006.
-#   Dr. Tobias Quathamer <toddy@debian.org>, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017.
+# Stefan Siegel <siegel@mandrakesoft.com>, 2001.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Simon Hürlimann <simon.huerlimann@access.unizh.ch>, 2004.
+# Dennis Stampfer <seppy@debian.org>, 2004.
+# Christian Stimming <stimming@tuhh.de>, 2006.
+# Dr. Tobias Quathamer <toddy@debian.org>, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/de/LC_MESSAGES/3166-2.mo b/messages/de/LC_MESSAGES/3166-2.mo
index 4629041f..88221393 100644
Binary files a/messages/de/LC_MESSAGES/3166-2.mo and b/messages/de/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/de/LC_MESSAGES/3166-3.mo b/messages/de/LC_MESSAGES/3166-3.mo
index 4b393214..dae73245 100644
Binary files a/messages/de/LC_MESSAGES/3166-3.mo and b/messages/de/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/de/LC_MESSAGES/4217.mo b/messages/de/LC_MESSAGES/4217.mo
index a9adc12f..cdbff3dc 100644
Binary files a/messages/de/LC_MESSAGES/4217.mo and b/messages/de/LC_MESSAGES/4217.mo differ
diff --git a/messages/de/LC_MESSAGES/639-2.mo b/messages/de/LC_MESSAGES/639-2.mo
index 2982d658..219ed901 100644
Binary files a/messages/de/LC_MESSAGES/639-2.mo and b/messages/de/LC_MESSAGES/639-2.mo differ
diff --git a/messages/de/LC_MESSAGES/639-2.po b/messages/de/LC_MESSAGES/639-2.po
index ddbe6bf6..0e39c508 100644
--- a/messages/de/LC_MESSAGES/639-2.po
+++ b/messages/de/LC_MESSAGES/639-2.po
@@ -1,8 +1,15 @@
-# Translation of ISO-639 (language names) to German
+# Translation of ISO 639-2 to German
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright © various authors, see list below.
+# Notes:
+# Quellen-Verweise:
+# HKA: Haack Kleiner Atlas "Die Erde", VEB Hermann Haack, Gotha/Leipzig 1981.
+# AA: http://www.auswaertiges-amt.de/www/de/infoservice/download/pdf/publikationen/staatennamen-landesspr.pdf, 2002-10-17.
+#
+# Copyright ©
 # Björn Ganslandt <bganslan@gmx.net>, 2000, 2001.
 # Karl Eichwalder <ke@suse.de>, 2001.
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
@@ -12,10 +19,6 @@
 # Hendrik Knackstedt <kn.hendrik@gmail.com>, 2012.
 # Mario Blättermann <mario.blaettermann@gmail.com>, 2014.
 # Kai Lahmann, 2014.
-#
-# Quellen-Verweise:
-# HKA: Haack Kleiner Atlas "Die Erde", VEB Hermann Haack, Gotha/Leipzig 1981.
-# AA: http://www.auswaertiges-amt.de/www/de/infoservice/download/pdf/publikationen/staatennamen-landesspr.pdf, 2002-10-17.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/de/LC_MESSAGES/639-3.mo b/messages/de/LC_MESSAGES/639-3.mo
index fc574155..d69fe44a 100644
Binary files a/messages/de/LC_MESSAGES/639-3.mo and b/messages/de/LC_MESSAGES/639-3.mo differ
diff --git a/messages/de/LC_MESSAGES/639-5.mo b/messages/de/LC_MESSAGES/639-5.mo
index d1e9241d..58dfa613 100644
Binary files a/messages/de/LC_MESSAGES/639-5.mo and b/messages/de/LC_MESSAGES/639-5.mo differ
diff --git a/messages/dv/LC_MESSAGES/3166-1.mo b/messages/dv/LC_MESSAGES/3166-1.mo
index e0109e7d..038daa7a 100644
Binary files a/messages/dv/LC_MESSAGES/3166-1.mo and b/messages/dv/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/dv/LC_MESSAGES/3166-1.po b/messages/dv/LC_MESSAGES/3166-1.po
index 8156fdb6..79ed1b9e 100644
--- a/messages/dv/LC_MESSAGES/3166-1.po
+++ b/messages/dv/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Divehi; Dhivehi; Maldivian
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/dz/LC_MESSAGES/3166-1.mo b/messages/dz/LC_MESSAGES/3166-1.mo
index 2175dfaa..80cb90c5 100644
Binary files a/messages/dz/LC_MESSAGES/3166-1.mo and b/messages/dz/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/dz/LC_MESSAGES/3166-1.po b/messages/dz/LC_MESSAGES/3166-1.po
index 7ff8a191..8e21f19f 100644
--- a/messages/dz/LC_MESSAGES/3166-1.po
+++ b/messages/dz/LC_MESSAGES/3166-1.po
@@ -1,11 +1,11 @@
-# Translation of ISO-3166 (country names) to Dzongkha
+# Translation of ISO 3166-1 to Dzongkha
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2006
-#   Kinley Tshering <gaseokuenden2k3@hotmail.com>, 2006
-#
+# Copyright ©
+# Kinley Tshering <gaseokuenden2k3@hotmail.com>, 2006
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/dz/LC_MESSAGES/3166-3.mo b/messages/dz/LC_MESSAGES/3166-3.mo
index 9130e8bc..79cee1c0 100644
Binary files a/messages/dz/LC_MESSAGES/3166-3.mo and b/messages/dz/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ee/LC_MESSAGES/3166-1.mo b/messages/ee/LC_MESSAGES/3166-1.mo
index 824f8787..68b4e1fe 100644
Binary files a/messages/ee/LC_MESSAGES/3166-1.mo and b/messages/ee/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ee/LC_MESSAGES/3166-1.po b/messages/ee/LC_MESSAGES/3166-1.po
index b7a2eaf9..c8c87e31 100644
--- a/messages/ee/LC_MESSAGES/3166-1.po
+++ b/messages/ee/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Ewe
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/el/LC_MESSAGES/15924.mo b/messages/el/LC_MESSAGES/15924.mo
index 12239aef..237a7f59 100644
Binary files a/messages/el/LC_MESSAGES/15924.mo and b/messages/el/LC_MESSAGES/15924.mo differ
diff --git a/messages/el/LC_MESSAGES/3166-1.mo b/messages/el/LC_MESSAGES/3166-1.mo
index 918c9cc2..5b32f942 100644
Binary files a/messages/el/LC_MESSAGES/3166-1.mo and b/messages/el/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/el/LC_MESSAGES/3166-1.po b/messages/el/LC_MESSAGES/3166-1.po
index 4965524d..384a0cbc 100644
--- a/messages/el/LC_MESSAGES/3166-1.po
+++ b/messages/el/LC_MESSAGES/3166-1.po
@@ -1,13 +1,14 @@
-# Translation of ISO-3166 (country names) to Greek
+# Translation of ISO 3166-1 to Greek, Modern (1453-)
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Panayotis Pakos <aeikineton@yahoo.com>
-#   Free Software Foundation, Inc., 2004.
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Konstantinos Margaritis <markos@debian.org>, 2004.
-#   QUAD-nrg.net <yodesy@quad-nrg.net>, 2006, 2010.
+# Copyright ©
+# Panayotis Pakos <aeikineton@yahoo.com>
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Konstantinos Margaritis <markos@debian.org>, 2004.
+# QUAD-nrg.net <yodesy@quad-nrg.net>, 2006, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/el/LC_MESSAGES/3166-2.mo b/messages/el/LC_MESSAGES/3166-2.mo
index a86c3574..cd1f432f 100644
Binary files a/messages/el/LC_MESSAGES/3166-2.mo and b/messages/el/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/el/LC_MESSAGES/3166-3.mo b/messages/el/LC_MESSAGES/3166-3.mo
index 2f505d26..9bd04522 100644
Binary files a/messages/el/LC_MESSAGES/3166-3.mo and b/messages/el/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/el/LC_MESSAGES/4217.mo b/messages/el/LC_MESSAGES/4217.mo
index e0418e09..3d097ed2 100644
Binary files a/messages/el/LC_MESSAGES/4217.mo and b/messages/el/LC_MESSAGES/4217.mo differ
diff --git a/messages/el/LC_MESSAGES/639-2.mo b/messages/el/LC_MESSAGES/639-2.mo
index 7ffb3310..0c98920d 100644
Binary files a/messages/el/LC_MESSAGES/639-2.mo and b/messages/el/LC_MESSAGES/639-2.mo differ
diff --git a/messages/el/LC_MESSAGES/639-2.po b/messages/el/LC_MESSAGES/639-2.po
index 16bd00cf..69e7d019 100644
--- a/messages/el/LC_MESSAGES/639-2.po
+++ b/messages/el/LC_MESSAGES/639-2.po
@@ -1,7 +1,10 @@
-# Greek translation of ISO 639 (language names)
-# Copyright (C) 2001 - 2008 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Greek, Modern (1453-)
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
 #
+# Copyright ©
 # Simos Xenitellis <simos@hellug.gr>, 2001.
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
 # Konstantinos Margaritis <markos@debian.org>, 2004.
diff --git a/messages/el/LC_MESSAGES/639-3.mo b/messages/el/LC_MESSAGES/639-3.mo
index a82c2126..e2171e10 100644
Binary files a/messages/el/LC_MESSAGES/639-3.mo and b/messages/el/LC_MESSAGES/639-3.mo differ
diff --git a/messages/en/LC_MESSAGES/3166-2.mo b/messages/en/LC_MESSAGES/3166-2.mo
index 7d171223..ebfe68e5 100644
Binary files a/messages/en/LC_MESSAGES/3166-2.mo and b/messages/en/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/eo/LC_MESSAGES/15924.mo b/messages/eo/LC_MESSAGES/15924.mo
index 90e1d4d3..f0e53a2a 100644
Binary files a/messages/eo/LC_MESSAGES/15924.mo and b/messages/eo/LC_MESSAGES/15924.mo differ
diff --git a/messages/eo/LC_MESSAGES/3166-1.mo b/messages/eo/LC_MESSAGES/3166-1.mo
index dd622838..d14fc3eb 100644
Binary files a/messages/eo/LC_MESSAGES/3166-1.mo and b/messages/eo/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/eo/LC_MESSAGES/3166-1.po b/messages/eo/LC_MESSAGES/3166-1.po
index 4c74420e..e5f28997 100644
--- a/messages/eo/LC_MESSAGES/3166-1.po
+++ b/messages/eo/LC_MESSAGES/3166-1.po
@@ -1,10 +1,13 @@
-# Esperanto translations of ISO-3166 element names
-# Copyright (C) 2001,2003,2004 Free Software Foundation, Inc.
+# Translation of ISO 3166-1 to Esperanto
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # D. Dale Gulledge <dsplat@rochester.rr.com> (translations from drakfw), 2001.
 # Alastair McKInstry <mckinstry@computer.org>, 2001.
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2004-2015.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/eo/LC_MESSAGES/3166-2.mo b/messages/eo/LC_MESSAGES/3166-2.mo
index 847d8c3f..d8e61d81 100644
Binary files a/messages/eo/LC_MESSAGES/3166-2.mo and b/messages/eo/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/eo/LC_MESSAGES/3166-3.mo b/messages/eo/LC_MESSAGES/3166-3.mo
index 15965c4b..73660f40 100644
Binary files a/messages/eo/LC_MESSAGES/3166-3.mo and b/messages/eo/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/eo/LC_MESSAGES/639-2.mo b/messages/eo/LC_MESSAGES/639-2.mo
index a49b64e6..b358db7d 100644
Binary files a/messages/eo/LC_MESSAGES/639-2.mo and b/messages/eo/LC_MESSAGES/639-2.mo differ
diff --git a/messages/eo/LC_MESSAGES/639-2.po b/messages/eo/LC_MESSAGES/639-2.po
index c80331dc..bb764874 100644
--- a/messages/eo/LC_MESSAGES/639-2.po
+++ b/messages/eo/LC_MESSAGES/639-2.po
@@ -1,9 +1,12 @@
-# Esperanto translations of ISO 639 Language names
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Esperanto
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Alastair McKinstry <mckinstry@computer.org>, 2002
 # Edmund GRIMLEY EVANS <edmundo@rano.org>, 2004-2011, 2013
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/eo/LC_MESSAGES/639-3.mo b/messages/eo/LC_MESSAGES/639-3.mo
index b8e44e16..6413ec43 100644
Binary files a/messages/eo/LC_MESSAGES/639-3.mo and b/messages/eo/LC_MESSAGES/639-3.mo differ
diff --git a/messages/es/LC_MESSAGES/15924.mo b/messages/es/LC_MESSAGES/15924.mo
index eb0d4614..f8507f4f 100644
Binary files a/messages/es/LC_MESSAGES/15924.mo and b/messages/es/LC_MESSAGES/15924.mo differ
diff --git a/messages/es/LC_MESSAGES/3166-1.mo b/messages/es/LC_MESSAGES/3166-1.mo
index d33b9a5a..53710b77 100644
Binary files a/messages/es/LC_MESSAGES/3166-1.mo and b/messages/es/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/es/LC_MESSAGES/3166-1.po b/messages/es/LC_MESSAGES/3166-1.po
index fd46cb67..6bea658d 100644
--- a/messages/es/LC_MESSAGES/3166-1.po
+++ b/messages/es/LC_MESSAGES/3166-1.po
@@ -1,7 +1,10 @@
-# Translation of ISO-3166 (country names) to Spanish
+# Translation of ISO 3166-1 to Spanish; Castilian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
-# Copyright (C)
-# Free Software Foundation, Inc., 2001,2003,2004
+#
+# Copyright ©
 # Juan Manuel García Molina <juanmagm@mail.com>, 2001.
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
 # Javier Fernández-Sanguino <jfs@debian.org>, 2004-2008, 2010
diff --git a/messages/es/LC_MESSAGES/3166-2.mo b/messages/es/LC_MESSAGES/3166-2.mo
index 59768a84..d6fc326b 100644
Binary files a/messages/es/LC_MESSAGES/3166-2.mo and b/messages/es/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/es/LC_MESSAGES/3166-3.mo b/messages/es/LC_MESSAGES/3166-3.mo
index 97aea241..da6c3d06 100644
Binary files a/messages/es/LC_MESSAGES/3166-3.mo and b/messages/es/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/es/LC_MESSAGES/4217.mo b/messages/es/LC_MESSAGES/4217.mo
index 5c55c67e..c8070d27 100644
Binary files a/messages/es/LC_MESSAGES/4217.mo and b/messages/es/LC_MESSAGES/4217.mo differ
diff --git a/messages/es/LC_MESSAGES/639-2.mo b/messages/es/LC_MESSAGES/639-2.mo
index 7d9e1fdc..6b4d76d5 100644
Binary files a/messages/es/LC_MESSAGES/639-2.mo and b/messages/es/LC_MESSAGES/639-2.mo differ
diff --git a/messages/es/LC_MESSAGES/639-2.po b/messages/es/LC_MESSAGES/639-2.po
index f30dafff..da55aae6 100644
--- a/messages/es/LC_MESSAGES/639-2.po
+++ b/messages/es/LC_MESSAGES/639-2.po
@@ -1,13 +1,13 @@
-# Translation of ISO-639 (language names) to Spanish
+# Translation of ISO 639-2 to Spanish; Castilian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2000, 2004
-#   Ricardo Fernández Pascual <ric@users.sourceforge.net>, 2000, 2001.
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Javier Fernández-Sanguino Peña <jfs@debian.org>, 2004-2007
-#
+# Copyright ©
+# Ricardo Fernández Pascual <ric@users.sourceforge.net>, 2000, 2001.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Javier Fernández-Sanguino Peña <jfs@debian.org>, 2004-2007
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/es/LC_MESSAGES/639-3.mo b/messages/es/LC_MESSAGES/639-3.mo
index b95a27f4..eeb80433 100644
Binary files a/messages/es/LC_MESSAGES/639-3.mo and b/messages/es/LC_MESSAGES/639-3.mo differ
diff --git a/messages/et/LC_MESSAGES/15924.mo b/messages/et/LC_MESSAGES/15924.mo
index e213e386..5cd16025 100644
Binary files a/messages/et/LC_MESSAGES/15924.mo and b/messages/et/LC_MESSAGES/15924.mo differ
diff --git a/messages/et/LC_MESSAGES/3166-1.mo b/messages/et/LC_MESSAGES/3166-1.mo
index 2163d1e7..403e7a6f 100644
Binary files a/messages/et/LC_MESSAGES/3166-1.mo and b/messages/et/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/et/LC_MESSAGES/3166-1.po b/messages/et/LC_MESSAGES/3166-1.po
index 2099da9e..447505fa 100644
--- a/messages/et/LC_MESSAGES/3166-1.po
+++ b/messages/et/LC_MESSAGES/3166-1.po
@@ -1,16 +1,17 @@
-# Translation of ISO-3166 (country names) to Estonian
-#
-# Tõlgete aluseks on Eesti Keele Instituudi Emakeele Seltsi keeletoimkonna koostatud maailma maade nimede loend
+# Translation of ISO 3166-1 to Estonian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2006
-#   Alastair McKinstry <mckinstry@computer.org>, 2002.
-#   Hasso Tepper <hasso@estpak.ee>, 2006.
-#   Siim Põder <windo@p6drad-teel.net>, 2006.
-#   Tõivo Leedjärv <toivol@gmail.com>, 2008, 2011, 2013.
+# Notes:
+# Tõlgete aluseks on Eesti Keele Instituudi Emakeele Seltsi keeletoimkonna koostatud maailma maade nimede loend
 #
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002.
+# Hasso Tepper <hasso@estpak.ee>, 2006.
+# Siim Põder <windo@p6drad-teel.net>, 2006.
+# Tõivo Leedjärv <toivol@gmail.com>, 2008, 2011, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/et/LC_MESSAGES/3166-2.mo b/messages/et/LC_MESSAGES/3166-2.mo
index 0785132f..b97385aa 100644
Binary files a/messages/et/LC_MESSAGES/3166-2.mo and b/messages/et/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/et/LC_MESSAGES/3166-3.mo b/messages/et/LC_MESSAGES/3166-3.mo
index 49d3d8a1..dd83cad8 100644
Binary files a/messages/et/LC_MESSAGES/3166-3.mo and b/messages/et/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/et/LC_MESSAGES/4217.mo b/messages/et/LC_MESSAGES/4217.mo
index 18a1da2a..0785bc92 100644
Binary files a/messages/et/LC_MESSAGES/4217.mo and b/messages/et/LC_MESSAGES/4217.mo differ
diff --git a/messages/et/LC_MESSAGES/639-2.mo b/messages/et/LC_MESSAGES/639-2.mo
index d7bd312c..cfb7f9e5 100644
Binary files a/messages/et/LC_MESSAGES/639-2.mo and b/messages/et/LC_MESSAGES/639-2.mo differ
diff --git a/messages/et/LC_MESSAGES/639-2.po b/messages/et/LC_MESSAGES/639-2.po
index a0e605a7..607f4192 100644
--- a/messages/et/LC_MESSAGES/639-2.po
+++ b/messages/et/LC_MESSAGES/639-2.po
@@ -1,13 +1,13 @@
-# Translation of ISO-639 (language names) to Estonian
+# Translation of ISO 639-2 to Estonian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2000, 2004
-#   Margus Väli <mvali@hot.ee>, 2000.
-#   Tõivo Leedjärv <leedjarv@interest.ee>, 2000, 2001.
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#
+# Copyright ©
+# Margus Väli <mvali@hot.ee>, 2000.
+# Tõivo Leedjärv <leedjarv@interest.ee>, 2000, 2001.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/et/LC_MESSAGES/639-3.mo b/messages/et/LC_MESSAGES/639-3.mo
index e55590b5..6e09e66d 100644
Binary files a/messages/et/LC_MESSAGES/639-3.mo and b/messages/et/LC_MESSAGES/639-3.mo differ
diff --git a/messages/et/LC_MESSAGES/639-5.mo b/messages/et/LC_MESSAGES/639-5.mo
index de992580..cf982440 100644
Binary files a/messages/et/LC_MESSAGES/639-5.mo and b/messages/et/LC_MESSAGES/639-5.mo differ
diff --git a/messages/eu/LC_MESSAGES/3166-1.mo b/messages/eu/LC_MESSAGES/3166-1.mo
index 05a3f3bd..5d85ae06 100644
Binary files a/messages/eu/LC_MESSAGES/3166-1.mo and b/messages/eu/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/eu/LC_MESSAGES/3166-1.po b/messages/eu/LC_MESSAGES/3166-1.po
index b7cdf4a3..12ef394c 100644
--- a/messages/eu/LC_MESSAGES/3166-1.po
+++ b/messages/eu/LC_MESSAGES/3166-1.po
@@ -1,10 +1,10 @@
-# translation of iso-codes_eu.po to Basque
-# Translation of ISO-3166 (country names) to Basque
+# Translation of ISO 3166-1 to Basque
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#
+# Copyright ©
 # Mikel Olasagasti <hey_neken@mundurat.net>, 2004.
 # Piarres Beobide Egaña <pi@beobide.net>, 2004,2006,2007, 2008, 2009, 2012.
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2010, 2013.
diff --git a/messages/eu/LC_MESSAGES/3166-2.mo b/messages/eu/LC_MESSAGES/3166-2.mo
index 331a8ba4..2fb7f147 100644
Binary files a/messages/eu/LC_MESSAGES/3166-2.mo and b/messages/eu/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/eu/LC_MESSAGES/3166-3.mo b/messages/eu/LC_MESSAGES/3166-3.mo
index 412ddee3..1e649559 100644
Binary files a/messages/eu/LC_MESSAGES/3166-3.mo and b/messages/eu/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/eu/LC_MESSAGES/639-2.mo b/messages/eu/LC_MESSAGES/639-2.mo
index 0fbad1eb..b81a3a27 100644
Binary files a/messages/eu/LC_MESSAGES/639-2.mo and b/messages/eu/LC_MESSAGES/639-2.mo differ
diff --git a/messages/eu/LC_MESSAGES/639-2.po b/messages/eu/LC_MESSAGES/639-2.po
index e849547c..b1e73c0e 100644
--- a/messages/eu/LC_MESSAGES/639-2.po
+++ b/messages/eu/LC_MESSAGES/639-2.po
@@ -1,12 +1,14 @@
-# Translation of ISO-639 (language names) to Basque
+# Translation of ISO 639-2 to Basque
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
-#   Free Software Foundation, Inc., 2002.
-#   Alastair McKinstry <mckinstry@computer.org>, 2002.
-#   Marcos Goienetxe <marcos_g@infonegocio.com>, 2002.
+#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002.
+# Marcos Goienetxe <marcos_g@infonegocio.com>, 2002.
 # Piarres Beobide <pi@beobide.net>, 2008.
 # Xabier Bilbao <xabidu@gmail.com>, 2008.
-# Copyright (C)
-#   Translations from KDE:
 msgid ""
 msgstr ""
 "Project-Id-Version: xd-ISO_639-eu\n"
diff --git a/messages/eu/LC_MESSAGES/639-3.mo b/messages/eu/LC_MESSAGES/639-3.mo
index 43026edb..47eba174 100644
Binary files a/messages/eu/LC_MESSAGES/639-3.mo and b/messages/eu/LC_MESSAGES/639-3.mo differ
diff --git a/messages/fa/LC_MESSAGES/15924.mo b/messages/fa/LC_MESSAGES/15924.mo
index ca66d759..102b8ff5 100644
Binary files a/messages/fa/LC_MESSAGES/15924.mo and b/messages/fa/LC_MESSAGES/15924.mo differ
diff --git a/messages/fa/LC_MESSAGES/3166-1.mo b/messages/fa/LC_MESSAGES/3166-1.mo
index dbcc744a..da59e2bd 100644
Binary files a/messages/fa/LC_MESSAGES/3166-1.mo and b/messages/fa/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/fa/LC_MESSAGES/3166-1.po b/messages/fa/LC_MESSAGES/3166-1.po
index 26fe0e08..eca949e1 100644
--- a/messages/fa/LC_MESSAGES/3166-1.po
+++ b/messages/fa/LC_MESSAGES/3166-1.po
@@ -1,14 +1,12 @@
-# Translation of ISO-3166 (country names) to Persian
+# Translation of ISO 3166-1 to Persian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2001,2003
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Translations from kde:
-#   - FarsiKDE Team <info@farsikde.org>
-#   Alastair McKinstry - further translations from ICU-3.0
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# FarsiKDE Team <info@farsikde.org>
 msgid ""
 msgstr ""
 "Project-Id-Version: fa\n"
diff --git a/messages/fa/LC_MESSAGES/3166-3.mo b/messages/fa/LC_MESSAGES/3166-3.mo
index 7d5f8abe..a0619934 100644
Binary files a/messages/fa/LC_MESSAGES/3166-3.mo and b/messages/fa/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/fa/LC_MESSAGES/639-2.mo b/messages/fa/LC_MESSAGES/639-2.mo
index 9e9d6e04..af3f0bfa 100644
Binary files a/messages/fa/LC_MESSAGES/639-2.mo and b/messages/fa/LC_MESSAGES/639-2.mo differ
diff --git a/messages/fa/LC_MESSAGES/639-2.po b/messages/fa/LC_MESSAGES/639-2.po
index 0dc122bf..c65da5b8 100644
--- a/messages/fa/LC_MESSAGES/639-2.po
+++ b/messages/fa/LC_MESSAGES/639-2.po
@@ -1,13 +1,12 @@
-# Translation of ISO-639 (language names) to Persian
+# Translation of ISO 639-2 to Persian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2004
-#   Sharif FarsiWeb, Inc., 2004
-#   Roozbeh Pournader <roozbeh@farsiweb.info>, 2004,2005.
-#   Alastair McKinstry <mckinstry@debian.org>, 2004
-#
+# Copyright ©
+# Roozbeh Pournader <roozbeh@farsiweb.info>, 2004,2005.
+# Alastair McKinstry <mckinstry@debian.org>, 2004
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/fa/LC_MESSAGES/639-3.mo b/messages/fa/LC_MESSAGES/639-3.mo
index 9b1a4181..b2da77a0 100644
Binary files a/messages/fa/LC_MESSAGES/639-3.mo and b/messages/fa/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ff/LC_MESSAGES/3166-1.mo b/messages/ff/LC_MESSAGES/3166-1.mo
index 7b59e099..c938fb4d 100644
Binary files a/messages/ff/LC_MESSAGES/3166-1.mo and b/messages/ff/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ff/LC_MESSAGES/3166-1.po b/messages/ff/LC_MESSAGES/3166-1.po
index 8c78dcaa..33ec6f1b 100644
--- a/messages/ff/LC_MESSAGES/3166-1.po
+++ b/messages/ff/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Fulah
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/fi/LC_MESSAGES/15924.mo b/messages/fi/LC_MESSAGES/15924.mo
index 52537a29..3ff80f35 100644
Binary files a/messages/fi/LC_MESSAGES/15924.mo and b/messages/fi/LC_MESSAGES/15924.mo differ
diff --git a/messages/fi/LC_MESSAGES/3166-1.mo b/messages/fi/LC_MESSAGES/3166-1.mo
index a4ed6fbd..15a35a3a 100644
Binary files a/messages/fi/LC_MESSAGES/3166-1.mo and b/messages/fi/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/fi/LC_MESSAGES/3166-1.po b/messages/fi/LC_MESSAGES/3166-1.po
index 374c9b0e..47e28c46 100644
--- a/messages/fi/LC_MESSAGES/3166-1.po
+++ b/messages/fi/LC_MESSAGES/3166-1.po
@@ -1,11 +1,16 @@
-# Finnish translations for iso-codes package.
-# Copyright (C) 2005-2006, 2008-2011 Free Software Foundation, Inc.
+# Translation of ISO 3166-1 to Finnish
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
-# Tommi Vainikainen <Tommi.Vainikainen@iki.fi>, 2005-2006, 2008-2011.
 #
+# Notes:
 # Lähteet:
 # http://europa.eu.int/comm/translation/currencies/fitable1.htm
 # http://kotoistus.fi/avoimet/kop_alueiden-nimet.html
+#
+# Copyright ©
+# Tommi Vainikainen <Tommi.Vainikainen@iki.fi>, 2005-2006, 2008-2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/fi/LC_MESSAGES/3166-2.mo b/messages/fi/LC_MESSAGES/3166-2.mo
index 8390f5f8..85e9b764 100644
Binary files a/messages/fi/LC_MESSAGES/3166-2.mo and b/messages/fi/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/fi/LC_MESSAGES/3166-3.mo b/messages/fi/LC_MESSAGES/3166-3.mo
index 728a5a39..dbaf9f36 100644
Binary files a/messages/fi/LC_MESSAGES/3166-3.mo and b/messages/fi/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/fi/LC_MESSAGES/4217.mo b/messages/fi/LC_MESSAGES/4217.mo
index 98b78f65..cbffc4bb 100644
Binary files a/messages/fi/LC_MESSAGES/4217.mo and b/messages/fi/LC_MESSAGES/4217.mo differ
diff --git a/messages/fi/LC_MESSAGES/639-2.mo b/messages/fi/LC_MESSAGES/639-2.mo
index ec0bb48f..7e0c0b69 100644
Binary files a/messages/fi/LC_MESSAGES/639-2.mo and b/messages/fi/LC_MESSAGES/639-2.mo differ
diff --git a/messages/fi/LC_MESSAGES/639-2.po b/messages/fi/LC_MESSAGES/639-2.po
index ee8a700a..a688e9d6 100644
--- a/messages/fi/LC_MESSAGES/639-2.po
+++ b/messages/fi/LC_MESSAGES/639-2.po
@@ -1,8 +1,11 @@
-# Finnish translations for iso_639 package.
-# Copyright (C) 2005-2010 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Finnish
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
-# Tommi Vainikainen <Tommi.Vainikainen@iki.fi>, 2005-2010.
 #
+# Copyright ©
+# Tommi Vainikainen <Tommi.Vainikainen@iki.fi>, 2005-2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/fi/LC_MESSAGES/639-3.mo b/messages/fi/LC_MESSAGES/639-3.mo
index 6b64e725..84f2a0fd 100644
Binary files a/messages/fi/LC_MESSAGES/639-3.mo and b/messages/fi/LC_MESSAGES/639-3.mo differ
diff --git a/messages/fo/LC_MESSAGES/3166-1.mo b/messages/fo/LC_MESSAGES/3166-1.mo
index 7b87937b..f4d2c565 100644
Binary files a/messages/fo/LC_MESSAGES/3166-1.mo and b/messages/fo/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/fo/LC_MESSAGES/3166-1.po b/messages/fo/LC_MESSAGES/3166-1.po
index e20aff81..0e5ed0b1 100644
--- a/messages/fo/LC_MESSAGES/3166-1.po
+++ b/messages/fo/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO-3166 (country names) to Faroese
+# Translation of ISO 3166-1 to Faroese
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/fo/LC_MESSAGES/3166-3.mo b/messages/fo/LC_MESSAGES/3166-3.mo
index 9db22e6e..3e6957f5 100644
Binary files a/messages/fo/LC_MESSAGES/3166-3.mo and b/messages/fo/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/fr/LC_MESSAGES/15924.mo b/messages/fr/LC_MESSAGES/15924.mo
index ec395d29..d6c82edb 100644
Binary files a/messages/fr/LC_MESSAGES/15924.mo and b/messages/fr/LC_MESSAGES/15924.mo differ
diff --git a/messages/fr/LC_MESSAGES/3166-1.mo b/messages/fr/LC_MESSAGES/3166-1.mo
index 2bade44c..3c41113a 100644
Binary files a/messages/fr/LC_MESSAGES/3166-1.mo and b/messages/fr/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/fr/LC_MESSAGES/3166-1.po b/messages/fr/LC_MESSAGES/3166-1.po
index f3afd4c2..a12814a0 100644
--- a/messages/fr/LC_MESSAGES/3166-1.po
+++ b/messages/fr/LC_MESSAGES/3166-1.po
@@ -1,14 +1,14 @@
-# Translation of ISO-3166 (country names) to French
+# Translation of ISO 3166-1 to French
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#
-#   Free Software Foundation, Inc., 2006.
-#   Grégoire Colbert <gregus@linux-mandrake.com>, 2001.
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Christian Perrier <bubulle@debian.org>, 2004, 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2015, 2016.
-#   Tobias Quathamer <toddy@debian.org>, 2008.
+# Copyright ©
+# Grégoire Colbert <gregus@linux-mandrake.com>, 2001.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Christian Perrier <bubulle@debian.org>, 2004, 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2015, 2016.
+# Dr. Tobias Quathamer <toddy@debian.org>, 2008.
 # Alban Vidal <alban.vidal@zordhak.fr>, 2017.
 msgid ""
 msgstr ""
diff --git a/messages/fr/LC_MESSAGES/3166-2.mo b/messages/fr/LC_MESSAGES/3166-2.mo
index 2232821b..1326a7fa 100644
Binary files a/messages/fr/LC_MESSAGES/3166-2.mo and b/messages/fr/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/fr/LC_MESSAGES/3166-3.mo b/messages/fr/LC_MESSAGES/3166-3.mo
index de2f55c5..ebf768b7 100644
Binary files a/messages/fr/LC_MESSAGES/3166-3.mo and b/messages/fr/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/fr/LC_MESSAGES/4217.mo b/messages/fr/LC_MESSAGES/4217.mo
index 9a452fd7..e69fb037 100644
Binary files a/messages/fr/LC_MESSAGES/4217.mo and b/messages/fr/LC_MESSAGES/4217.mo differ
diff --git a/messages/fr/LC_MESSAGES/639-2.mo b/messages/fr/LC_MESSAGES/639-2.mo
index 8c809353..021b2b48 100644
Binary files a/messages/fr/LC_MESSAGES/639-2.mo and b/messages/fr/LC_MESSAGES/639-2.mo differ
diff --git a/messages/fr/LC_MESSAGES/639-2.po b/messages/fr/LC_MESSAGES/639-2.po
index e96a9002..75b6bcbd 100644
--- a/messages/fr/LC_MESSAGES/639-2.po
+++ b/messages/fr/LC_MESSAGES/639-2.po
@@ -1,10 +1,10 @@
-# Translation of ISO-639 (language names) to French
+# Translation of ISO 639-2 to French
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#
-# Free Software Foundation, Inc., 2000-2001, 2004, 2005, 2006.
+# Copyright ©
 # Christophe Fergeau <christophe.fergeau@ensimag.imag.fr>, 2000-2001.
 # Christophe Merlet (RedFox) <redfox@eikonex.org>, 2001.
 # Cedric De Wilde <daique@tiscalinet.be>, 2001.
diff --git a/messages/fr/LC_MESSAGES/639-3.mo b/messages/fr/LC_MESSAGES/639-3.mo
index 0fd74638..3441dcf3 100644
Binary files a/messages/fr/LC_MESSAGES/639-3.mo and b/messages/fr/LC_MESSAGES/639-3.mo differ
diff --git a/messages/fr/LC_MESSAGES/639-5.mo b/messages/fr/LC_MESSAGES/639-5.mo
index ce68627f..35617bfe 100644
Binary files a/messages/fr/LC_MESSAGES/639-5.mo and b/messages/fr/LC_MESSAGES/639-5.mo differ
diff --git a/messages/frp/LC_MESSAGES/3166-1.mo b/messages/frp/LC_MESSAGES/3166-1.mo
index dfc1f9f9..ff3b9422 100644
Binary files a/messages/frp/LC_MESSAGES/3166-1.mo and b/messages/frp/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/frp/LC_MESSAGES/3166-1.po b/messages/frp/LC_MESSAGES/3166-1.po
index e6b04b24..3a1e1c72 100644
--- a/messages/frp/LC_MESSAGES/3166-1.po
+++ b/messages/frp/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Franco-Provençal
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/fur/LC_MESSAGES/3166-1.mo b/messages/fur/LC_MESSAGES/3166-1.mo
index 6acecaea..2c6fd1c2 100644
Binary files a/messages/fur/LC_MESSAGES/3166-1.mo and b/messages/fur/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/fur/LC_MESSAGES/3166-1.po b/messages/fur/LC_MESSAGES/3166-1.po
index 68097e70..3d59213d 100644
--- a/messages/fur/LC_MESSAGES/3166-1.po
+++ b/messages/fur/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Friulian
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/fy/LC_MESSAGES/3166-1.mo b/messages/fy/LC_MESSAGES/3166-1.mo
index 3a5a759c..10fb1652 100644
Binary files a/messages/fy/LC_MESSAGES/3166-1.mo and b/messages/fy/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/fy/LC_MESSAGES/3166-1.po b/messages/fy/LC_MESSAGES/3166-1.po
index 9856fb46..e5ff38a3 100644
--- a/messages/fy/LC_MESSAGES/3166-1.po
+++ b/messages/fy/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Western Frisian
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ga/LC_MESSAGES/3166-1.mo b/messages/ga/LC_MESSAGES/3166-1.mo
index 9dbb434c..464a40f3 100644
Binary files a/messages/ga/LC_MESSAGES/3166-1.mo and b/messages/ga/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ga/LC_MESSAGES/3166-1.po b/messages/ga/LC_MESSAGES/3166-1.po
index f2e799da..b8a6ae5e 100644
--- a/messages/ga/LC_MESSAGES/3166-1.po
+++ b/messages/ga/LC_MESSAGES/3166-1.po
@@ -1,12 +1,12 @@
-# Translation of ISO-3166 (country names) to Irish
+# Translation of ISO 3166-1 to Irish
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-# Free Software Foundation, Inc., 2001,2003
+# Copyright ©
 # Alastair McKinstry <mckinstry@debian>, 2001.
 # Kevin Scannell <kscanne@gmail.com>, 2008, 2009, 2010, 2011, 2013.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ga/LC_MESSAGES/3166-2.mo b/messages/ga/LC_MESSAGES/3166-2.mo
index 8349125e..ab2870cb 100644
Binary files a/messages/ga/LC_MESSAGES/3166-2.mo and b/messages/ga/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/ga/LC_MESSAGES/3166-3.mo b/messages/ga/LC_MESSAGES/3166-3.mo
index fb3dedc1..269d31ef 100644
Binary files a/messages/ga/LC_MESSAGES/3166-3.mo and b/messages/ga/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ga/LC_MESSAGES/4217.mo b/messages/ga/LC_MESSAGES/4217.mo
index 2d1ad01e..5c85f591 100644
Binary files a/messages/ga/LC_MESSAGES/4217.mo and b/messages/ga/LC_MESSAGES/4217.mo differ
diff --git a/messages/ga/LC_MESSAGES/639-2.mo b/messages/ga/LC_MESSAGES/639-2.mo
index ed1582e7..106db953 100644
Binary files a/messages/ga/LC_MESSAGES/639-2.mo and b/messages/ga/LC_MESSAGES/639-2.mo differ
diff --git a/messages/ga/LC_MESSAGES/639-2.po b/messages/ga/LC_MESSAGES/639-2.po
index 77d27f5f..ff7db7f9 100644
--- a/messages/ga/LC_MESSAGES/639-2.po
+++ b/messages/ga/LC_MESSAGES/639-2.po
@@ -1,15 +1,20 @@
-# Irish translations of ISO 639 Language names
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Irish
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
-# Kevin Patrick Scannell <scannell@SLU.EDU>, 2004, 2008, 2009, 2011.
-# Alastair McKinstry <mckinstry@computer.org>, 2002
-# Sean V. Kelley <s_oceallaigh@yahoo.com>, 1999
 #
+# Notes:
 # 11 Jan 2004: I've added a translator's note to translations that appear
 #   to be "coinages"; i.e. do not appear in any standard print or online
 #   references, or in a large (20M word) text corpus.  The others should
 #   be treated as more or less authoritative.  Future translators: feel
 #   free to fill in gaps but please continue to mark coinages as such.  --KPS
+#
+# Copyright ©
+# Kevin Patrick Scannell <scannell@SLU.EDU>, 2004, 2008, 2009, 2011.
+# Alastair McKinstry <mckinstry@computer.org>, 2002
+# Sean V. Kelley <s_oceallaigh@yahoo.com>, 1999
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/ga/LC_MESSAGES/639-3.mo b/messages/ga/LC_MESSAGES/639-3.mo
index 58baff68..57a65aea 100644
Binary files a/messages/ga/LC_MESSAGES/639-3.mo and b/messages/ga/LC_MESSAGES/639-3.mo differ
diff --git a/messages/gez/LC_MESSAGES/3166-1.mo b/messages/gez/LC_MESSAGES/3166-1.mo
index ae5f19cd..65f0b82d 100644
Binary files a/messages/gez/LC_MESSAGES/3166-1.mo and b/messages/gez/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/gez/LC_MESSAGES/3166-1.po b/messages/gez/LC_MESSAGES/3166-1.po
index d599aba2..abd92cac 100644
--- a/messages/gez/LC_MESSAGES/3166-1.po
+++ b/messages/gez/LC_MESSAGES/3166-1.po
@@ -1,11 +1,11 @@
-# Translation of ISO-3166 (country names) to Geez
+# Translation of ISO 3166-1 to Geez
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#   - translations from ICU-3.0
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/gez/LC_MESSAGES/3166-3.mo b/messages/gez/LC_MESSAGES/3166-3.mo
index 72a4406d..d908b7ef 100644
Binary files a/messages/gez/LC_MESSAGES/3166-3.mo and b/messages/gez/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/gez/LC_MESSAGES/639-2.mo b/messages/gez/LC_MESSAGES/639-2.mo
index 5eef2c34..84118922 100644
Binary files a/messages/gez/LC_MESSAGES/639-2.mo and b/messages/gez/LC_MESSAGES/639-2.mo differ
diff --git a/messages/gez/LC_MESSAGES/639-2.po b/messages/gez/LC_MESSAGES/639-2.po
index 779484dd..cf2f45ab 100644
--- a/messages/gez/LC_MESSAGES/639-2.po
+++ b/messages/gez/LC_MESSAGES/639-2.po
@@ -1,10 +1,11 @@
-# Translation of ISO-639 (language names) to Geez
+# Translation of ISO 639-2 to Geez
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/gez/LC_MESSAGES/639-3.mo b/messages/gez/LC_MESSAGES/639-3.mo
index 4e5d3205..c02c7270 100644
Binary files a/messages/gez/LC_MESSAGES/639-3.mo and b/messages/gez/LC_MESSAGES/639-3.mo differ
diff --git a/messages/gl/LC_MESSAGES/15924.mo b/messages/gl/LC_MESSAGES/15924.mo
index 5b008f6f..f681de43 100644
Binary files a/messages/gl/LC_MESSAGES/15924.mo and b/messages/gl/LC_MESSAGES/15924.mo differ
diff --git a/messages/gl/LC_MESSAGES/3166-1.mo b/messages/gl/LC_MESSAGES/3166-1.mo
index 6d75bf72..8897210f 100644
Binary files a/messages/gl/LC_MESSAGES/3166-1.mo and b/messages/gl/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/gl/LC_MESSAGES/3166-1.po b/messages/gl/LC_MESSAGES/3166-1.po
index e5c1f162..01267a6e 100644
--- a/messages/gl/LC_MESSAGES/3166-1.po
+++ b/messages/gl/LC_MESSAGES/3166-1.po
@@ -1,17 +1,14 @@
-# translation of iso-codes_iso_3166_gl.po to Galician
-# Translation of ISO-3166 (country names) to Galician
+# Translation of ISO 3166-1 to Galician
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Translations from KDE desktop.po:
-#   - Jesús Bravo Álvarez <jba@pobox.com>
-#   Alastair McKinstry - further translations from ICU-3.0
-#
-#   Free Software Foundation, Inc., 2002,2003.
-#   Alastair McKinstry, <mckinstry@computer.org>, 2002.
-#   Jacobo Tarrío <jtarrio@debian.org>, 2005, 2006, 2007, 2008.
-#   Jorge Barreiro <yortx.barry@gmail.com>, 2010, 2012, 2013, 2014.
+# Copyright ©
+# Jesús Bravo Álvarez <jba@pobox.com>
+# Alastair McKinstry, <mckinstry@computer.org>, 2002.
+# Jacobo Tarrío <jtarrio@debian.org>, 2005, 2006, 2007, 2008.
+# Jorge Barreiro <yortx.barry@gmail.com>, 2010, 2012, 2013, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/gl/LC_MESSAGES/3166-3.mo b/messages/gl/LC_MESSAGES/3166-3.mo
index 783c90f9..437de736 100644
Binary files a/messages/gl/LC_MESSAGES/3166-3.mo and b/messages/gl/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/gl/LC_MESSAGES/4217.mo b/messages/gl/LC_MESSAGES/4217.mo
index dce7e6de..466181bf 100644
Binary files a/messages/gl/LC_MESSAGES/4217.mo and b/messages/gl/LC_MESSAGES/4217.mo differ
diff --git a/messages/gl/LC_MESSAGES/639-2.mo b/messages/gl/LC_MESSAGES/639-2.mo
index 3a40f8d2..ee662778 100644
Binary files a/messages/gl/LC_MESSAGES/639-2.mo and b/messages/gl/LC_MESSAGES/639-2.mo differ
diff --git a/messages/gl/LC_MESSAGES/639-2.po b/messages/gl/LC_MESSAGES/639-2.po
index 33833eff..d24d278b 100644
--- a/messages/gl/LC_MESSAGES/639-2.po
+++ b/messages/gl/LC_MESSAGES/639-2.po
@@ -1,14 +1,14 @@
-# Translation of ISO-639 (language names) to Galician
+# Translation of ISO 639-2 to Galician
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2000,2004
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Jesus Bravo Alvarez <jba@pobox.com>, 2001. (from KDE desktop.po)
-#   Jacobo Tarrío <jtarrio@debian.org>, 2005
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Jesus Bravo Alvarez <jba@pobox.com>, 2001.
+# Jacobo Tarrío <jtarrio@debian.org>, 2005
 # Fran Diéguez <frandieguez@ubuntu.com>, 2010.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/gl/LC_MESSAGES/639-3.mo b/messages/gl/LC_MESSAGES/639-3.mo
index d61dc062..5675f7f3 100644
Binary files a/messages/gl/LC_MESSAGES/639-3.mo and b/messages/gl/LC_MESSAGES/639-3.mo differ
diff --git a/messages/gn/LC_MESSAGES/3166-1.mo b/messages/gn/LC_MESSAGES/3166-1.mo
index 4a8a4bd0..5712d91b 100644
Binary files a/messages/gn/LC_MESSAGES/3166-1.mo and b/messages/gn/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/gn/LC_MESSAGES/3166-1.po b/messages/gn/LC_MESSAGES/3166-1.po
index 51b70124..827624cc 100644
--- a/messages/gn/LC_MESSAGES/3166-1.po
+++ b/messages/gn/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Guarani
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/gu/LC_MESSAGES/3166-1.mo b/messages/gu/LC_MESSAGES/3166-1.mo
index b5e7db55..9624c2f8 100644
Binary files a/messages/gu/LC_MESSAGES/3166-1.mo and b/messages/gu/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/gu/LC_MESSAGES/3166-1.po b/messages/gu/LC_MESSAGES/3166-1.po
index 6b532a0b..cd2bb4ab 100644
--- a/messages/gu/LC_MESSAGES/3166-1.po
+++ b/messages/gu/LC_MESSAGES/3166-1.po
@@ -1,14 +1,14 @@
-# Translation of ISO-3166 (gu.po) to Gujarati
+# Translation of ISO 3166-1 to Gujarati
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   - translations from ICU-3.0
-#
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#   Kartik Mistry <kartik@debian.org>, 2006, 2007, 2008, 2012, 2013.
-#   Ankit Patel <ankit644@yahoo.com>, 2010.
-#   Sweta Kothari <swkothar@redhat.com>, 2010.
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
+# Kartik Mistry <kartik@debian.org>, 2006, 2007, 2008, 2012, 2013.
+# Ankit Patel <ankit644@yahoo.com>, 2010.
+# Sweta Kothari <swkothar@redhat.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/gu/LC_MESSAGES/3166-3.mo b/messages/gu/LC_MESSAGES/3166-3.mo
index 454a84ff..da1428c0 100644
Binary files a/messages/gu/LC_MESSAGES/3166-3.mo and b/messages/gu/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/gu/LC_MESSAGES/639-2.mo b/messages/gu/LC_MESSAGES/639-2.mo
index 38cf1a69..a931f50e 100644
Binary files a/messages/gu/LC_MESSAGES/639-2.mo and b/messages/gu/LC_MESSAGES/639-2.mo differ
diff --git a/messages/gu/LC_MESSAGES/639-2.po b/messages/gu/LC_MESSAGES/639-2.po
index 3766912c..5baacbc8 100644
--- a/messages/gu/LC_MESSAGES/639-2.po
+++ b/messages/gu/LC_MESSAGES/639-2.po
@@ -1,9 +1,10 @@
-# Translation of ISO 639 (gu.po) to Gujarati
+# Translation of ISO 639-2 to Gujarati
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#
+# Copyright ©
 # Ankit Patel <ankit644@yahoo.com>, 2009.
 # Sweta Kothari <swkothar@redhat.com>, 2009, 2010.
 msgid ""
diff --git a/messages/gu/LC_MESSAGES/639-3.mo b/messages/gu/LC_MESSAGES/639-3.mo
index 25887ee0..b1c018ae 100644
Binary files a/messages/gu/LC_MESSAGES/639-3.mo and b/messages/gu/LC_MESSAGES/639-3.mo differ
diff --git a/messages/gv/LC_MESSAGES/3166-1.mo b/messages/gv/LC_MESSAGES/3166-1.mo
index 58e00e72..69b2463d 100644
Binary files a/messages/gv/LC_MESSAGES/3166-1.mo and b/messages/gv/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/gv/LC_MESSAGES/3166-1.po b/messages/gv/LC_MESSAGES/3166-1.po
index b5f9e069..3fe185f0 100644
--- a/messages/gv/LC_MESSAGES/3166-1.po
+++ b/messages/gv/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Manx
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ha/LC_MESSAGES/3166-1.mo b/messages/ha/LC_MESSAGES/3166-1.mo
index e65b180b..c36e5ad6 100644
Binary files a/messages/ha/LC_MESSAGES/3166-1.mo and b/messages/ha/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ha/LC_MESSAGES/3166-1.po b/messages/ha/LC_MESSAGES/3166-1.po
index 8e61bb1b..11dbbb0e 100644
--- a/messages/ha/LC_MESSAGES/3166-1.po
+++ b/messages/ha/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Hausa
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/haw/LC_MESSAGES/3166-1.mo b/messages/haw/LC_MESSAGES/3166-1.mo
index 03b37e5a..711fb7b1 100644
Binary files a/messages/haw/LC_MESSAGES/3166-1.mo and b/messages/haw/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/haw/LC_MESSAGES/3166-1.po b/messages/haw/LC_MESSAGES/3166-1.po
index 43766cd2..d799cec4 100644
--- a/messages/haw/LC_MESSAGES/3166-1.po
+++ b/messages/haw/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO-3166 (country names) to Hawaiian
+# Translation of ISO 3166-1 to Hawaiian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/haw/LC_MESSAGES/3166-3.mo b/messages/haw/LC_MESSAGES/3166-3.mo
index a93a470b..bf4e275d 100644
Binary files a/messages/haw/LC_MESSAGES/3166-3.mo and b/messages/haw/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/he/LC_MESSAGES/15924.mo b/messages/he/LC_MESSAGES/15924.mo
index c405dbc8..3fc329df 100644
Binary files a/messages/he/LC_MESSAGES/15924.mo and b/messages/he/LC_MESSAGES/15924.mo differ
diff --git a/messages/he/LC_MESSAGES/3166-1.mo b/messages/he/LC_MESSAGES/3166-1.mo
index 81b8139f..a3c8c250 100644
Binary files a/messages/he/LC_MESSAGES/3166-1.mo and b/messages/he/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/he/LC_MESSAGES/3166-1.po b/messages/he/LC_MESSAGES/3166-1.po
index 49b804e0..2701f35f 100644
--- a/messages/he/LC_MESSAGES/3166-1.po
+++ b/messages/he/LC_MESSAGES/3166-1.po
@@ -1,19 +1,15 @@
-# translation of he.po to Hebrew
-# translation of iso-codes_iso_3166_he.po to
-# Translation of ISO-3166 (country names) to Hebrew
+# Translation of ISO 3166-1 to Hebrew
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Translations taken from KDE:
-#
-#   Free Software Foundation, Inc., 2002,2003.
-#   Alastair McKinstry <mckinstry@computer.org>, 2002.
-#   - Meni Livne <livne@kde.org>, 2000.
-#   Meital Bourvine <meitalbourvine@gmail.com>, 2007.
-#   Lior Kaplan <kaplan@debian.org>, 2005,2006, 2007, 2008, 2010, 2011, 2012.
-#   Lior Kaplan <kaplan@debian.org>, 2015
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002.
+# Meni Livne <livne@kde.org>, 2000.
+# Meital Bourvine <meitalbourvine@gmail.com>, 2007.
+# Lior Kaplan <kaplan@debian.org>, 2005,2006, 2007, 2008, 2010, 2011, 2012.
+# Lior Kaplan <kaplan@debian.org>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
diff --git a/messages/he/LC_MESSAGES/3166-3.mo b/messages/he/LC_MESSAGES/3166-3.mo
index f790a582..210b32af 100644
Binary files a/messages/he/LC_MESSAGES/3166-3.mo and b/messages/he/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/he/LC_MESSAGES/639-2.mo b/messages/he/LC_MESSAGES/639-2.mo
index 839de5f9..5c0ea243 100644
Binary files a/messages/he/LC_MESSAGES/639-2.mo and b/messages/he/LC_MESSAGES/639-2.mo differ
diff --git a/messages/he/LC_MESSAGES/639-2.po b/messages/he/LC_MESSAGES/639-2.po
index 251ee2e9..69284e08 100644
--- a/messages/he/LC_MESSAGES/639-2.po
+++ b/messages/he/LC_MESSAGES/639-2.po
@@ -1,13 +1,12 @@
-# Translation of ISO-639 (language names) to Hebrew
+# Translation of ISO 639-2 to Hebrew
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002,2004
-#   Alastair McKinstry <mckinstry@computer.org>, 2002
-#   Translations from KDE:
-#   Meni Livne <livne@kde.org>, 2000.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002
+# Meni Livne <livne@kde.org>, 2000.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/he/LC_MESSAGES/639-3.mo b/messages/he/LC_MESSAGES/639-3.mo
index 2d6a70c5..a816aeab 100644
Binary files a/messages/he/LC_MESSAGES/639-3.mo and b/messages/he/LC_MESSAGES/639-3.mo differ
diff --git a/messages/hi/LC_MESSAGES/3166-1.mo b/messages/hi/LC_MESSAGES/3166-1.mo
index a0315563..158901ca 100644
Binary files a/messages/hi/LC_MESSAGES/3166-1.mo and b/messages/hi/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/hi/LC_MESSAGES/3166-1.po b/messages/hi/LC_MESSAGES/3166-1.po
index d74e9a90..92e1b03d 100644
--- a/messages/hi/LC_MESSAGES/3166-1.po
+++ b/messages/hi/LC_MESSAGES/3166-1.po
@@ -1,15 +1,17 @@
-# translation of iso-codes_iso_3166_hi.po to Hindi
-# Translation of ISO-3166 (country names) to Hindi
+# Translation of ISO 3166-1 to Hindi
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
+# Notes:
 #   Data taken from ICU-2.8; originally from:
 #   - Shehnaz Nagpurwala and Anwar Nagpurwala [first version]
 #   - IBM NLTC:  http://w3.torolab.ibm.com/gcoc/documents/india/hi-nlsgg.htm
 #   - Arundhati Bhowmick [IBM Cupertino]
 #
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 # Kumar Appaiah <a.kumar@alumni.iitm.ac.in>, 2008.
 # Kumar Appaiah <kumar.appaiah@gmail.com>, 2008, 2013.
 msgid ""
diff --git a/messages/hi/LC_MESSAGES/3166-3.mo b/messages/hi/LC_MESSAGES/3166-3.mo
index c8ae101b..179e1e88 100644
Binary files a/messages/hi/LC_MESSAGES/3166-3.mo and b/messages/hi/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/hi/LC_MESSAGES/639-2.mo b/messages/hi/LC_MESSAGES/639-2.mo
index ac9413d1..f26b07f2 100644
Binary files a/messages/hi/LC_MESSAGES/639-2.mo and b/messages/hi/LC_MESSAGES/639-2.mo differ
diff --git a/messages/hi/LC_MESSAGES/639-2.po b/messages/hi/LC_MESSAGES/639-2.po
index 30fbbbe8..6e0103d3 100644
--- a/messages/hi/LC_MESSAGES/639-2.po
+++ b/messages/hi/LC_MESSAGES/639-2.po
@@ -1,10 +1,11 @@
-# Translation of ISO-639 (language names) to Hindi
+# Translation of ISO 639-2 to Hindi
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/hi/LC_MESSAGES/639-3.mo b/messages/hi/LC_MESSAGES/639-3.mo
index 616b3e9d..454d456a 100644
Binary files a/messages/hi/LC_MESSAGES/639-3.mo and b/messages/hi/LC_MESSAGES/639-3.mo differ
diff --git a/messages/hr/LC_MESSAGES/3166-1.mo b/messages/hr/LC_MESSAGES/3166-1.mo
index bc5b36f2..44427f86 100644
Binary files a/messages/hr/LC_MESSAGES/3166-1.mo and b/messages/hr/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/hr/LC_MESSAGES/3166-1.po b/messages/hr/LC_MESSAGES/3166-1.po
index cf6b1205..b7a30eae 100644
--- a/messages/hr/LC_MESSAGES/3166-1.po
+++ b/messages/hr/LC_MESSAGES/3166-1.po
@@ -1,13 +1,13 @@
-# Translation of ISO-3166 (country names) to Croatian
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+# Translation of ISO 3166-1 to Croatian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-#
-#
-#   Vlatko Kosturjak, 2001.
-#   Krunoslav Gernhard, 2004.
-#   Josip Rodin, 2008.
+# Vlatko Kosturjak <kost@iname.com>, 2001.
+# Krunoslav Gernhard <kruno@linux.hr>, 2004.
+# Josip Rodin <joy@debian.org>, 2008.
 # Tomislav Krznar <tomislav.krznar@gmail.com>, 2012, 2013.
 # Božidar Putanec <bozidarp@yahoo.com>, 2017.
 msgid ""
diff --git a/messages/hr/LC_MESSAGES/3166-3.mo b/messages/hr/LC_MESSAGES/3166-3.mo
index 57bfe1ee..106e6e0a 100644
Binary files a/messages/hr/LC_MESSAGES/3166-3.mo and b/messages/hr/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/hr/LC_MESSAGES/4217.mo b/messages/hr/LC_MESSAGES/4217.mo
index e37babcd..54d3912c 100644
Binary files a/messages/hr/LC_MESSAGES/4217.mo and b/messages/hr/LC_MESSAGES/4217.mo differ
diff --git a/messages/hr/LC_MESSAGES/639-2.mo b/messages/hr/LC_MESSAGES/639-2.mo
index cd1a8ede..09027f47 100644
Binary files a/messages/hr/LC_MESSAGES/639-2.mo and b/messages/hr/LC_MESSAGES/639-2.mo differ
diff --git a/messages/hr/LC_MESSAGES/639-2.po b/messages/hr/LC_MESSAGES/639-2.po
index db741d77..508d2a12 100644
--- a/messages/hr/LC_MESSAGES/639-2.po
+++ b/messages/hr/LC_MESSAGES/639-2.po
@@ -1,11 +1,13 @@
-# Croatian translations of ISO 639  Language names
-# Copyright © 2000, 2012 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Croatian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
 #
+# Copyright ©
 # Vladimir Vuksan <vuksan@veus.hr>, 2000.
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
 # Tomislav Krznar <tomislav.krznar@gmail.com>, 2012, 2013.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/hr/LC_MESSAGES/639-3.mo b/messages/hr/LC_MESSAGES/639-3.mo
index 767beee1..73b2a4ec 100644
Binary files a/messages/hr/LC_MESSAGES/639-3.mo and b/messages/hr/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ht/LC_MESSAGES/3166-1.mo b/messages/ht/LC_MESSAGES/3166-1.mo
index 5d8b4e64..44dd4855 100644
Binary files a/messages/ht/LC_MESSAGES/3166-1.mo and b/messages/ht/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ht/LC_MESSAGES/3166-1.po b/messages/ht/LC_MESSAGES/3166-1.po
index f15e36bd..1c766277 100644
--- a/messages/ht/LC_MESSAGES/3166-1.po
+++ b/messages/ht/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Haitian; Haitian Creole
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/hu/LC_MESSAGES/15924.mo b/messages/hu/LC_MESSAGES/15924.mo
index 59c4e1ff..8b10a7a8 100644
Binary files a/messages/hu/LC_MESSAGES/15924.mo and b/messages/hu/LC_MESSAGES/15924.mo differ
diff --git a/messages/hu/LC_MESSAGES/3166-1.mo b/messages/hu/LC_MESSAGES/3166-1.mo
index 88bd3ede..4079156c 100644
Binary files a/messages/hu/LC_MESSAGES/3166-1.mo and b/messages/hu/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/hu/LC_MESSAGES/3166-1.po b/messages/hu/LC_MESSAGES/3166-1.po
index a66fa119..67056f75 100644
--- a/messages/hu/LC_MESSAGES/3166-1.po
+++ b/messages/hu/LC_MESSAGES/3166-1.po
@@ -1,17 +1,17 @@
-# Translation of ISO-3166 (country names) to Hungarian
-# Copyright (C) 2001, 2003, 2004, 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the iso-codes package.
+# Translation of ISO 3166-1 to Hungarian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
-# Copyright (C)
-#   (translations from drakfw)
+# This file is distributed under the same license as the iso-codes package.
 #
-#   Arpad Biro <biro_arpad@yahoo.com>, 2001.
-#   VERÓK István <vi@fsf.hu>, 2004.
-#   SZERVÁC Attila <sas@321.hu>, 2006.
-#   Kalman Kemenczy <kkemenczy@novell.com>, 2007, 2008.
-#   Gabor Kelemen <kelemeng@gnome.hu>, 2006, 2007.
-#   Kalman Kemenczy <kkemenczy@gmail.com>, 2010, 2011, 2012, 2013.
-#   Balázs Úr <urbalazs@gmail.com>, 2015.
+# Copyright ©
+# Arpad Biro <biro_arpad@yahoo.com>, 2001.
+# VERÓK István <vi@fsf.hu>, 2004.
+# SZERVÁC Attila <sas@321.hu>, 2006.
+# Kalman Kemenczy <kkemenczy@novell.com>, 2007, 2008.
+# Gabor Kelemen <kelemeng@gnome.hu>, 2006, 2007.
+# Kalman Kemenczy <kkemenczy@gmail.com>, 2010, 2011, 2012, 2013.
+# Balázs Úr <urbalazs@gmail.com>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/hu/LC_MESSAGES/3166-2.mo b/messages/hu/LC_MESSAGES/3166-2.mo
index ab8cb464..1728a278 100644
Binary files a/messages/hu/LC_MESSAGES/3166-2.mo and b/messages/hu/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/hu/LC_MESSAGES/3166-3.mo b/messages/hu/LC_MESSAGES/3166-3.mo
index bda8521b..98a71481 100644
Binary files a/messages/hu/LC_MESSAGES/3166-3.mo and b/messages/hu/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/hu/LC_MESSAGES/4217.mo b/messages/hu/LC_MESSAGES/4217.mo
index 3f2bd0d2..7cfd150a 100644
Binary files a/messages/hu/LC_MESSAGES/4217.mo and b/messages/hu/LC_MESSAGES/4217.mo differ
diff --git a/messages/hu/LC_MESSAGES/639-2.mo b/messages/hu/LC_MESSAGES/639-2.mo
index eaa58574..6cee1351 100644
Binary files a/messages/hu/LC_MESSAGES/639-2.mo and b/messages/hu/LC_MESSAGES/639-2.mo differ
diff --git a/messages/hu/LC_MESSAGES/639-2.po b/messages/hu/LC_MESSAGES/639-2.po
index 052124a2..becb7b6b 100644
--- a/messages/hu/LC_MESSAGES/639-2.po
+++ b/messages/hu/LC_MESSAGES/639-2.po
@@ -1,8 +1,13 @@
-# Hungarian translations of ISO 639 Language names
-# Copyright (C) 2000, 2006 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Hungarian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Notes:
 # http://www.unicode.org/cldr/data/diff/main/hu_HU.html
 #
+# Copyright ©
 # Andras TIMAR <timar@gnome.hu>, 2000-2001.
 # VERÓK István <vi@fsf.hu>, 2004.
 # Gabor Kelemen <kelemeng@gnome.hu>, 2006.
diff --git a/messages/hu/LC_MESSAGES/639-3.mo b/messages/hu/LC_MESSAGES/639-3.mo
index b24add61..000fd899 100644
Binary files a/messages/hu/LC_MESSAGES/639-3.mo and b/messages/hu/LC_MESSAGES/639-3.mo differ
diff --git a/messages/hu/LC_MESSAGES/639-5.mo b/messages/hu/LC_MESSAGES/639-5.mo
index a8240a33..e590a7a1 100644
Binary files a/messages/hu/LC_MESSAGES/639-5.mo and b/messages/hu/LC_MESSAGES/639-5.mo differ
diff --git a/messages/hy/LC_MESSAGES/3166-1.mo b/messages/hy/LC_MESSAGES/3166-1.mo
index b0e3606b..38afaeb4 100644
Binary files a/messages/hy/LC_MESSAGES/3166-1.mo and b/messages/hy/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/hy/LC_MESSAGES/3166-1.po b/messages/hy/LC_MESSAGES/3166-1.po
index 6be63386..d18fe550 100644
--- a/messages/hy/LC_MESSAGES/3166-1.po
+++ b/messages/hy/LC_MESSAGES/3166-1.po
@@ -1,11 +1,12 @@
-# Translation of ISO-3166 (country names) to Armenian
+# Translation of ISO 3166-1 to Armenian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#   Chris Leonard <cjl@laptop.org>, 2013.
-#
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
+# Chris Leonard <cjl@laptop.org>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/hy/LC_MESSAGES/3166-3.mo b/messages/hy/LC_MESSAGES/3166-3.mo
index b8610bb3..1ebf3e42 100644
Binary files a/messages/hy/LC_MESSAGES/3166-3.mo and b/messages/hy/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ia/LC_MESSAGES/15924.mo b/messages/ia/LC_MESSAGES/15924.mo
index c7d4b48b..518fa1f0 100644
Binary files a/messages/ia/LC_MESSAGES/15924.mo and b/messages/ia/LC_MESSAGES/15924.mo differ
diff --git a/messages/ia/LC_MESSAGES/3166-1.mo b/messages/ia/LC_MESSAGES/3166-1.mo
index c9483b36..bb1bf8b3 100644
Binary files a/messages/ia/LC_MESSAGES/3166-1.mo and b/messages/ia/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ia/LC_MESSAGES/3166-1.po b/messages/ia/LC_MESSAGES/3166-1.po
index 01a2baa2..f56f11c5 100644
--- a/messages/ia/LC_MESSAGES/3166-1.po
+++ b/messages/ia/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO 3166 (country names) to Interlingua
+# Translation of ISO 3166-1 to Interlingua (International Auxiliary Language Association)
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
 # Nik Kalach <nik.kalach@inbox.ru>, 2013.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ia/LC_MESSAGES/3166-3.mo b/messages/ia/LC_MESSAGES/3166-3.mo
index 7f857124..41a5eb22 100644
Binary files a/messages/ia/LC_MESSAGES/3166-3.mo and b/messages/ia/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/id/LC_MESSAGES/15924.mo b/messages/id/LC_MESSAGES/15924.mo
index 1b6f9fa3..eca7395d 100644
Binary files a/messages/id/LC_MESSAGES/15924.mo and b/messages/id/LC_MESSAGES/15924.mo differ
diff --git a/messages/id/LC_MESSAGES/3166-1.mo b/messages/id/LC_MESSAGES/3166-1.mo
index 986f3b59..f3de481b 100644
Binary files a/messages/id/LC_MESSAGES/3166-1.mo and b/messages/id/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/id/LC_MESSAGES/3166-1.po b/messages/id/LC_MESSAGES/3166-1.po
index 52f0178a..7a3421cc 100644
--- a/messages/id/LC_MESSAGES/3166-1.po
+++ b/messages/id/LC_MESSAGES/3166-1.po
@@ -1,9 +1,12 @@
-# Translation of ISO-3166 (country names) to Indonesian
-# Copyright (C)
+# Translation of ISO 3166-1 to Indonesian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>, 2004-2006.
 # Andhika Padmawan <andhika.padmawan@gmail.com>, 2011-2016.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/id/LC_MESSAGES/3166-2.mo b/messages/id/LC_MESSAGES/3166-2.mo
index faeb2010..b706a7f9 100644
Binary files a/messages/id/LC_MESSAGES/3166-2.mo and b/messages/id/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/id/LC_MESSAGES/3166-3.mo b/messages/id/LC_MESSAGES/3166-3.mo
index 8ded968d..2cc03e13 100644
Binary files a/messages/id/LC_MESSAGES/3166-3.mo and b/messages/id/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/id/LC_MESSAGES/4217.mo b/messages/id/LC_MESSAGES/4217.mo
index 5157bfd4..bfe2ac40 100644
Binary files a/messages/id/LC_MESSAGES/4217.mo and b/messages/id/LC_MESSAGES/4217.mo differ
diff --git a/messages/id/LC_MESSAGES/639-2.mo b/messages/id/LC_MESSAGES/639-2.mo
index 47d9801f..12bda406 100644
Binary files a/messages/id/LC_MESSAGES/639-2.mo and b/messages/id/LC_MESSAGES/639-2.mo differ
diff --git a/messages/id/LC_MESSAGES/639-2.po b/messages/id/LC_MESSAGES/639-2.po
index 9c8fa488..d380f1b8 100644
--- a/messages/id/LC_MESSAGES/639-2.po
+++ b/messages/id/LC_MESSAGES/639-2.po
@@ -1,14 +1,13 @@
-# Translation of ISO-639 (language names) to Indonesian
+# Translation of ISO 639-2 to Indonesian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002,2004
-#   Alastair McKinstry <mckinstry@computer.org>, 2002.
-#   Andhika Padmawan <andhika.padmawan@gmail.com>, 2010.
-#   Translations from KDE:
-#   Ahmad Sofyan <fade@2bl.ac>, 2001.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002.
+# Andhika Padmawan <andhika.padmawan@gmail.com>, 2010.
+# Ahmad Sofyan <fade@2bl.ac>, 2001.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/id/LC_MESSAGES/639-3.mo b/messages/id/LC_MESSAGES/639-3.mo
index bf514153..93e325d8 100644
Binary files a/messages/id/LC_MESSAGES/639-3.mo and b/messages/id/LC_MESSAGES/639-3.mo differ
diff --git a/messages/io/LC_MESSAGES/3166-1.mo b/messages/io/LC_MESSAGES/3166-1.mo
index a10c35bf..c83b893d 100644
Binary files a/messages/io/LC_MESSAGES/3166-1.mo and b/messages/io/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/io/LC_MESSAGES/3166-1.po b/messages/io/LC_MESSAGES/3166-1.po
index 9442e52b..aace7b23 100644
--- a/messages/io/LC_MESSAGES/3166-1.po
+++ b/messages/io/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Ido
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/is/LC_MESSAGES/15924.mo b/messages/is/LC_MESSAGES/15924.mo
index 22096ef8..f7f735c3 100644
Binary files a/messages/is/LC_MESSAGES/15924.mo and b/messages/is/LC_MESSAGES/15924.mo differ
diff --git a/messages/is/LC_MESSAGES/3166-1.mo b/messages/is/LC_MESSAGES/3166-1.mo
index e765b8db..135609e6 100644
Binary files a/messages/is/LC_MESSAGES/3166-1.mo and b/messages/is/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/is/LC_MESSAGES/3166-1.po b/messages/is/LC_MESSAGES/3166-1.po
index 24ba0a49..30c039ed 100644
--- a/messages/is/LC_MESSAGES/3166-1.po
+++ b/messages/is/LC_MESSAGES/3166-1.po
@@ -1,11 +1,11 @@
-# translation of iso_iso_3166-1-3.76.is.po to Icelandic
-# Icelandic translations of ISO 3166 place names
-# Íslenskar þýðingar á staðarnöfnum skv. ISO 3166 staðli
+# Translation of ISO 3166-1 to Icelandic
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
-# Translations taken from KDE:
-# Þórarinn Rúnar Einarsson <thori@mindspring.com>
 #
+# Copyright ©
+# Þórarinn Rúnar Einarsson <thori@mindspring.com>
 # Alastair McKinstry, <mckinstry@computer.org>, 2002.
 # Sveinn í Felli <sv1@fellsnet.is>, 2010, 2011, 2012, 2013, 2015, 2017.
 msgid ""
diff --git a/messages/is/LC_MESSAGES/3166-2.mo b/messages/is/LC_MESSAGES/3166-2.mo
index 9fef060f..15388f65 100644
Binary files a/messages/is/LC_MESSAGES/3166-2.mo and b/messages/is/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/is/LC_MESSAGES/3166-3.mo b/messages/is/LC_MESSAGES/3166-3.mo
index 4bc51e23..28a4db8f 100644
Binary files a/messages/is/LC_MESSAGES/3166-3.mo and b/messages/is/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/is/LC_MESSAGES/4217.mo b/messages/is/LC_MESSAGES/4217.mo
index 6bd8aac0..890a61f5 100644
Binary files a/messages/is/LC_MESSAGES/4217.mo and b/messages/is/LC_MESSAGES/4217.mo differ
diff --git a/messages/is/LC_MESSAGES/639-2.mo b/messages/is/LC_MESSAGES/639-2.mo
index 6cec1a00..0de7c289 100644
Binary files a/messages/is/LC_MESSAGES/639-2.mo and b/messages/is/LC_MESSAGES/639-2.mo differ
diff --git a/messages/is/LC_MESSAGES/639-2.po b/messages/is/LC_MESSAGES/639-2.po
index f3064756..c55c6b58 100644
--- a/messages/is/LC_MESSAGES/639-2.po
+++ b/messages/is/LC_MESSAGES/639-2.po
@@ -1,11 +1,11 @@
-# translation of iso_639-2-3.76.is.po to Icelandic
-# Icelandic translations of ISO 639 language names
-# Íslenskar þýðingar tungumála skv. ISO 639 staðli
+# Translation of ISO 639-2 to Icelandic
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
-# Translations from KDE:
-# Þórarinn Rúnar Einarsson <thori@mindspring.com>
 #
+# Copyright ©
+# Þórarinn Rúnar Einarsson <thori@mindspring.com>
 # Alastair McKinstry <mckinstry@computer.org>, 2002.
 # Sveinn í Felli <sv1@fellsnet.is>, 2010, 2011, 2012, 2013, 2017.
 msgid ""
diff --git a/messages/is/LC_MESSAGES/639-3.mo b/messages/is/LC_MESSAGES/639-3.mo
index dc08d2ac..6c71a6d1 100644
Binary files a/messages/is/LC_MESSAGES/639-3.mo and b/messages/is/LC_MESSAGES/639-3.mo differ
diff --git a/messages/is/LC_MESSAGES/639-5.mo b/messages/is/LC_MESSAGES/639-5.mo
index d1861a7a..a3f71f0b 100644
Binary files a/messages/is/LC_MESSAGES/639-5.mo and b/messages/is/LC_MESSAGES/639-5.mo differ
diff --git a/messages/iso_15924t/LC_MESSAGES/15924.mo b/messages/iso_15924t/LC_MESSAGES/15924.mo
index c8129366..d2aaa63e 100644
Binary files a/messages/iso_15924t/LC_MESSAGES/15924.mo and b/messages/iso_15924t/LC_MESSAGES/15924.mo differ
diff --git a/messages/iso_3166-1t/LC_MESSAGES/3166-1.mo b/messages/iso_3166-1t/LC_MESSAGES/3166-1.mo
index 09275057..b9f27da5 100644
Binary files a/messages/iso_3166-1t/LC_MESSAGES/3166-1.mo and b/messages/iso_3166-1t/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/iso_3166-2t/LC_MESSAGES/3166-2.mo b/messages/iso_3166-2t/LC_MESSAGES/3166-2.mo
index c3e8d89f..d3684675 100644
Binary files a/messages/iso_3166-2t/LC_MESSAGES/3166-2.mo and b/messages/iso_3166-2t/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/iso_3166-3t/LC_MESSAGES/3166-3.mo b/messages/iso_3166-3t/LC_MESSAGES/3166-3.mo
index b9472740..bd2f68ae 100644
Binary files a/messages/iso_3166-3t/LC_MESSAGES/3166-3.mo and b/messages/iso_3166-3t/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/iso_4217t/LC_MESSAGES/4217.mo b/messages/iso_4217t/LC_MESSAGES/4217.mo
index 8e2b6496..e350d2c1 100644
Binary files a/messages/iso_4217t/LC_MESSAGES/4217.mo and b/messages/iso_4217t/LC_MESSAGES/4217.mo differ
diff --git a/messages/iso_639-2t/LC_MESSAGES/639-2.mo b/messages/iso_639-2t/LC_MESSAGES/639-2.mo
index 773d2e9f..86b8b60d 100644
Binary files a/messages/iso_639-2t/LC_MESSAGES/639-2.mo and b/messages/iso_639-2t/LC_MESSAGES/639-2.mo differ
diff --git a/messages/iso_639-3t/LC_MESSAGES/639-3.mo b/messages/iso_639-3t/LC_MESSAGES/639-3.mo
index 55b5634e..bfaa2256 100644
Binary files a/messages/iso_639-3t/LC_MESSAGES/639-3.mo and b/messages/iso_639-3t/LC_MESSAGES/639-3.mo differ
diff --git a/messages/iso_639-5t/LC_MESSAGES/639-5.mo b/messages/iso_639-5t/LC_MESSAGES/639-5.mo
index d940558b..c0aa25c5 100644
Binary files a/messages/iso_639-5t/LC_MESSAGES/639-5.mo and b/messages/iso_639-5t/LC_MESSAGES/639-5.mo differ
diff --git a/messages/it/LC_MESSAGES/15924.mo b/messages/it/LC_MESSAGES/15924.mo
index 5ac8fcb1..6abddf82 100644
Binary files a/messages/it/LC_MESSAGES/15924.mo and b/messages/it/LC_MESSAGES/15924.mo differ
diff --git a/messages/it/LC_MESSAGES/3166-1.mo b/messages/it/LC_MESSAGES/3166-1.mo
index 908da927..e3b36ab7 100644
Binary files a/messages/it/LC_MESSAGES/3166-1.mo and b/messages/it/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/it/LC_MESSAGES/3166-1.po b/messages/it/LC_MESSAGES/3166-1.po
index fefc98b1..8b2b5ddd 100644
--- a/messages/it/LC_MESSAGES/3166-1.po
+++ b/messages/it/LC_MESSAGES/3166-1.po
@@ -1,13 +1,15 @@
-# Translation of ISO-3166 (country names) to Italian
-# Copyright (C) 2004-2008, 2009, 2010, 2011, 2012, 2013, 2017 Free Software Foundation, Inc.
+# Translation of ISO 3166-1 to Italian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Andrea Scialpi <solopec@tiscalinet.it>, 2001
-# (translations from drakfw)
 # Alastair McKinstry <mckinstry@computer.org>, 2001
 # Danilo Piazzalunga <danilopiazza@libero.it>, 2004
 # Davide Viti <zinosat@tiscali.it>, 2006
 # Milo Casagrande <milo@milo.name>, 2008-2012, 2013, 2017.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/it/LC_MESSAGES/3166-2.mo b/messages/it/LC_MESSAGES/3166-2.mo
index 3134c347..d7b41229 100644
Binary files a/messages/it/LC_MESSAGES/3166-2.mo and b/messages/it/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/it/LC_MESSAGES/3166-3.mo b/messages/it/LC_MESSAGES/3166-3.mo
index 84cf30c3..f1e5b2cf 100644
Binary files a/messages/it/LC_MESSAGES/3166-3.mo and b/messages/it/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/it/LC_MESSAGES/4217.mo b/messages/it/LC_MESSAGES/4217.mo
index 1595126a..907bc6f1 100644
Binary files a/messages/it/LC_MESSAGES/4217.mo and b/messages/it/LC_MESSAGES/4217.mo differ
diff --git a/messages/it/LC_MESSAGES/639-2.mo b/messages/it/LC_MESSAGES/639-2.mo
index 9806bc56..f3b2963d 100644
Binary files a/messages/it/LC_MESSAGES/639-2.mo and b/messages/it/LC_MESSAGES/639-2.mo differ
diff --git a/messages/it/LC_MESSAGES/639-2.po b/messages/it/LC_MESSAGES/639-2.po
index 222deefe..691eea1a 100644
--- a/messages/it/LC_MESSAGES/639-2.po
+++ b/messages/it/LC_MESSAGES/639-2.po
@@ -1,10 +1,13 @@
-# Translation of ISO-639 (language names) to Italian
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2017 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Italian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Alessio Frusciante <algol@firenze.linux.it>, 2001
 # Marcello Raffa <mrooth@tiscalinet.it>, 2001
 # Milo Casagrande <milo@casagrande.name>, 2008, 2009, 2010, 2012, 2013, 2017.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/it/LC_MESSAGES/639-3.mo b/messages/it/LC_MESSAGES/639-3.mo
index 0788c605..9884cd63 100644
Binary files a/messages/it/LC_MESSAGES/639-3.mo and b/messages/it/LC_MESSAGES/639-3.mo differ
diff --git a/messages/it/LC_MESSAGES/639-5.mo b/messages/it/LC_MESSAGES/639-5.mo
index 8e951172..0e62521d 100644
Binary files a/messages/it/LC_MESSAGES/639-5.mo and b/messages/it/LC_MESSAGES/639-5.mo differ
diff --git a/messages/iu/LC_MESSAGES/3166-1.mo b/messages/iu/LC_MESSAGES/3166-1.mo
index ebe19489..7113589f 100644
Binary files a/messages/iu/LC_MESSAGES/3166-1.mo and b/messages/iu/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/iu/LC_MESSAGES/3166-1.po b/messages/iu/LC_MESSAGES/3166-1.po
index 3a770a40..a6c64f91 100644
--- a/messages/iu/LC_MESSAGES/3166-1.po
+++ b/messages/iu/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Inuktitut
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ja/LC_MESSAGES/15924.mo b/messages/ja/LC_MESSAGES/15924.mo
index f230253f..def5d8ea 100644
Binary files a/messages/ja/LC_MESSAGES/15924.mo and b/messages/ja/LC_MESSAGES/15924.mo differ
diff --git a/messages/ja/LC_MESSAGES/3166-1.mo b/messages/ja/LC_MESSAGES/3166-1.mo
index 7bbe528b..a6a88fdc 100644
Binary files a/messages/ja/LC_MESSAGES/3166-1.mo and b/messages/ja/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ja/LC_MESSAGES/3166-1.po b/messages/ja/LC_MESSAGES/3166-1.po
index 01274435..3f1c0f34 100644
--- a/messages/ja/LC_MESSAGES/3166-1.po
+++ b/messages/ja/LC_MESSAGES/3166-1.po
@@ -1,10 +1,13 @@
-# Translation of ISO-3166 (country names) to Japanese
+# Translation of ISO 3166-1 to Japanese
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
-# Copyright (C) 2002, 2010, 2011 Free Software Foundation, Inc.
-#   Alastair McKinstry, <mckinstry@computer.org>, 2002.
-#   Translations from KDE:
-#   - Taiki Komoda <kom@kde.gr.jp>
-#   Kenshi Muto <kmuto@debian.org>, 2006-2007
+#
+# Copyright ©
+# Alastair McKinstry, <mckinstry@computer.org>, 2002.
+# Taiki Komoda <kom@kde.gr.jp>
+# Kenshi Muto <kmuto@debian.org>, 2006-2007
 # victory <victory.deb@gmail.com>, 2013.
 # Yasuaki Taniguchi <yasuakit@gmail.com>, 2010, 2011, 2017.
 msgid ""
diff --git a/messages/ja/LC_MESSAGES/3166-2.mo b/messages/ja/LC_MESSAGES/3166-2.mo
index 2403fbff..8cd204ae 100644
Binary files a/messages/ja/LC_MESSAGES/3166-2.mo and b/messages/ja/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/ja/LC_MESSAGES/3166-3.mo b/messages/ja/LC_MESSAGES/3166-3.mo
index ef8e8e53..b140b357 100644
Binary files a/messages/ja/LC_MESSAGES/3166-3.mo and b/messages/ja/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ja/LC_MESSAGES/4217.mo b/messages/ja/LC_MESSAGES/4217.mo
index aa08d9ee..299e9d80 100644
Binary files a/messages/ja/LC_MESSAGES/4217.mo and b/messages/ja/LC_MESSAGES/4217.mo differ
diff --git a/messages/ja/LC_MESSAGES/639-2.mo b/messages/ja/LC_MESSAGES/639-2.mo
index 0681515d..a6039804 100644
Binary files a/messages/ja/LC_MESSAGES/639-2.mo and b/messages/ja/LC_MESSAGES/639-2.mo differ
diff --git a/messages/ja/LC_MESSAGES/639-2.po b/messages/ja/LC_MESSAGES/639-2.po
index 92de54d2..3623a9dc 100644
--- a/messages/ja/LC_MESSAGES/639-2.po
+++ b/messages/ja/LC_MESSAGES/639-2.po
@@ -1,15 +1,15 @@
-# Translation of ISO-639 (language names) to Japanese
+# Translation of ISO 639-2 to Japanese
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2000, 2001, 2004, 2005, 2006
-#   Yukihiro Nakai <nakai@gnome.gr.jp>, 2000.
-#   Takuro Ashie <ashie@homa.ne.jp>, 2001.
-#   Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>, 2001.
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   IIDA Yosiaki <iida@gnu.org>, 2004, 2005, 2006.
-#
+# Copyright ©
+# Yukihiro Nakai <nakai@gnome.gr.jp>, 2000.
+# Takuro Ashie <ashie@homa.ne.jp>, 2001.
+# Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>, 2001.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# IIDA Yosiaki <iida@gnu.org>, 2004, 2005, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/ja/LC_MESSAGES/639-3.mo b/messages/ja/LC_MESSAGES/639-3.mo
index caaaa41b..658ede4f 100644
Binary files a/messages/ja/LC_MESSAGES/639-3.mo and b/messages/ja/LC_MESSAGES/639-3.mo differ
diff --git a/messages/jam/LC_MESSAGES/3166-1.mo b/messages/jam/LC_MESSAGES/3166-1.mo
index a5256150..fd2e2a67 100644
Binary files a/messages/jam/LC_MESSAGES/3166-1.mo and b/messages/jam/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/jam/LC_MESSAGES/3166-1.po b/messages/jam/LC_MESSAGES/3166-1.po
index 1eb4dee3..950442e2 100644
--- a/messages/jam/LC_MESSAGES/3166-1.po
+++ b/messages/jam/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Jamaican Patois
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ka/LC_MESSAGES/3166-1.mo b/messages/ka/LC_MESSAGES/3166-1.mo
index 83fdc3bf..59334d37 100644
Binary files a/messages/ka/LC_MESSAGES/3166-1.mo and b/messages/ka/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ka/LC_MESSAGES/3166-1.po b/messages/ka/LC_MESSAGES/3166-1.po
index 8cefa8b9..e8d4a734 100644
--- a/messages/ka/LC_MESSAGES/3166-1.po
+++ b/messages/ka/LC_MESSAGES/3166-1.po
@@ -1,11 +1,12 @@
-# Translation of ISO-3166 (country names) to Georgian
+# Translation of ISO 3166-1 to Georgian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#   Aiet Kolkhi <aietkolkhi@gmail.com>, 2008.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
+# Aiet Kolkhi <aietkolkhi@gmail.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ka/LC_MESSAGES/3166-3.mo b/messages/ka/LC_MESSAGES/3166-3.mo
index f2dfa980..b9f5a7f4 100644
Binary files a/messages/ka/LC_MESSAGES/3166-3.mo and b/messages/ka/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/kab/LC_MESSAGES/3166-1.mo b/messages/kab/LC_MESSAGES/3166-1.mo
index 32ef7481..be2f651d 100644
Binary files a/messages/kab/LC_MESSAGES/3166-1.mo and b/messages/kab/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/kab/LC_MESSAGES/3166-1.po b/messages/kab/LC_MESSAGES/3166-1.po
index 2889e569..762ea63c 100644
--- a/messages/kab/LC_MESSAGES/3166-1.po
+++ b/messages/kab/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Kabyle
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ki/LC_MESSAGES/3166-1.mo b/messages/ki/LC_MESSAGES/3166-1.mo
index 878ed4d1..259619b3 100644
Binary files a/messages/ki/LC_MESSAGES/3166-1.mo and b/messages/ki/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ki/LC_MESSAGES/3166-1.po b/messages/ki/LC_MESSAGES/3166-1.po
index f2a63256..e2f09cfb 100644
--- a/messages/ki/LC_MESSAGES/3166-1.po
+++ b/messages/ki/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Kikuyu; Gikuyu
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/kk/LC_MESSAGES/3166-1.mo b/messages/kk/LC_MESSAGES/3166-1.mo
index ca4d9c10..f129c03e 100644
Binary files a/messages/kk/LC_MESSAGES/3166-1.mo and b/messages/kk/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/kk/LC_MESSAGES/3166-1.po b/messages/kk/LC_MESSAGES/3166-1.po
index 79f9264c..ac3e03ee 100644
--- a/messages/kk/LC_MESSAGES/3166-1.po
+++ b/messages/kk/LC_MESSAGES/3166-1.po
@@ -1,14 +1,14 @@
-# Translation of ISO-3166 (country names) to Kazakh
+# Translation of ISO 3166-1 to Kazakh
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#   Sairan Kikkarin <sairan@sci.kz>, 2006
-#   KDE Kazakh l10n team, 2006
-#   Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2008-2011
-#   Dauren Sarsenov <daur88@inbox.ru>, 2009
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
+# Sairan Kikkarin <sairan@sci.kz>, 2006
+# Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2008-2011
+# Dauren Sarsenov <daur88@inbox.ru>, 2009
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/kk/LC_MESSAGES/3166-3.mo b/messages/kk/LC_MESSAGES/3166-3.mo
index bcc74558..4b587596 100644
Binary files a/messages/kk/LC_MESSAGES/3166-3.mo and b/messages/kk/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/kl/LC_MESSAGES/3166-1.mo b/messages/kl/LC_MESSAGES/3166-1.mo
index 0e840c4e..8a727510 100644
Binary files a/messages/kl/LC_MESSAGES/3166-1.mo and b/messages/kl/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/kl/LC_MESSAGES/3166-1.po b/messages/kl/LC_MESSAGES/3166-1.po
index 56ef92f0..0c377246 100644
--- a/messages/kl/LC_MESSAGES/3166-1.po
+++ b/messages/kl/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Kalaallisut; Greenlandic
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/km/LC_MESSAGES/3166-1.mo b/messages/km/LC_MESSAGES/3166-1.mo
index d66faac3..056671b0 100644
Binary files a/messages/km/LC_MESSAGES/3166-1.mo and b/messages/km/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/km/LC_MESSAGES/3166-1.po b/messages/km/LC_MESSAGES/3166-1.po
index 9475df28..89bed700 100644
--- a/messages/km/LC_MESSAGES/3166-1.po
+++ b/messages/km/LC_MESSAGES/3166-1.po
@@ -1,10 +1,13 @@
-# translation of iso-codes_iso_3166_km.po to Khmer
-# Translation of ISO-3166 (country names) to Khmer
+# Translation of ISO 3166-1 to Central Khmer
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
-#   eng vannak <evannak@khmeros.info>, 2006.
-#   auk piseth <piseth_dv@khmeros.info>, 2006.
-#   Khoem Sokhem <khoemsokhem@khmeros.info>, 2006, 2010.
-# Copyright (C)
+#
+# Copyright ©
+# eng vannak <evannak@khmeros.info>, 2006.
+# auk piseth <piseth_dv@khmeros.info>, 2006.
+# Khoem Sokhem <khoemsokhem@khmeros.info>, 2006, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/km/LC_MESSAGES/3166-3.mo b/messages/km/LC_MESSAGES/3166-3.mo
index 5c0fbbce..6ba07f6b 100644
Binary files a/messages/km/LC_MESSAGES/3166-3.mo and b/messages/km/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/kn/LC_MESSAGES/3166-1.mo b/messages/kn/LC_MESSAGES/3166-1.mo
index 36d69787..7e79a078 100644
Binary files a/messages/kn/LC_MESSAGES/3166-1.mo and b/messages/kn/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/kn/LC_MESSAGES/3166-1.po b/messages/kn/LC_MESSAGES/3166-1.po
index 0b7cc25e..137a72a0 100644
--- a/messages/kn/LC_MESSAGES/3166-1.po
+++ b/messages/kn/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO-3166 (country names) to Kannada
+# Translation of ISO 3166-1 to Kannada
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Vikram Vincent <vincentvikram@gmail.com>, 2007.
-#
+# Copyright ©
+# Vikram Vincent <vincentvikram@gmail.com>, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/kn/LC_MESSAGES/3166-3.mo b/messages/kn/LC_MESSAGES/3166-3.mo
index 30cd4897..6bd004f0 100644
Binary files a/messages/kn/LC_MESSAGES/3166-3.mo and b/messages/kn/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/kn/LC_MESSAGES/639-2.mo b/messages/kn/LC_MESSAGES/639-2.mo
index af32fda5..91a80c58 100644
Binary files a/messages/kn/LC_MESSAGES/639-2.mo and b/messages/kn/LC_MESSAGES/639-2.mo differ
diff --git a/messages/kn/LC_MESSAGES/639-2.po b/messages/kn/LC_MESSAGES/639-2.po
index deeb0aa6..3e9151a1 100644
--- a/messages/kn/LC_MESSAGES/639-2.po
+++ b/messages/kn/LC_MESSAGES/639-2.po
@@ -1,4 +1,6 @@
-# Translation of ISO 639 (language names) to Kannada
+# Translation of ISO 639-2 to Kannada
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
diff --git a/messages/kn/LC_MESSAGES/639-3.mo b/messages/kn/LC_MESSAGES/639-3.mo
index a4d85b72..017eae38 100644
Binary files a/messages/kn/LC_MESSAGES/639-3.mo and b/messages/kn/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ko/LC_MESSAGES/15924.mo b/messages/ko/LC_MESSAGES/15924.mo
index 59cb74aa..ce5e6827 100644
Binary files a/messages/ko/LC_MESSAGES/15924.mo and b/messages/ko/LC_MESSAGES/15924.mo differ
diff --git a/messages/ko/LC_MESSAGES/3166-1.mo b/messages/ko/LC_MESSAGES/3166-1.mo
index eaf05c60..23ba2388 100644
Binary files a/messages/ko/LC_MESSAGES/3166-1.mo and b/messages/ko/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ko/LC_MESSAGES/3166-1.po b/messages/ko/LC_MESSAGES/3166-1.po
index ff7dfef0..b36c797f 100644
--- a/messages/ko/LC_MESSAGES/3166-1.po
+++ b/messages/ko/LC_MESSAGES/3166-1.po
@@ -1,18 +1,18 @@
-# Translation of ISO-3166 (country names) to Korean
+# Translation of ISO 3166-1 to Korean
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2001,2003
-#   Jaegeum Choe <baedaron@hananet.net>, 2001.
-#   (translations from drakfw)
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Sunjae Park <darehanl@gmail.com>, 2006-2007.
-#   Changwoo Ryu <cwryu@debian.org>, 2004, 2008-2013, 2015.
-#
+# Notes:
 # 위키백과 페이지 참고
 # http://ko.wikipedia.org/wiki/ISO_3166
 #
+# Copyright ©
+# Jaegeum Choe <baedaron@hananet.net>, 2001.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Sunjae Park <darehanl@gmail.com>, 2006-2007.
+# Changwoo Ryu <cwryu@debian.org>, 2004, 2008-2013, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ko/LC_MESSAGES/3166-2.mo b/messages/ko/LC_MESSAGES/3166-2.mo
index 6a9620ff..ae29414b 100644
Binary files a/messages/ko/LC_MESSAGES/3166-2.mo and b/messages/ko/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/ko/LC_MESSAGES/3166-3.mo b/messages/ko/LC_MESSAGES/3166-3.mo
index 5406da06..cce40fc2 100644
Binary files a/messages/ko/LC_MESSAGES/3166-3.mo and b/messages/ko/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ko/LC_MESSAGES/4217.mo b/messages/ko/LC_MESSAGES/4217.mo
index 7518be47..9277b3ee 100644
Binary files a/messages/ko/LC_MESSAGES/4217.mo and b/messages/ko/LC_MESSAGES/4217.mo differ
diff --git a/messages/ko/LC_MESSAGES/639-2.mo b/messages/ko/LC_MESSAGES/639-2.mo
index 57a3d457..2f79227c 100644
Binary files a/messages/ko/LC_MESSAGES/639-2.mo and b/messages/ko/LC_MESSAGES/639-2.mo differ
diff --git a/messages/ko/LC_MESSAGES/639-2.po b/messages/ko/LC_MESSAGES/639-2.po
index fbd47f44..8ae4e31e 100644
--- a/messages/ko/LC_MESSAGES/639-2.po
+++ b/messages/ko/LC_MESSAGES/639-2.po
@@ -1,15 +1,18 @@
-# Korean translations of ISO 639 Language names
+# Translation of ISO 639-2 to Korean
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Notes:
+# 위키백과 페이지 참고
+# http://ko.wikipedia.org/wiki/ISO_639
+#
+# Copyright ©
 # Kang, JeongHee <Keizi@mail.co.kr>, 2000.
 # Eungkyu Song <eungkyu@sparcs.org>, 2001.
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
 # Changwoo Ryu <cwryu@debian.org>, 2011, 2013.
-#
-# 위키백과 페이지 참고
-# http://ko.wikipedia.org/wiki/ISO_639
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/ko/LC_MESSAGES/639-3.mo b/messages/ko/LC_MESSAGES/639-3.mo
index 06ac4a19..25f324b4 100644
Binary files a/messages/ko/LC_MESSAGES/639-3.mo and b/messages/ko/LC_MESSAGES/639-3.mo differ
diff --git a/messages/kok/LC_MESSAGES/639-2.mo b/messages/kok/LC_MESSAGES/639-2.mo
index acf8607f..22592a5f 100644
Binary files a/messages/kok/LC_MESSAGES/639-2.mo and b/messages/kok/LC_MESSAGES/639-2.mo differ
diff --git a/messages/kok/LC_MESSAGES/639-2.po b/messages/kok/LC_MESSAGES/639-2.po
index 2b2d832e..a396db55 100644
--- a/messages/kok/LC_MESSAGES/639-2.po
+++ b/messages/kok/LC_MESSAGES/639-2.po
@@ -1,10 +1,11 @@
-# Translation of ISO-639 (language names) to Konkani
+# Translation of ISO 639-2 to Konkani
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/kok/LC_MESSAGES/639-3.mo b/messages/kok/LC_MESSAGES/639-3.mo
index 73830aa9..a78684bf 100644
Binary files a/messages/kok/LC_MESSAGES/639-3.mo and b/messages/kok/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ku/LC_MESSAGES/3166-1.mo b/messages/ku/LC_MESSAGES/3166-1.mo
index 65219d8a..64448366 100644
Binary files a/messages/ku/LC_MESSAGES/3166-1.mo and b/messages/ku/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ku/LC_MESSAGES/3166-1.po b/messages/ku/LC_MESSAGES/3166-1.po
index a77e585d..64008821 100644
--- a/messages/ku/LC_MESSAGES/3166-1.po
+++ b/messages/ku/LC_MESSAGES/3166-1.po
@@ -1,12 +1,11 @@
-# translation of ISO-falan-ku.po to Kurdish
-# Translation of ISO-3166 (country names) to Kurdish
+# Translation of ISO 3166-1 to Kurdish
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#
-#   Erdal Ronahi <erdal.ronahi@gmail.com>, 2005.
-# Erdal Ronahi <erdal dot ronahi at gmail dot com>, 2007.
+# Copyright ©
+# Erdal Ronahi <erdal.ronahi@gmail.com>, 2005, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: ISO-falan-ku\n"
diff --git a/messages/ku/LC_MESSAGES/3166-3.mo b/messages/ku/LC_MESSAGES/3166-3.mo
index 32606fe2..8fb922c5 100644
Binary files a/messages/ku/LC_MESSAGES/3166-3.mo and b/messages/ku/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/kv/LC_MESSAGES/3166-1.mo b/messages/kv/LC_MESSAGES/3166-1.mo
index 1c60f9a1..a6b60f68 100644
Binary files a/messages/kv/LC_MESSAGES/3166-1.mo and b/messages/kv/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/kv/LC_MESSAGES/3166-1.po b/messages/kv/LC_MESSAGES/3166-1.po
index 05202f30..766efdef 100644
--- a/messages/kv/LC_MESSAGES/3166-1.po
+++ b/messages/kv/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Komi
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/kw/LC_MESSAGES/3166-1.mo b/messages/kw/LC_MESSAGES/3166-1.mo
index a7c973e8..13fa2ca3 100644
Binary files a/messages/kw/LC_MESSAGES/3166-1.mo and b/messages/kw/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/kw/LC_MESSAGES/3166-1.po b/messages/kw/LC_MESSAGES/3166-1.po
index 85279cc0..1d7dcedb 100644
--- a/messages/kw/LC_MESSAGES/3166-1.po
+++ b/messages/kw/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Cornish
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ky/LC_MESSAGES/3166-1.mo b/messages/ky/LC_MESSAGES/3166-1.mo
index 5d250737..9617f5d1 100644
Binary files a/messages/ky/LC_MESSAGES/3166-1.mo and b/messages/ky/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ky/LC_MESSAGES/3166-1.po b/messages/ky/LC_MESSAGES/3166-1.po
index 1ff45137..7f6da8e9 100644
--- a/messages/ky/LC_MESSAGES/3166-1.po
+++ b/messages/ky/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Kirghiz; Kyrgyz
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/lo/LC_MESSAGES/3166-1.mo b/messages/lo/LC_MESSAGES/3166-1.mo
index c17591b6..053695b1 100644
Binary files a/messages/lo/LC_MESSAGES/3166-1.mo and b/messages/lo/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/lo/LC_MESSAGES/3166-1.po b/messages/lo/LC_MESSAGES/3166-1.po
index 6422d32c..cb10e8da 100644
--- a/messages/lo/LC_MESSAGES/3166-1.po
+++ b/messages/lo/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Lao
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/lt/LC_MESSAGES/15924.mo b/messages/lt/LC_MESSAGES/15924.mo
index 2d9ec28b..4f7eb997 100644
Binary files a/messages/lt/LC_MESSAGES/15924.mo and b/messages/lt/LC_MESSAGES/15924.mo differ
diff --git a/messages/lt/LC_MESSAGES/3166-1.mo b/messages/lt/LC_MESSAGES/3166-1.mo
index 248464ad..c9f9b382 100644
Binary files a/messages/lt/LC_MESSAGES/3166-1.mo and b/messages/lt/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/lt/LC_MESSAGES/3166-1.po b/messages/lt/LC_MESSAGES/3166-1.po
index d6a8d0c6..4349a421 100644
--- a/messages/lt/LC_MESSAGES/3166-1.po
+++ b/messages/lt/LC_MESSAGES/3166-1.po
@@ -1,9 +1,11 @@
-# Translation of ISO-3166 (country names) to Lithuanian
+# Translation of ISO 3166-1 to Lithuanian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
-# Copyright (C)
-# Free Software Foundation, Inc., 2004
-# Translations from KDE:
-# - Ričardas Čepas <rch@richard.eu.org>
+#
+# Copyright ©
+# Ričardas Čepas <rch@richard.eu.org>
 # Alastair McKinstry, <mckinstry@computer.org>, 2002.
 # Kęstutis Biliūnas <kebil@kaunas.init.lt>, 2004...2010.
 # Rimas Kudelis <rq@akl.lt>, 2012, 2013.
diff --git a/messages/lt/LC_MESSAGES/3166-2.mo b/messages/lt/LC_MESSAGES/3166-2.mo
index ef61846a..afca642f 100644
Binary files a/messages/lt/LC_MESSAGES/3166-2.mo and b/messages/lt/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/lt/LC_MESSAGES/3166-3.mo b/messages/lt/LC_MESSAGES/3166-3.mo
index 3ffac821..fe571335 100644
Binary files a/messages/lt/LC_MESSAGES/3166-3.mo and b/messages/lt/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/lt/LC_MESSAGES/4217.mo b/messages/lt/LC_MESSAGES/4217.mo
index 88919898..7f24be8c 100644
Binary files a/messages/lt/LC_MESSAGES/4217.mo and b/messages/lt/LC_MESSAGES/4217.mo differ
diff --git a/messages/lt/LC_MESSAGES/639-2.mo b/messages/lt/LC_MESSAGES/639-2.mo
index 0a5ac0b3..7513807e 100644
Binary files a/messages/lt/LC_MESSAGES/639-2.mo and b/messages/lt/LC_MESSAGES/639-2.mo differ
diff --git a/messages/lt/LC_MESSAGES/639-2.po b/messages/lt/LC_MESSAGES/639-2.po
index d5680e98..e827b01f 100644
--- a/messages/lt/LC_MESSAGES/639-2.po
+++ b/messages/lt/LC_MESSAGES/639-2.po
@@ -1,13 +1,13 @@
-# Translation of ISO-639 (language names) to Lithuanian
+# Translation of ISO 639-2 to Lithuanian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2000-2001, 2004
-#   Gediminas Paulauskas <menesis@delfi.lt>, 2000-2001.
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Kęstutis Biliūnas <kebil@kaunas.init.lt>, 2004, 2006, 2008, 2009.
-#
+# Copyright ©
+# Gediminas Paulauskas <menesis@delfi.lt>, 2000-2001.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Kęstutis Biliūnas <kebil@kaunas.init.lt>, 2004, 2006, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/lt/LC_MESSAGES/639-3.mo b/messages/lt/LC_MESSAGES/639-3.mo
index 8aec2b19..b009b065 100644
Binary files a/messages/lt/LC_MESSAGES/639-3.mo and b/messages/lt/LC_MESSAGES/639-3.mo differ
diff --git a/messages/lv/LC_MESSAGES/15924.mo b/messages/lv/LC_MESSAGES/15924.mo
index 35c8a70e..d9fdbbb8 100644
Binary files a/messages/lv/LC_MESSAGES/15924.mo and b/messages/lv/LC_MESSAGES/15924.mo differ
diff --git a/messages/lv/LC_MESSAGES/3166-1.mo b/messages/lv/LC_MESSAGES/3166-1.mo
index ada069ec..be4d8ada 100644
Binary files a/messages/lv/LC_MESSAGES/3166-1.mo and b/messages/lv/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/lv/LC_MESSAGES/3166-1.po b/messages/lv/LC_MESSAGES/3166-1.po
index b0914d30..8747d6ac 100644
--- a/messages/lv/LC_MESSAGES/3166-1.po
+++ b/messages/lv/LC_MESSAGES/3166-1.po
@@ -1,7 +1,10 @@
-# Translation of ISO-3166 (country names) to Latvian
+# Translation of ISO 3166-1 to Latvian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
-# Copyright (C) Free Software Foundation, Inc., 2001,2003.
 #
+# Copyright ©
 # Juris Kudiņš <cooker@inbox.lv>, 2001.
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
 # Aigars Mahinovs <aigarius@debian.org>, 2006.
diff --git a/messages/lv/LC_MESSAGES/3166-2.mo b/messages/lv/LC_MESSAGES/3166-2.mo
index 6f97261e..747ca620 100644
Binary files a/messages/lv/LC_MESSAGES/3166-2.mo and b/messages/lv/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/lv/LC_MESSAGES/3166-3.mo b/messages/lv/LC_MESSAGES/3166-3.mo
index 79a14439..6ab9ef7a 100644
Binary files a/messages/lv/LC_MESSAGES/3166-3.mo and b/messages/lv/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/lv/LC_MESSAGES/4217.mo b/messages/lv/LC_MESSAGES/4217.mo
index a34e191b..79bf8291 100644
Binary files a/messages/lv/LC_MESSAGES/4217.mo and b/messages/lv/LC_MESSAGES/4217.mo differ
diff --git a/messages/lv/LC_MESSAGES/639-2.mo b/messages/lv/LC_MESSAGES/639-2.mo
index f7ad2801..fb66b812 100644
Binary files a/messages/lv/LC_MESSAGES/639-2.mo and b/messages/lv/LC_MESSAGES/639-2.mo differ
diff --git a/messages/lv/LC_MESSAGES/639-2.po b/messages/lv/LC_MESSAGES/639-2.po
index 00e74692..c64ab0e7 100644
--- a/messages/lv/LC_MESSAGES/639-2.po
+++ b/messages/lv/LC_MESSAGES/639-2.po
@@ -1,9 +1,11 @@
-# Latvian translations of ISO 639 Latvian names
+# Translation of ISO 639-2 to Latvian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# Translations from KDE:
-# Andris Maziks <andzha@latnet.lv>
 #
+# Copyright ©
+# Andris Maziks <andzha@latnet.lv>
 # Alastair McKinstry <mckinstry@computer.org>, 2002.
 # Rūdofls Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2014.
 # Rihards Prieditis <rihards.prieditis@gmail.com>, 2013.
diff --git a/messages/lv/LC_MESSAGES/639-3.mo b/messages/lv/LC_MESSAGES/639-3.mo
index 529d0f06..9375d4f5 100644
Binary files a/messages/lv/LC_MESSAGES/639-3.mo and b/messages/lv/LC_MESSAGES/639-3.mo differ
diff --git a/messages/mai/LC_MESSAGES/3166-1.mo b/messages/mai/LC_MESSAGES/3166-1.mo
index 24254eac..e05a1c18 100644
Binary files a/messages/mai/LC_MESSAGES/3166-1.mo and b/messages/mai/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/mai/LC_MESSAGES/3166-1.po b/messages/mai/LC_MESSAGES/3166-1.po
index 31dec94a..799df789 100644
--- a/messages/mai/LC_MESSAGES/3166-1.po
+++ b/messages/mai/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Maithili
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/mhr/LC_MESSAGES/3166-1.mo b/messages/mhr/LC_MESSAGES/3166-1.mo
index 381a7349..e35feb4a 100644
Binary files a/messages/mhr/LC_MESSAGES/3166-1.mo and b/messages/mhr/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/mhr/LC_MESSAGES/3166-1.po b/messages/mhr/LC_MESSAGES/3166-1.po
index f1602a67..fe68f42e 100644
--- a/messages/mhr/LC_MESSAGES/3166-1.po
+++ b/messages/mhr/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Meadow Mari
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/mi/LC_MESSAGES/3166-1.mo b/messages/mi/LC_MESSAGES/3166-1.mo
index 82d82530..69a1045e 100644
Binary files a/messages/mi/LC_MESSAGES/3166-1.mo and b/messages/mi/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/mi/LC_MESSAGES/3166-1.po b/messages/mi/LC_MESSAGES/3166-1.po
index f37b8b54..800e978a 100644
--- a/messages/mi/LC_MESSAGES/3166-1.po
+++ b/messages/mi/LC_MESSAGES/3166-1.po
@@ -1,10 +1,12 @@
-# Translation of ISO-3166 (country names) to Maori
+# Translation of ISO 3166-1 to Maori
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
-# Copyright (C)
-# Free Software Foundation, Inc., 2002,2003
+#
+# Copyright ©
 # Alastair McKinstry <mckinstry@computer.org>, 2002.
-# Translations from KDE:
-# - James Gasson <james.gasson@clear.net.nz>
+# James Gasson <james.gasson@clear.net.nz>
 # Chris Leonard <cjlhomeaddress@gmail.com>, 2013.
 msgid ""
 msgstr ""
diff --git a/messages/mi/LC_MESSAGES/3166-3.mo b/messages/mi/LC_MESSAGES/3166-3.mo
index 68539036..bf1bd2bd 100644
Binary files a/messages/mi/LC_MESSAGES/3166-3.mo and b/messages/mi/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/mi/LC_MESSAGES/639-2.mo b/messages/mi/LC_MESSAGES/639-2.mo
index 8e50b42b..6a0e624b 100644
Binary files a/messages/mi/LC_MESSAGES/639-2.mo and b/messages/mi/LC_MESSAGES/639-2.mo differ
diff --git a/messages/mi/LC_MESSAGES/639-2.po b/messages/mi/LC_MESSAGES/639-2.po
index 2042b5d6..55978363 100644
--- a/messages/mi/LC_MESSAGES/639-2.po
+++ b/messages/mi/LC_MESSAGES/639-2.po
@@ -1,13 +1,12 @@
-# Translation of ISO-639 (language names) to Maori
+# Translation of ISO 639-2 to Maori
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002
-#   Alastair McKinstry <mckinstry@computer.org>, 2002
-#   Translations from KDE:
-#   James Gasson <james.gasson@clear.net.nz>, 2002
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002
+# James Gasson <james.gasson@clear.net.nz>, 2002
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/mi/LC_MESSAGES/639-3.mo b/messages/mi/LC_MESSAGES/639-3.mo
index e5c3c8ac..0c87e3f6 100644
Binary files a/messages/mi/LC_MESSAGES/639-3.mo and b/messages/mi/LC_MESSAGES/639-3.mo differ
diff --git a/messages/mk/LC_MESSAGES/3166-1.mo b/messages/mk/LC_MESSAGES/3166-1.mo
index 982627b3..81921b8b 100644
Binary files a/messages/mk/LC_MESSAGES/3166-1.mo and b/messages/mk/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/mk/LC_MESSAGES/3166-1.po b/messages/mk/LC_MESSAGES/3166-1.po
index 5c24cdbf..d1275d4c 100644
--- a/messages/mk/LC_MESSAGES/3166-1.po
+++ b/messages/mk/LC_MESSAGES/3166-1.po
@@ -1,12 +1,11 @@
-# translation of iso-codes_iso_3166_mk.po to Macedonian
-# translation of mk.po to
-# Translation of ISO-3166 (country names) to Macedonian
+# Translation of ISO 3166-1 to Macedonian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#
-#   Georgi Stanojevski <glisha@gmail.com>, 2004, 2006.
+# Copyright ©
+# Georgi Stanojevski <glisha@gmail.com>, 2004, 2006.
 # Arangel Angov <ufo@linux.net.mk>, 2008, 2009, 2010, 2011.
 msgid ""
 msgstr ""
diff --git a/messages/mk/LC_MESSAGES/3166-3.mo b/messages/mk/LC_MESSAGES/3166-3.mo
index 42a38255..b94867bd 100644
Binary files a/messages/mk/LC_MESSAGES/3166-3.mo and b/messages/mk/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/mk/LC_MESSAGES/639-2.mo b/messages/mk/LC_MESSAGES/639-2.mo
index 4b142867..ebe5f04b 100644
Binary files a/messages/mk/LC_MESSAGES/639-2.mo and b/messages/mk/LC_MESSAGES/639-2.mo differ
diff --git a/messages/mk/LC_MESSAGES/639-2.po b/messages/mk/LC_MESSAGES/639-2.po
index 7db00367..dec30265 100644
--- a/messages/mk/LC_MESSAGES/639-2.po
+++ b/messages/mk/LC_MESSAGES/639-2.po
@@ -1,13 +1,12 @@
-# Translation of ISO-639 (language names) to Macedonian
+# Translation of ISO 639-2 to Macedonian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002,2004
-#   Alastair McKinstry <mckinstry@computer.org>, 2002
-#   Translations from KDE:
-#   Danko Ilik <danko@mindless.com>
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002
+# Danko Ilik <danko@mindless.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/mk/LC_MESSAGES/639-3.mo b/messages/mk/LC_MESSAGES/639-3.mo
index 38977f1e..016d6dbe 100644
Binary files a/messages/mk/LC_MESSAGES/639-3.mo and b/messages/mk/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ml/LC_MESSAGES/15924.mo b/messages/ml/LC_MESSAGES/15924.mo
index 9473936b..098b284e 100644
Binary files a/messages/ml/LC_MESSAGES/15924.mo and b/messages/ml/LC_MESSAGES/15924.mo differ
diff --git a/messages/ml/LC_MESSAGES/3166-1.mo b/messages/ml/LC_MESSAGES/3166-1.mo
index dd8cea0a..8c7ee2f8 100644
Binary files a/messages/ml/LC_MESSAGES/3166-1.mo and b/messages/ml/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ml/LC_MESSAGES/3166-1.po b/messages/ml/LC_MESSAGES/3166-1.po
index 07c16a9c..4f823d7c 100644
--- a/messages/ml/LC_MESSAGES/3166-1.po
+++ b/messages/ml/LC_MESSAGES/3166-1.po
@@ -1,16 +1,11 @@
-# Translation of ISO 3166 (country names) to Malayalam
+# Translation of ISO 3166-1 to Malayalam
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C) 2006-2008 Praveen A <pravi.a@gmail.com> and contributors listed below,
-# Praveen A <pravi.a@gmail.com>, 2006, 2008.
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#
+# Copyright ©
+# Praveen A <pravi.a@gmail.com>, 2006-2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ml/LC_MESSAGES/3166-3.mo b/messages/ml/LC_MESSAGES/3166-3.mo
index e25bc93a..f8d5aa13 100644
Binary files a/messages/ml/LC_MESSAGES/3166-3.mo and b/messages/ml/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ml/LC_MESSAGES/639-2.mo b/messages/ml/LC_MESSAGES/639-2.mo
index 9c1c20a1..7e24afb4 100644
Binary files a/messages/ml/LC_MESSAGES/639-2.mo and b/messages/ml/LC_MESSAGES/639-2.mo differ
diff --git a/messages/ml/LC_MESSAGES/639-2.po b/messages/ml/LC_MESSAGES/639-2.po
index 7014456c..72d0afe3 100644
--- a/messages/ml/LC_MESSAGES/639-2.po
+++ b/messages/ml/LC_MESSAGES/639-2.po
@@ -1,10 +1,11 @@
-# Translation of ISO 639 (3.15) to Malayalam
+# Translation of ISO 639-2 to Malayalam
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Ani Peter <peter.ani@gmail.com>, 2009
-#
+# Copyright ©
+# Ani Peter <peter.ani@gmail.com>, 2009
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/mn/LC_MESSAGES/3166-1.mo b/messages/mn/LC_MESSAGES/3166-1.mo
index 9fb7f53e..96c1cb27 100644
Binary files a/messages/mn/LC_MESSAGES/3166-1.mo and b/messages/mn/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/mn/LC_MESSAGES/3166-1.po b/messages/mn/LC_MESSAGES/3166-1.po
index b46bf7ea..5a0b6414 100644
--- a/messages/mn/LC_MESSAGES/3166-1.po
+++ b/messages/mn/LC_MESSAGES/3166-1.po
@@ -1,6 +1,10 @@
-# ISO-3166 territory names in Mongolian
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This file is distributed under the LGPL License
+# Translation of ISO 3166-1 to Mongolian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
+# This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Sanlig Badral <badral@chinggis.com>, 2003.
 msgid ""
 msgstr ""
diff --git a/messages/mn/LC_MESSAGES/3166-3.mo b/messages/mn/LC_MESSAGES/3166-3.mo
index 168ae443..a33d9c01 100644
Binary files a/messages/mn/LC_MESSAGES/3166-3.mo and b/messages/mn/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/mn/LC_MESSAGES/4217.mo b/messages/mn/LC_MESSAGES/4217.mo
index 99fefea3..22cd7b4c 100644
Binary files a/messages/mn/LC_MESSAGES/4217.mo and b/messages/mn/LC_MESSAGES/4217.mo differ
diff --git a/messages/mn/LC_MESSAGES/639-2.mo b/messages/mn/LC_MESSAGES/639-2.mo
index cab51a89..1108dc55 100644
Binary files a/messages/mn/LC_MESSAGES/639-2.mo and b/messages/mn/LC_MESSAGES/639-2.mo differ
diff --git a/messages/mn/LC_MESSAGES/639-2.po b/messages/mn/LC_MESSAGES/639-2.po
index cdd78bba..61e3d79c 100644
--- a/messages/mn/LC_MESSAGES/639-2.po
+++ b/messages/mn/LC_MESSAGES/639-2.po
@@ -1,13 +1,12 @@
-# Translation of ISO-639 (language names) to Mongolian
+# Translation of ISO 639-2 to Mongolian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2003
-#   Alastair McKinstry, <mckinstry@computer.org>, 2003,2004.
-#   Translations from kde-i18n-3.1:
-#   Sanlig Badral <badral@chinggis.com>, 2002, 2003
-#
+# Copyright ©
+# Alastair McKinstry, <mckinstry@computer.org>, 2003,2004.
+# Sanlig Badral <badral@chinggis.com>, 2002, 2003
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/mn/LC_MESSAGES/639-3.mo b/messages/mn/LC_MESSAGES/639-3.mo
index 6390620e..1d881532 100644
Binary files a/messages/mn/LC_MESSAGES/639-3.mo and b/messages/mn/LC_MESSAGES/639-3.mo differ
diff --git a/messages/mo/LC_MESSAGES/3166-1.mo b/messages/mo/LC_MESSAGES/3166-1.mo
index 4cf614e1..7e0f4c5e 100644
Binary files a/messages/mo/LC_MESSAGES/3166-1.mo and b/messages/mo/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/mo/LC_MESSAGES/3166-1.po b/messages/mo/LC_MESSAGES/3166-1.po
index 9e6b436e..6cc81b20 100644
--- a/messages/mo/LC_MESSAGES/3166-1.po
+++ b/messages/mo/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Moldovan
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/mr/LC_MESSAGES/3166-1.mo b/messages/mr/LC_MESSAGES/3166-1.mo
index 7bc80aee..73cf1154 100644
Binary files a/messages/mr/LC_MESSAGES/3166-1.mo and b/messages/mr/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/mr/LC_MESSAGES/3166-1.po b/messages/mr/LC_MESSAGES/3166-1.po
index 432d3a41..151f4eb4 100644
--- a/messages/mr/LC_MESSAGES/3166-1.po
+++ b/messages/mr/LC_MESSAGES/3166-1.po
@@ -1,13 +1,13 @@
-# translation of iso_3166-3.15.po to Marathi
-# Translation of ISO-3166 (country names) to Marathi
+# Translation of ISO 3166-1 to Marathi
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#
-#   Alastair McKinstry, <mckinstry@debian.org>, 2004.
-#   Sampada Nakhare, 2007.
-#   Priti Patil <prithisd@gmail.com>, 2007.
+# Copyright ©
+# Alastair McKinstry, <mckinstry@debian.org>, 2004.
+# Sampada Nakhare, 2007.
+# Priti Patil <prithisd@gmail.com>, 2007.
 # Sandeep Shedmake <sshedmak@redhat.com>, 2009, 2010.
 msgid ""
 msgstr ""
diff --git a/messages/mr/LC_MESSAGES/3166-3.mo b/messages/mr/LC_MESSAGES/3166-3.mo
index 29d75bb6..c81926ac 100644
Binary files a/messages/mr/LC_MESSAGES/3166-3.mo and b/messages/mr/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/mr/LC_MESSAGES/639-2.mo b/messages/mr/LC_MESSAGES/639-2.mo
index eacc7f70..11bd0830 100644
Binary files a/messages/mr/LC_MESSAGES/639-2.mo and b/messages/mr/LC_MESSAGES/639-2.mo differ
diff --git a/messages/mr/LC_MESSAGES/639-2.po b/messages/mr/LC_MESSAGES/639-2.po
index 292284a4..a088fa63 100644
--- a/messages/mr/LC_MESSAGES/639-2.po
+++ b/messages/mr/LC_MESSAGES/639-2.po
@@ -1,10 +1,10 @@
-# translation of iso_639-3.15.po to Marathi
-# Translation of ISO-639 (language names) to Marathi
+# Translation of ISO 639-2 to Marathi
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#
+# Copyright ©
 # Alastair McKinstry <mckinstry@debian.org>, 2004.
 # Sandeep Shedmake <sshedmak@redhat.com>, 2009, 2010.
 msgid ""
diff --git a/messages/mr/LC_MESSAGES/639-3.mo b/messages/mr/LC_MESSAGES/639-3.mo
index 9f3c966b..f120f6dc 100644
Binary files a/messages/mr/LC_MESSAGES/639-3.mo and b/messages/mr/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ms/LC_MESSAGES/3166-1.mo b/messages/ms/LC_MESSAGES/3166-1.mo
index 3661bd2d..fd4e420d 100644
Binary files a/messages/ms/LC_MESSAGES/3166-1.mo and b/messages/ms/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ms/LC_MESSAGES/3166-1.po b/messages/ms/LC_MESSAGES/3166-1.po
index ee07173b..cafd18e2 100644
--- a/messages/ms/LC_MESSAGES/3166-1.po
+++ b/messages/ms/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO-3166 (country names) to Malay
+# Translation of ISO 3166-1 to Malay
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ms/LC_MESSAGES/3166-3.mo b/messages/ms/LC_MESSAGES/3166-3.mo
index 7d1e85ed..827b97f8 100644
Binary files a/messages/ms/LC_MESSAGES/3166-3.mo and b/messages/ms/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ms/LC_MESSAGES/639-2.mo b/messages/ms/LC_MESSAGES/639-2.mo
index efef276c..7d8f97bb 100644
Binary files a/messages/ms/LC_MESSAGES/639-2.mo and b/messages/ms/LC_MESSAGES/639-2.mo differ
diff --git a/messages/ms/LC_MESSAGES/639-2.po b/messages/ms/LC_MESSAGES/639-2.po
index 06efd5e3..3fb4b540 100644
--- a/messages/ms/LC_MESSAGES/639-2.po
+++ b/messages/ms/LC_MESSAGES/639-2.po
@@ -1,12 +1,12 @@
-# Translation of ISO-639 (language names) to Malay
+# Translation of ISO 639-2 to Malay
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2001,2004
-#   Hasbullah Bin Pit (sebol) <sebol@ikhlas.com>, 2001
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#
+# Copyright ©
+# Hasbullah Bin Pit (sebol) <sebol@ikhlas.com>, 2001
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/ms/LC_MESSAGES/639-3.mo b/messages/ms/LC_MESSAGES/639-3.mo
index 80d8f7c1..bc6b98fc 100644
Binary files a/messages/ms/LC_MESSAGES/639-3.mo and b/messages/ms/LC_MESSAGES/639-3.mo differ
diff --git a/messages/mt/LC_MESSAGES/3166-1.mo b/messages/mt/LC_MESSAGES/3166-1.mo
index f9aa7fc6..ba2340a6 100644
Binary files a/messages/mt/LC_MESSAGES/3166-1.mo and b/messages/mt/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/mt/LC_MESSAGES/3166-1.po b/messages/mt/LC_MESSAGES/3166-1.po
index 82333126..8390f481 100644
--- a/messages/mt/LC_MESSAGES/3166-1.po
+++ b/messages/mt/LC_MESSAGES/3166-1.po
@@ -1,13 +1,12 @@
-# Translation of ISO-3166 (country names) to Maltese
+# Translation of ISO 3166-1 to Maltese
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002,2003
-#   Alastair McKinstry <mckinstry@computer.org>, 2002.
-#   Translations from KDE:
-#   - Ramon Casha <ramon.casha@linux.org.mt>
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002.
+# Ramon Casha <ramon.casha@linux.org.mt>
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/mt/LC_MESSAGES/3166-3.mo b/messages/mt/LC_MESSAGES/3166-3.mo
index 83db8c58..c7a6ce98 100644
Binary files a/messages/mt/LC_MESSAGES/3166-3.mo and b/messages/mt/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/mt/LC_MESSAGES/639-2.mo b/messages/mt/LC_MESSAGES/639-2.mo
index 681f99eb..78e8b6d3 100644
Binary files a/messages/mt/LC_MESSAGES/639-2.mo and b/messages/mt/LC_MESSAGES/639-2.mo differ
diff --git a/messages/mt/LC_MESSAGES/639-2.po b/messages/mt/LC_MESSAGES/639-2.po
index 8d2372a6..993a4256 100644
--- a/messages/mt/LC_MESSAGES/639-2.po
+++ b/messages/mt/LC_MESSAGES/639-2.po
@@ -1,13 +1,12 @@
-# Translation of ISO-639 (language names) to Maltese
+# Translation of ISO 639-2 to Maltese
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002,2004
-#   Alastair McKinstry <mckinstry@computer.org>, 2002
-#   Translations from KDE:
-#   Ramon Casha <ramon.casha@linux.org.mt>
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002
+# Ramon Casha <ramon.casha@linux.org.mt>
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/mt/LC_MESSAGES/639-3.mo b/messages/mt/LC_MESSAGES/639-3.mo
index 6ac2fb2e..7d519346 100644
Binary files a/messages/mt/LC_MESSAGES/639-3.mo and b/messages/mt/LC_MESSAGES/639-3.mo differ
diff --git a/messages/my/LC_MESSAGES/3166-1.mo b/messages/my/LC_MESSAGES/3166-1.mo
index 8838a2db..9a378ca0 100644
Binary files a/messages/my/LC_MESSAGES/3166-1.mo and b/messages/my/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/my/LC_MESSAGES/3166-1.po b/messages/my/LC_MESSAGES/3166-1.po
index 9fc07eb5..c919a74a 100644
--- a/messages/my/LC_MESSAGES/3166-1.po
+++ b/messages/my/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Burmese
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/na/LC_MESSAGES/3166-1.mo b/messages/na/LC_MESSAGES/3166-1.mo
index 7bd89b8e..986ea245 100644
Binary files a/messages/na/LC_MESSAGES/3166-1.mo and b/messages/na/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/na/LC_MESSAGES/3166-1.po b/messages/na/LC_MESSAGES/3166-1.po
index eeed9fcc..b005f615 100644
--- a/messages/na/LC_MESSAGES/3166-1.po
+++ b/messages/na/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Nauru
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/nah/LC_MESSAGES/3166-1.mo b/messages/nah/LC_MESSAGES/3166-1.mo
index d0cb1324..418c731e 100644
Binary files a/messages/nah/LC_MESSAGES/3166-1.mo and b/messages/nah/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/nah/LC_MESSAGES/3166-1.po b/messages/nah/LC_MESSAGES/3166-1.po
index 5e411760..68679d3a 100644
--- a/messages/nah/LC_MESSAGES/3166-1.po
+++ b/messages/nah/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Nahuatl languages
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/nb/LC_MESSAGES/15924.mo b/messages/nb/LC_MESSAGES/15924.mo
index 2f4e5009..7765f71d 100644
Binary files a/messages/nb/LC_MESSAGES/15924.mo and b/messages/nb/LC_MESSAGES/15924.mo differ
diff --git a/messages/nb/LC_MESSAGES/3166-1.mo b/messages/nb/LC_MESSAGES/3166-1.mo
index 182295f2..8a989cb4 100644
Binary files a/messages/nb/LC_MESSAGES/3166-1.mo and b/messages/nb/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/nb/LC_MESSAGES/3166-1.po b/messages/nb/LC_MESSAGES/3166-1.po
index a651abf7..24845140 100644
--- a/messages/nb/LC_MESSAGES/3166-1.po
+++ b/messages/nb/LC_MESSAGES/3166-1.po
@@ -1,14 +1,15 @@
-# Translation of ISO-3166 (country names) to Norwegian Bokmål
+# Translation of ISO 3166-1 to Bokmål, Norwegian; Norwegian Bokmål
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
+# Copyright ©
 # Håvard Korsvoll <korsvoll@skulelinux.no>, 2004.
 # Knut Yrvin <knuty@skolelinux.no>, 2004.
 # Axel Bojer <axelb@skolelinux.no>, 2004.
 # Bjørn Steensrud <bjornst@powertech.no>, 2006.
 # Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2007-2015.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/nb/LC_MESSAGES/3166-3.mo b/messages/nb/LC_MESSAGES/3166-3.mo
index d5da2657..5bf34faa 100644
Binary files a/messages/nb/LC_MESSAGES/3166-3.mo and b/messages/nb/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/nb/LC_MESSAGES/4217.mo b/messages/nb/LC_MESSAGES/4217.mo
index 8478b034..609f6e5a 100644
Binary files a/messages/nb/LC_MESSAGES/4217.mo and b/messages/nb/LC_MESSAGES/4217.mo differ
diff --git a/messages/nb/LC_MESSAGES/639-2.mo b/messages/nb/LC_MESSAGES/639-2.mo
index 52fba852..0325e31b 100644
Binary files a/messages/nb/LC_MESSAGES/639-2.mo and b/messages/nb/LC_MESSAGES/639-2.mo differ
diff --git a/messages/nb/LC_MESSAGES/639-2.po b/messages/nb/LC_MESSAGES/639-2.po
index 864b3d94..38d2bc1b 100644
--- a/messages/nb/LC_MESSAGES/639-2.po
+++ b/messages/nb/LC_MESSAGES/639-2.po
@@ -1,14 +1,13 @@
-# Translation of ISO-639 (language names) to Norwegian Bokmål
+# Translation of ISO 639-2 to Bokmål, Norwegian; Norwegian Bokmål
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-# Free Software Foundation, Inc., 2002,2004
+# Copyright ©
 # Alastair McKinstry <mckinstry@computer.org>, 2002
-# Translations from KDE:
 # Rune Nordvik <rune@linuxnorge.com>, 2001
 # Kjartan Maraas <kmaraas@broadpark.no>, 2009.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/nb/LC_MESSAGES/639-3.mo b/messages/nb/LC_MESSAGES/639-3.mo
index 98b908b2..ee40d39f 100644
Binary files a/messages/nb/LC_MESSAGES/639-3.mo and b/messages/nb/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ne/LC_MESSAGES/3166-1.mo b/messages/ne/LC_MESSAGES/3166-1.mo
index 71e685f8..fce67b46 100644
Binary files a/messages/ne/LC_MESSAGES/3166-1.mo and b/messages/ne/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ne/LC_MESSAGES/3166-1.po b/messages/ne/LC_MESSAGES/3166-1.po
index 4b999dfb..b77380fd 100644
--- a/messages/ne/LC_MESSAGES/3166-1.po
+++ b/messages/ne/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO-3166 (country names) to Nepali
+# Translation of ISO 3166-1 to Nepali
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#
-#   Shyam Krishna Bal <shyamkrishna_bal@yahoo.com>, 2006.
+# Copyright ©
+# Shyam Krishna Bal <shyamkrishna_bal@yahoo.com>, 2006.
 # Shiva Prasad Pokharel <pokharelshiva@hotmail.com>, 2006, 2011.
 msgid ""
 msgstr ""
diff --git a/messages/ne/LC_MESSAGES/3166-3.mo b/messages/ne/LC_MESSAGES/3166-3.mo
index f5616944..8737327a 100644
Binary files a/messages/ne/LC_MESSAGES/3166-3.mo and b/messages/ne/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/nl/LC_MESSAGES/15924.mo b/messages/nl/LC_MESSAGES/15924.mo
index 78e331a1..bbc950b1 100644
Binary files a/messages/nl/LC_MESSAGES/15924.mo and b/messages/nl/LC_MESSAGES/15924.mo differ
diff --git a/messages/nl/LC_MESSAGES/3166-1.mo b/messages/nl/LC_MESSAGES/3166-1.mo
index eefc8bf7..1050122a 100644
Binary files a/messages/nl/LC_MESSAGES/3166-1.mo and b/messages/nl/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/nl/LC_MESSAGES/3166-1.po b/messages/nl/LC_MESSAGES/3166-1.po
index 1dde719e..76f4be2f 100644
--- a/messages/nl/LC_MESSAGES/3166-1.po
+++ b/messages/nl/LC_MESSAGES/3166-1.po
@@ -1,8 +1,10 @@
-# translation of iso_3166-1 to Dutch
-# Dutch translation of iso_3166.
-# Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Translation of ISO 3166-1 to Dutch; Flemish
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
 #
+# Copyright ©
 # Elros Cyriatan <cyriatan@fastmail.fm>, 2004.
 # Luk Claes <luk.claes@ugent.be>, 2005.
 # Freek de Kruijf <f.de.kruijf@gmail.com>, 2006, 2007, 2008, 2009, 2010, 2011,2012, 2013, 2015, 2017.
diff --git a/messages/nl/LC_MESSAGES/3166-2.mo b/messages/nl/LC_MESSAGES/3166-2.mo
index a8766444..54c691e4 100644
Binary files a/messages/nl/LC_MESSAGES/3166-2.mo and b/messages/nl/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/nl/LC_MESSAGES/3166-3.mo b/messages/nl/LC_MESSAGES/3166-3.mo
index e3c770ea..e7f2d9df 100644
Binary files a/messages/nl/LC_MESSAGES/3166-3.mo and b/messages/nl/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/nl/LC_MESSAGES/4217.mo b/messages/nl/LC_MESSAGES/4217.mo
index 59c04755..1bd8797f 100644
Binary files a/messages/nl/LC_MESSAGES/4217.mo and b/messages/nl/LC_MESSAGES/4217.mo differ
diff --git a/messages/nl/LC_MESSAGES/639-2.mo b/messages/nl/LC_MESSAGES/639-2.mo
index a36100f8..ba78ea2d 100644
Binary files a/messages/nl/LC_MESSAGES/639-2.mo and b/messages/nl/LC_MESSAGES/639-2.mo differ
diff --git a/messages/nl/LC_MESSAGES/639-2.po b/messages/nl/LC_MESSAGES/639-2.po
index 9d1d5519..e330f9cf 100644
--- a/messages/nl/LC_MESSAGES/639-2.po
+++ b/messages/nl/LC_MESSAGES/639-2.po
@@ -1,8 +1,10 @@
-# translation of iso_639-2 to Dutch
-# Dutch translation of iso_639.
-# Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Dutch; Flemish
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
 #
+# Copyright ©
 # Taco Witte <tcwitte@cs.uu.nl>, 2004.
 # Luk Claes <luk.claes@ugent.be>, 2005.
 # Reinout van Schouwen <reinouts@gnome.org>, 2007.
diff --git a/messages/nl/LC_MESSAGES/639-3.mo b/messages/nl/LC_MESSAGES/639-3.mo
index f15f23f5..74e211c3 100644
Binary files a/messages/nl/LC_MESSAGES/639-3.mo and b/messages/nl/LC_MESSAGES/639-3.mo differ
diff --git a/messages/nl/LC_MESSAGES/639-5.mo b/messages/nl/LC_MESSAGES/639-5.mo
index fc9ae51b..23be1c18 100644
Binary files a/messages/nl/LC_MESSAGES/639-5.mo and b/messages/nl/LC_MESSAGES/639-5.mo differ
diff --git a/messages/nn/LC_MESSAGES/15924.mo b/messages/nn/LC_MESSAGES/15924.mo
index bcaa8ebd..96d909b6 100644
Binary files a/messages/nn/LC_MESSAGES/15924.mo and b/messages/nn/LC_MESSAGES/15924.mo differ
diff --git a/messages/nn/LC_MESSAGES/3166-1.mo b/messages/nn/LC_MESSAGES/3166-1.mo
index f4777cd4..54fbd329 100644
Binary files a/messages/nn/LC_MESSAGES/3166-1.mo and b/messages/nn/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/nn/LC_MESSAGES/3166-1.po b/messages/nn/LC_MESSAGES/3166-1.po
index 021f46d6..6f46133e 100644
--- a/messages/nn/LC_MESSAGES/3166-1.po
+++ b/messages/nn/LC_MESSAGES/3166-1.po
@@ -1,11 +1,11 @@
-# translation of nn.po to Norwegian nynorsk
-# Translation of ISO-3166 (country names) to Norwegian Nynorsk
+# Translation of ISO 3166-1 to Norwegian Nynorsk; Nynorsk, Norwegian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#
-#   Håvard Korsvoll <korsvoll@gmail.com>, 2004,2006, 2007, 2013.
+# Copyright ©
+# Håvard Korsvoll <korsvoll@gmail.com>, 2004,2006, 2007, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
diff --git a/messages/nn/LC_MESSAGES/3166-3.mo b/messages/nn/LC_MESSAGES/3166-3.mo
index a60b2778..01042908 100644
Binary files a/messages/nn/LC_MESSAGES/3166-3.mo and b/messages/nn/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/nn/LC_MESSAGES/4217.mo b/messages/nn/LC_MESSAGES/4217.mo
index 91f4de01..1de2cc0b 100644
Binary files a/messages/nn/LC_MESSAGES/4217.mo and b/messages/nn/LC_MESSAGES/4217.mo differ
diff --git a/messages/nn/LC_MESSAGES/639-2.mo b/messages/nn/LC_MESSAGES/639-2.mo
index a893cce2..6e7cc1be 100644
Binary files a/messages/nn/LC_MESSAGES/639-2.mo and b/messages/nn/LC_MESSAGES/639-2.mo differ
diff --git a/messages/nn/LC_MESSAGES/639-2.po b/messages/nn/LC_MESSAGES/639-2.po
index 1d28eff8..64801ffb 100644
--- a/messages/nn/LC_MESSAGES/639-2.po
+++ b/messages/nn/LC_MESSAGES/639-2.po
@@ -1,14 +1,14 @@
-# Translation of nn to Norwegian Nynorsk
+# Translation of ISO 639-2 to Norwegian Nynorsk; Nynorsk, Norwegian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#
-#   Free Software Foundation, Inc., 2001, 2004.
-#   Kjartan Maraas  <kmaraas@gnome.org>, 2001.
-#   Roy-Magne Mo <rmo@sunnmore.net>, 2001.
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Karl Ove Hufthammer <karl@huftis.org>, 2003-2004, 2006. (New translation done from scratch.).
+# Copyright ©
+# Kjartan Maraas  <kmaraas@gnome.org>, 2001.
+# Roy-Magne Mo <rmo@sunnmore.net>, 2001.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Karl Ove Hufthammer <karl@huftis.org>, 2003-2004, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
diff --git a/messages/nn/LC_MESSAGES/639-3.mo b/messages/nn/LC_MESSAGES/639-3.mo
index ad526dbb..65117747 100644
Binary files a/messages/nn/LC_MESSAGES/639-3.mo and b/messages/nn/LC_MESSAGES/639-3.mo differ
diff --git a/messages/nso/LC_MESSAGES/3166-1.mo b/messages/nso/LC_MESSAGES/3166-1.mo
index 2a7b6d50..9f90fad6 100644
Binary files a/messages/nso/LC_MESSAGES/3166-1.mo and b/messages/nso/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/nso/LC_MESSAGES/3166-1.po b/messages/nso/LC_MESSAGES/3166-1.po
index 0153eb96..26d71b37 100644
--- a/messages/nso/LC_MESSAGES/3166-1.po
+++ b/messages/nso/LC_MESSAGES/3166-1.po
@@ -1,13 +1,12 @@
-# Translation of ISO-3166 (country names) to Northern Sotho
+# Translation of ISO 3166-1 to Pedi; Sepedi; Northern Sotho
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2001,2003
-#   Alastair McKinstry <mckinstry@computer.org>, 200.
-#   Translations taken from kaddressbook:
-#   - Jerry Thobejane <jerry@translate.org.za>, 2002
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 200.
+# Jerry Thobejane <jerry@translate.org.za>, 2002
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/nso/LC_MESSAGES/3166-2.mo b/messages/nso/LC_MESSAGES/3166-2.mo
index 1ea83e88..a0f0b8e8 100644
Binary files a/messages/nso/LC_MESSAGES/3166-2.mo and b/messages/nso/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/nso/LC_MESSAGES/3166-3.mo b/messages/nso/LC_MESSAGES/3166-3.mo
index 6e61fe6d..c4a60b8f 100644
Binary files a/messages/nso/LC_MESSAGES/3166-3.mo and b/messages/nso/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/nso/LC_MESSAGES/639-2.mo b/messages/nso/LC_MESSAGES/639-2.mo
index ef84b9b0..98948006 100644
Binary files a/messages/nso/LC_MESSAGES/639-2.mo and b/messages/nso/LC_MESSAGES/639-2.mo differ
diff --git a/messages/nso/LC_MESSAGES/639-2.po b/messages/nso/LC_MESSAGES/639-2.po
index a241e0d6..811a79be 100644
--- a/messages/nso/LC_MESSAGES/639-2.po
+++ b/messages/nso/LC_MESSAGES/639-2.po
@@ -1,12 +1,11 @@
-# Translation of ISO-639 (language names) to Northern Sotho
+# Translation of ISO 639-2 to Pedi; Sepedi; Northern Sotho
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Zuza Software Foundation
-#   Translations from kde-i18n by
-#   Jerry Thobejane <jerry@translate.org.za>, 2002
-#
+# Copyright ©
+# Jerry Thobejane <jerry@translate.org.za>, 2002
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/nso/LC_MESSAGES/639-3.mo b/messages/nso/LC_MESSAGES/639-3.mo
index b44ffe9a..4d88e82c 100644
Binary files a/messages/nso/LC_MESSAGES/639-3.mo and b/messages/nso/LC_MESSAGES/639-3.mo differ
diff --git a/messages/nv/LC_MESSAGES/3166-1.mo b/messages/nv/LC_MESSAGES/3166-1.mo
index 75972801..391df521 100644
Binary files a/messages/nv/LC_MESSAGES/3166-1.mo and b/messages/nv/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/nv/LC_MESSAGES/3166-1.po b/messages/nv/LC_MESSAGES/3166-1.po
index 625097cb..3fbfc78e 100644
--- a/messages/nv/LC_MESSAGES/3166-1.po
+++ b/messages/nv/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Navajo; Navaho
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/oc/LC_MESSAGES/15924.mo b/messages/oc/LC_MESSAGES/15924.mo
index 27edbd22..077aa306 100644
Binary files a/messages/oc/LC_MESSAGES/15924.mo and b/messages/oc/LC_MESSAGES/15924.mo differ
diff --git a/messages/oc/LC_MESSAGES/3166-1.mo b/messages/oc/LC_MESSAGES/3166-1.mo
index ec6c2e85..1adb9f32 100644
Binary files a/messages/oc/LC_MESSAGES/3166-1.mo and b/messages/oc/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/oc/LC_MESSAGES/3166-1.po b/messages/oc/LC_MESSAGES/3166-1.po
index 31145192..f2bcdb6d 100644
--- a/messages/oc/LC_MESSAGES/3166-1.po
+++ b/messages/oc/LC_MESSAGES/3166-1.po
@@ -1,13 +1,12 @@
-# Translation of ISO-3166 (country names) to Occitan
+# Translation of ISO 3166-1 to Occitan (post 1500); Provençal
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2003
-#   Alastair McKinstry <mckinstry@computer.org>, 2002. 
-#   Translations from KDE:
-#   - Joan Luc Labòrda <laborde@crpp.u-bordeaux.fr>, 2002.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002.
+# Joan Luc Labòrda <laborde@crpp.u-bordeaux.fr>, 2002.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/oc/LC_MESSAGES/3166-2.mo b/messages/oc/LC_MESSAGES/3166-2.mo
index 62a9fb3f..375e7bf5 100644
Binary files a/messages/oc/LC_MESSAGES/3166-2.mo and b/messages/oc/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/oc/LC_MESSAGES/3166-3.mo b/messages/oc/LC_MESSAGES/3166-3.mo
index 7d6501e7..d52975a3 100644
Binary files a/messages/oc/LC_MESSAGES/3166-3.mo and b/messages/oc/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/oc/LC_MESSAGES/4217.mo b/messages/oc/LC_MESSAGES/4217.mo
index 9e6e2aea..c03f7a1c 100644
Binary files a/messages/oc/LC_MESSAGES/4217.mo and b/messages/oc/LC_MESSAGES/4217.mo differ
diff --git a/messages/oc/LC_MESSAGES/639-2.mo b/messages/oc/LC_MESSAGES/639-2.mo
index 6b239ef0..a33790c3 100644
Binary files a/messages/oc/LC_MESSAGES/639-2.mo and b/messages/oc/LC_MESSAGES/639-2.mo differ
diff --git a/messages/oc/LC_MESSAGES/639-2.po b/messages/oc/LC_MESSAGES/639-2.po
index d80d14de..48922009 100644
--- a/messages/oc/LC_MESSAGES/639-2.po
+++ b/messages/oc/LC_MESSAGES/639-2.po
@@ -1,13 +1,12 @@
-# Translation of ISO-639 (language names) to Occitan
+# Translation of ISO 639-2 to Occitan (post 1500); Provençal
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002
-#   Alastair McKinstry <mckinstry@computer.org>, 2002
-#   Translations from KDE:
-#   Joan Luc Labòrda <laborde@crpp.u-bordeaux.fr>
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002
+# Joan Luc Labòrda <laborde@crpp.u-bordeaux.fr>
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/oc/LC_MESSAGES/639-3.mo b/messages/oc/LC_MESSAGES/639-3.mo
index 5ebab7a8..0a889446 100644
Binary files a/messages/oc/LC_MESSAGES/639-3.mo and b/messages/oc/LC_MESSAGES/639-3.mo differ
diff --git a/messages/or/LC_MESSAGES/3166-1.mo b/messages/or/LC_MESSAGES/3166-1.mo
index 3327bf7d..4517396d 100644
Binary files a/messages/or/LC_MESSAGES/3166-1.mo and b/messages/or/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/or/LC_MESSAGES/3166-1.po b/messages/or/LC_MESSAGES/3166-1.po
index 45260a08..3efbd2fa 100644
--- a/messages/or/LC_MESSAGES/3166-1.po
+++ b/messages/or/LC_MESSAGES/3166-1.po
@@ -1,7 +1,10 @@
-# Translation of ISO 3166 (or.po) to Oriya
-# Copyright (C) 2010  Free Software Foundation, Inc.
+# Translation of ISO 3166-1 to Oriya
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
 #
+# Copyright ©
 # Manoj Kumar Giri <giri.manojkr@gmail.com>, 2010.
 msgid ""
 msgstr ""
diff --git a/messages/or/LC_MESSAGES/3166-3.mo b/messages/or/LC_MESSAGES/3166-3.mo
index 8e2c28cf..c9538ba4 100644
Binary files a/messages/or/LC_MESSAGES/3166-3.mo and b/messages/or/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/or/LC_MESSAGES/639-2.mo b/messages/or/LC_MESSAGES/639-2.mo
index 97cd8161..20d8a2bb 100644
Binary files a/messages/or/LC_MESSAGES/639-2.mo and b/messages/or/LC_MESSAGES/639-2.mo differ
diff --git a/messages/or/LC_MESSAGES/639-2.po b/messages/or/LC_MESSAGES/639-2.po
index eaf40f25..57365ad5 100644
--- a/messages/or/LC_MESSAGES/639-2.po
+++ b/messages/or/LC_MESSAGES/639-2.po
@@ -1,7 +1,10 @@
-# Translation of ISO 639 (or.po) to Oriya
-# Copyright (C) 2010  Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Oriya
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
 #
+# Copyright ©
 # Manoj Kumar Giri <giri.manojkr@gmail.com>, 2010.
 msgid ""
 msgstr ""
diff --git a/messages/or/LC_MESSAGES/639-3.mo b/messages/or/LC_MESSAGES/639-3.mo
index 931ccbce..65d150ea 100644
Binary files a/messages/or/LC_MESSAGES/639-3.mo and b/messages/or/LC_MESSAGES/639-3.mo differ
diff --git a/messages/pa/LC_MESSAGES/3166-1.mo b/messages/pa/LC_MESSAGES/3166-1.mo
index ce484f94..b938a881 100644
Binary files a/messages/pa/LC_MESSAGES/3166-1.mo and b/messages/pa/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/pa/LC_MESSAGES/3166-1.po b/messages/pa/LC_MESSAGES/3166-1.po
index b53273d0..430933f8 100644
--- a/messages/pa/LC_MESSAGES/3166-1.po
+++ b/messages/pa/LC_MESSAGES/3166-1.po
@@ -1,4 +1,6 @@
-# Translation of ISO-3166 (country names) to Panjabi
+# Translation of ISO 3166-1 to Panjabi; Punjabi
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
diff --git a/messages/pa/LC_MESSAGES/3166-3.mo b/messages/pa/LC_MESSAGES/3166-3.mo
index 6606c559..34c4dd25 100644
Binary files a/messages/pa/LC_MESSAGES/3166-3.mo and b/messages/pa/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/pa/LC_MESSAGES/639-2.mo b/messages/pa/LC_MESSAGES/639-2.mo
index b723980f..43d0b130 100644
Binary files a/messages/pa/LC_MESSAGES/639-2.mo and b/messages/pa/LC_MESSAGES/639-2.mo differ
diff --git a/messages/pa/LC_MESSAGES/639-2.po b/messages/pa/LC_MESSAGES/639-2.po
index 3defaf92..5cee435d 100644
--- a/messages/pa/LC_MESSAGES/639-2.po
+++ b/messages/pa/LC_MESSAGES/639-2.po
@@ -1,9 +1,10 @@
-# Translation of ISO 639 (language names) to Punjabi
+# Translation of ISO 639-2 to Panjabi; Punjabi
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#
+# Copyright ©
 # A S Alam <apbrar@gmail.com>, 2009.
 msgid ""
 msgstr ""
diff --git a/messages/pa/LC_MESSAGES/639-3.mo b/messages/pa/LC_MESSAGES/639-3.mo
index f0e5f432..c1c41f93 100644
Binary files a/messages/pa/LC_MESSAGES/639-3.mo and b/messages/pa/LC_MESSAGES/639-3.mo differ
diff --git a/messages/pap/LC_MESSAGES/3166-1.mo b/messages/pap/LC_MESSAGES/3166-1.mo
index f34f5196..823e54c2 100644
Binary files a/messages/pap/LC_MESSAGES/3166-1.mo and b/messages/pap/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/pap/LC_MESSAGES/3166-1.po b/messages/pap/LC_MESSAGES/3166-1.po
index c7ee95c4..ee6e6eaa 100644
--- a/messages/pap/LC_MESSAGES/3166-1.po
+++ b/messages/pap/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Papiamento
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/pi/LC_MESSAGES/3166-1.mo b/messages/pi/LC_MESSAGES/3166-1.mo
index a47466e1..6003ff55 100644
Binary files a/messages/pi/LC_MESSAGES/3166-1.mo and b/messages/pi/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/pi/LC_MESSAGES/3166-1.po b/messages/pi/LC_MESSAGES/3166-1.po
index 591dd575..d53795c4 100644
--- a/messages/pi/LC_MESSAGES/3166-1.po
+++ b/messages/pi/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Pali
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/pl/LC_MESSAGES/15924.mo b/messages/pl/LC_MESSAGES/15924.mo
index 5c47893e..0503b4ed 100644
Binary files a/messages/pl/LC_MESSAGES/15924.mo and b/messages/pl/LC_MESSAGES/15924.mo differ
diff --git a/messages/pl/LC_MESSAGES/3166-1.mo b/messages/pl/LC_MESSAGES/3166-1.mo
index f2788224..b04b9658 100644
Binary files a/messages/pl/LC_MESSAGES/3166-1.mo and b/messages/pl/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/pl/LC_MESSAGES/3166-1.po b/messages/pl/LC_MESSAGES/3166-1.po
index ab5f31be..baee4d92 100644
--- a/messages/pl/LC_MESSAGES/3166-1.po
+++ b/messages/pl/LC_MESSAGES/3166-1.po
@@ -1,15 +1,15 @@
-# Translation of ISO-3166-1 (country names) to Polish.
-# This file is distributed under the same license as the iso-codes package.
+# Translation of ISO 3166-1 to Polish
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
-#    Copyright (C)
-#      Free Software Foundation, Inc., 2004-2017
-#      Translations from KDE:
-#      - Jacek Stolarczyk <jacek@mer.chemia.polsl.gliwice.pl>
-#      Alastair McKinstry, <mckinstry@debian.org>, 2004.
-#      Tomasz Z. Napierala <zen@debian.linux.org.pl>, 2004, 2006.
-#      Andrzej M. Krzysztofowicz <ankry@mif.pg.gda.pl>, 2007
-#      Jakub Bogusz <qboosh@pld-linux.org>, 2007-2017
+# This file is distributed under the same license as the iso-codes package.
 #
+# Copyright ©
+# Jacek Stolarczyk <jacek@mer.chemia.polsl.gliwice.pl>
+# Alastair McKinstry, <mckinstry@debian.org>, 2004.
+# Tomasz Z. Napierala <zen@debian.linux.org.pl>, 2004, 2006.
+# Andrzej M. Krzysztofowicz <ankry@mif.pg.gda.pl>, 2007
+# Jakub Bogusz <qboosh@pld-linux.org>, 2007-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/pl/LC_MESSAGES/3166-2.mo b/messages/pl/LC_MESSAGES/3166-2.mo
index 893af86e..42d0aed5 100644
Binary files a/messages/pl/LC_MESSAGES/3166-2.mo and b/messages/pl/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/pl/LC_MESSAGES/3166-3.mo b/messages/pl/LC_MESSAGES/3166-3.mo
index a3f26ef7..c9552f2c 100644
Binary files a/messages/pl/LC_MESSAGES/3166-3.mo and b/messages/pl/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/pl/LC_MESSAGES/4217.mo b/messages/pl/LC_MESSAGES/4217.mo
index 36a51454..acebb88e 100644
Binary files a/messages/pl/LC_MESSAGES/4217.mo and b/messages/pl/LC_MESSAGES/4217.mo differ
diff --git a/messages/pl/LC_MESSAGES/639-2.mo b/messages/pl/LC_MESSAGES/639-2.mo
index ee159208..32932204 100644
Binary files a/messages/pl/LC_MESSAGES/639-2.mo and b/messages/pl/LC_MESSAGES/639-2.mo differ
diff --git a/messages/pl/LC_MESSAGES/639-2.po b/messages/pl/LC_MESSAGES/639-2.po
index b802b43b..119d1d8a 100644
--- a/messages/pl/LC_MESSAGES/639-2.po
+++ b/messages/pl/LC_MESSAGES/639-2.po
@@ -1,14 +1,15 @@
-# Translation of ISO-639-2 (language names) to Polish.
-# This file is distributed under the same license as the iso-codes package.
+# Translation of ISO 639-2 to Polish
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
-#    Copyright (C)
-#      Free Software Foundation, Inc., 2000-2017
-#      Cezary Jackiewicz <cjackiewicz@poczta.onet.pl>, 2000-2001
-#      GNOME PL Team <translators@gnome.pl>, 2001
-#      Alastair McKinstry <mckinstry@computer.org>, 2001
-#      Andrzej M. Krzysztofowicz <ankry@mif.pg.gda.pl>, 2007
-#      Jakub Bogusz <qboosh@pld-linux.org>, 2007-2017
+# This file is distributed under the same license as the iso-codes package.
 #
+# Copyright ©
+# Cezary Jackiewicz <cjackiewicz@poczta.onet.pl>, 2000-2001
+# GNOME PL Team <translators@gnome.pl>, 2001
+# Alastair McKinstry <mckinstry@computer.org>, 2001
+# Andrzej M. Krzysztofowicz <ankry@mif.pg.gda.pl>, 2007
+# Jakub Bogusz <qboosh@pld-linux.org>, 2007-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/pl/LC_MESSAGES/639-3.mo b/messages/pl/LC_MESSAGES/639-3.mo
index c1863719..55e5d599 100644
Binary files a/messages/pl/LC_MESSAGES/639-3.mo and b/messages/pl/LC_MESSAGES/639-3.mo differ
diff --git a/messages/pl/LC_MESSAGES/639-5.mo b/messages/pl/LC_MESSAGES/639-5.mo
index d1d8b60d..10c7c83e 100644
Binary files a/messages/pl/LC_MESSAGES/639-5.mo and b/messages/pl/LC_MESSAGES/639-5.mo differ
diff --git a/messages/ps/LC_MESSAGES/3166-1.mo b/messages/ps/LC_MESSAGES/3166-1.mo
index a61e9a39..cef56f6b 100644
Binary files a/messages/ps/LC_MESSAGES/3166-1.mo and b/messages/ps/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ps/LC_MESSAGES/3166-1.po b/messages/ps/LC_MESSAGES/3166-1.po
index ce059f79..418f5931 100644
--- a/messages/ps/LC_MESSAGES/3166-1.po
+++ b/messages/ps/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO-3166 (country names) to Pushto
+# Translation of ISO 3166-1 to Pushto; Pashto
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ps/LC_MESSAGES/3166-3.mo b/messages/ps/LC_MESSAGES/3166-3.mo
index 9a24151f..a6cbf57a 100644
Binary files a/messages/ps/LC_MESSAGES/3166-3.mo and b/messages/ps/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ps/LC_MESSAGES/639-2.mo b/messages/ps/LC_MESSAGES/639-2.mo
index 570370aa..4b9c916a 100644
Binary files a/messages/ps/LC_MESSAGES/639-2.mo and b/messages/ps/LC_MESSAGES/639-2.mo differ
diff --git a/messages/ps/LC_MESSAGES/639-2.po b/messages/ps/LC_MESSAGES/639-2.po
index 2338d6eb..44b8c25e 100644
--- a/messages/ps/LC_MESSAGES/639-2.po
+++ b/messages/ps/LC_MESSAGES/639-2.po
@@ -1,10 +1,11 @@
-# Translation of ISO-639 (language names) to Pushto
+# Translation of ISO 639-2 to Pushto; Pashto
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/ps/LC_MESSAGES/639-3.mo b/messages/ps/LC_MESSAGES/639-3.mo
index a69f1ec1..44211442 100644
Binary files a/messages/ps/LC_MESSAGES/639-3.mo and b/messages/ps/LC_MESSAGES/639-3.mo differ
diff --git a/messages/pt/LC_MESSAGES/15924.mo b/messages/pt/LC_MESSAGES/15924.mo
index 3d99d717..b6fbe723 100644
Binary files a/messages/pt/LC_MESSAGES/15924.mo and b/messages/pt/LC_MESSAGES/15924.mo differ
diff --git a/messages/pt/LC_MESSAGES/3166-1.mo b/messages/pt/LC_MESSAGES/3166-1.mo
index 1dbb4de3..b547d22e 100644
Binary files a/messages/pt/LC_MESSAGES/3166-1.mo and b/messages/pt/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/pt/LC_MESSAGES/3166-1.po b/messages/pt/LC_MESSAGES/3166-1.po
index 7679e155..754ee0f2 100644
--- a/messages/pt/LC_MESSAGES/3166-1.po
+++ b/messages/pt/LC_MESSAGES/3166-1.po
@@ -1,14 +1,16 @@
-# Translation of ISO-3166 (country names) to Portuguese
+# Translation of ISO 3166-1 to Portuguese
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Miguel Figueiredo <elmig@debianpt.org>, 2005-2013
-#
+# Notes:
 # Please follow this official pointer when translating to Portuguese
 # http://www.min-nestrangeiros.pt/mne/estrangeiro/indice.html
 # http://publications.europa.eu/code/pt/pt-5000500.htm
 #
+# Copyright ©
+# Miguel Figueiredo <elmig@debianpt.org>, 2005-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/pt/LC_MESSAGES/3166-3.mo b/messages/pt/LC_MESSAGES/3166-3.mo
index ad0b3f24..b151f42e 100644
Binary files a/messages/pt/LC_MESSAGES/3166-3.mo and b/messages/pt/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/pt/LC_MESSAGES/4217.mo b/messages/pt/LC_MESSAGES/4217.mo
index 4f2bfe15..143c997d 100644
Binary files a/messages/pt/LC_MESSAGES/4217.mo and b/messages/pt/LC_MESSAGES/4217.mo differ
diff --git a/messages/pt/LC_MESSAGES/639-2.mo b/messages/pt/LC_MESSAGES/639-2.mo
index cd6714bc..20a109e9 100644
Binary files a/messages/pt/LC_MESSAGES/639-2.mo and b/messages/pt/LC_MESSAGES/639-2.mo differ
diff --git a/messages/pt/LC_MESSAGES/639-2.po b/messages/pt/LC_MESSAGES/639-2.po
index b0ecbecf..a178017c 100644
--- a/messages/pt/LC_MESSAGES/639-2.po
+++ b/messages/pt/LC_MESSAGES/639-2.po
@@ -1,13 +1,13 @@
-# Translation of ISO-639 (language names) to Portuguese
+# Translation of ISO 639-2 to Portuguese
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2001,2004
-#   Filipe Maia <fmaia@gmx.net>, 2001.
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Miguel Figueiredo <elmig@debianpt.org>, 2013
-#
+# Copyright ©
+# Filipe Maia <fmaia@gmx.net>, 2001.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Miguel Figueiredo <elmig@debianpt.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/pt/LC_MESSAGES/639-3.mo b/messages/pt/LC_MESSAGES/639-3.mo
index e76d423c..3c4d8bc7 100644
Binary files a/messages/pt/LC_MESSAGES/639-3.mo and b/messages/pt/LC_MESSAGES/639-3.mo differ
diff --git a/messages/pt_BR/LC_MESSAGES/15924.mo b/messages/pt_BR/LC_MESSAGES/15924.mo
index b258fb4f..978343d1 100644
Binary files a/messages/pt_BR/LC_MESSAGES/15924.mo and b/messages/pt_BR/LC_MESSAGES/15924.mo differ
diff --git a/messages/pt_BR/LC_MESSAGES/3166-1.mo b/messages/pt_BR/LC_MESSAGES/3166-1.mo
index 6917f788..4ce6a7a2 100644
Binary files a/messages/pt_BR/LC_MESSAGES/3166-1.mo and b/messages/pt_BR/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/pt_BR/LC_MESSAGES/3166-1.po b/messages/pt_BR/LC_MESSAGES/3166-1.po
index 332b01e3..6a654418 100644
--- a/messages/pt_BR/LC_MESSAGES/3166-1.po
+++ b/messages/pt_BR/LC_MESSAGES/3166-1.po
@@ -1,6 +1,10 @@
-# Brazilian Portuguese translations of ISO 3166 (place names)
-# Copyright (C) 2017 the package authors.
+# Translation of ISO 3166-1 to Brazilian Portuguese
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Alastair McKinstry <mckinstry@computer.org>, 2002
 # Lisiane Sztoltz <lisiane@conectiva.com.br>
 # Leonardo Ferreira Fontenelle <leonardof@gnome.org>, 2006-2009.
diff --git a/messages/pt_BR/LC_MESSAGES/3166-3.mo b/messages/pt_BR/LC_MESSAGES/3166-3.mo
index 6860c4fc..f1747f0e 100644
Binary files a/messages/pt_BR/LC_MESSAGES/3166-3.mo and b/messages/pt_BR/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/pt_BR/LC_MESSAGES/4217.mo b/messages/pt_BR/LC_MESSAGES/4217.mo
index d8357881..615936a6 100644
Binary files a/messages/pt_BR/LC_MESSAGES/4217.mo and b/messages/pt_BR/LC_MESSAGES/4217.mo differ
diff --git a/messages/pt_BR/LC_MESSAGES/639-2.mo b/messages/pt_BR/LC_MESSAGES/639-2.mo
index b184fc7d..6a7f4c78 100644
Binary files a/messages/pt_BR/LC_MESSAGES/639-2.mo and b/messages/pt_BR/LC_MESSAGES/639-2.mo differ
diff --git a/messages/pt_BR/LC_MESSAGES/639-2.po b/messages/pt_BR/LC_MESSAGES/639-2.po
index 51974058..b9af820d 100644
--- a/messages/pt_BR/LC_MESSAGES/639-2.po
+++ b/messages/pt_BR/LC_MESSAGES/639-2.po
@@ -1,13 +1,13 @@
-# Translation of ISO-639 (language names) to Brazilian Portuguese
+# Translation of ISO 639-2 to Brazilian Portuguese
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2000
-#   Juan Carlos Castro y Castro <jcastro@vialink.com.br>, 2000,2005.
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Leonardo Ferreira Fontenelle <leonardof@gnome.org>, 2007-2009.
-#
+# Copyright ©
+# Juan Carlos Castro y Castro <jcastro@vialink.com.br>, 2000,2005.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Leonardo Ferreira Fontenelle <leonardof@gnome.org>, 2007-2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/pt_BR/LC_MESSAGES/639-3.mo b/messages/pt_BR/LC_MESSAGES/639-3.mo
index 7db9386e..bc36264e 100644
Binary files a/messages/pt_BR/LC_MESSAGES/639-3.mo and b/messages/pt_BR/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ro/LC_MESSAGES/15924.mo b/messages/ro/LC_MESSAGES/15924.mo
index 4244e8aa..3aa37ed2 100644
Binary files a/messages/ro/LC_MESSAGES/15924.mo and b/messages/ro/LC_MESSAGES/15924.mo differ
diff --git a/messages/ro/LC_MESSAGES/3166-1.mo b/messages/ro/LC_MESSAGES/3166-1.mo
index 5b90d403..53677f13 100644
Binary files a/messages/ro/LC_MESSAGES/3166-1.mo and b/messages/ro/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ro/LC_MESSAGES/3166-1.po b/messages/ro/LC_MESSAGES/3166-1.po
index 338ec5e0..30d04370 100644
--- a/messages/ro/LC_MESSAGES/3166-1.po
+++ b/messages/ro/LC_MESSAGES/3166-1.po
@@ -1,5 +1,10 @@
-# Translation of ISO-3166 (country names) to Romanian
+# Translation of ISO 3166-1 to Romanian; Moldavian; Moldovan
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Alastair McKinstry <mckinstry@debian.org>, 2004.
 # Eddy Petrișor <eddy.petrisor@gmail.com>, 2004, 2006, 2007, 2008, 2009.
 # Andrei Popescu <andreimpopescu@gmail.com>, 2010.
diff --git a/messages/ro/LC_MESSAGES/3166-2.mo b/messages/ro/LC_MESSAGES/3166-2.mo
index eb6519e9..43d1cdf1 100644
Binary files a/messages/ro/LC_MESSAGES/3166-2.mo and b/messages/ro/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/ro/LC_MESSAGES/3166-3.mo b/messages/ro/LC_MESSAGES/3166-3.mo
index 4d842016..57061be3 100644
Binary files a/messages/ro/LC_MESSAGES/3166-3.mo and b/messages/ro/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ro/LC_MESSAGES/4217.mo b/messages/ro/LC_MESSAGES/4217.mo
index 3fe3046d..dd3db0e0 100644
Binary files a/messages/ro/LC_MESSAGES/4217.mo and b/messages/ro/LC_MESSAGES/4217.mo differ
diff --git a/messages/ro/LC_MESSAGES/639-2.mo b/messages/ro/LC_MESSAGES/639-2.mo
index 02e77ef9..1e875973 100644
Binary files a/messages/ro/LC_MESSAGES/639-2.mo and b/messages/ro/LC_MESSAGES/639-2.mo differ
diff --git a/messages/ro/LC_MESSAGES/639-2.po b/messages/ro/LC_MESSAGES/639-2.po
index db98f4f6..f5e29c2a 100644
--- a/messages/ro/LC_MESSAGES/639-2.po
+++ b/messages/ro/LC_MESSAGES/639-2.po
@@ -1,7 +1,10 @@
-# Translation of ISO-639 (language names) to Romanian
+# Translation of ISO 639-2 to Romanian; Moldavian; Moldovan
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
-# Copyright (C)
-# Free Software Foundation, Inc., 2000, 2001
+#
+# Copyright ©
 # Mişu Moldovan <dumol@go.ro>, 2000, 2001.
 # Alastair McKinstry <mckinstry@debian.org>, 2004
 # Lucian Adrian Grijincu <lucian.grijincu@gmail.com>, 2009, 2010.
diff --git a/messages/ro/LC_MESSAGES/639-3.mo b/messages/ro/LC_MESSAGES/639-3.mo
index c7da05ab..9c69792a 100644
Binary files a/messages/ro/LC_MESSAGES/639-3.mo and b/messages/ro/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ru/LC_MESSAGES/15924.mo b/messages/ru/LC_MESSAGES/15924.mo
index 67491f2b..c08bb38c 100644
Binary files a/messages/ru/LC_MESSAGES/15924.mo and b/messages/ru/LC_MESSAGES/15924.mo differ
diff --git a/messages/ru/LC_MESSAGES/3166-1.mo b/messages/ru/LC_MESSAGES/3166-1.mo
index 72f5131b..fdcb5f39 100644
Binary files a/messages/ru/LC_MESSAGES/3166-1.mo and b/messages/ru/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ru/LC_MESSAGES/3166-1.po b/messages/ru/LC_MESSAGES/3166-1.po
index a574055e..4b0a4b27 100644
--- a/messages/ru/LC_MESSAGES/3166-1.po
+++ b/messages/ru/LC_MESSAGES/3166-1.po
@@ -1,9 +1,10 @@
-# translation of iso_3166-3.15.ru.po to Russian
-# Translation of ISO 3166 (country names) to Russian
+# Translation of ISO 3166-1 to Russian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-#
+# Copyright ©
 # Alastair McKinstry <mckinstry@debian.org>, 2004.
 # Nikolai Prokoschenko <nikolai@prokoschenko.de>, 2004.
 # Yuri Kozlov <yuray@komyakino.ru>, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015.
diff --git a/messages/ru/LC_MESSAGES/3166-3.mo b/messages/ru/LC_MESSAGES/3166-3.mo
index 8fd1fef7..e870b5a9 100644
Binary files a/messages/ru/LC_MESSAGES/3166-3.mo and b/messages/ru/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ru/LC_MESSAGES/4217.mo b/messages/ru/LC_MESSAGES/4217.mo
index 781b40e1..9d55ef57 100644
Binary files a/messages/ru/LC_MESSAGES/4217.mo and b/messages/ru/LC_MESSAGES/4217.mo differ
diff --git a/messages/ru/LC_MESSAGES/639-2.mo b/messages/ru/LC_MESSAGES/639-2.mo
index cd48c413..513371bb 100644
Binary files a/messages/ru/LC_MESSAGES/639-2.mo and b/messages/ru/LC_MESSAGES/639-2.mo differ
diff --git a/messages/ru/LC_MESSAGES/639-2.po b/messages/ru/LC_MESSAGES/639-2.po
index fa9f43da..dccadb8f 100644
--- a/messages/ru/LC_MESSAGES/639-2.po
+++ b/messages/ru/LC_MESSAGES/639-2.po
@@ -1,10 +1,10 @@
-# translation of iso_639-3.15.ru.po to Russian
-# Translation of ISO-639 (language names) to Russian
+# Translation of ISO 639-2 to Russian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#
+# Notes:
 # GOST 7.75-97
 # http://www.bibliography.ru/method/gosts/7-75/7_75.htm
 # http://etheo.h10.ru/iran01.htm
@@ -12,6 +12,7 @@
 # http://www.rba.ru/rusmarc/2_red/supa/supa21.htm
 # http://www.rba.ru/rusmarc/2_red/supa/supa22.htm
 #
+# Copyright ©
 # Nikolai Prokoschenko <nikolai@prokoschenko.de>, 2004.
 # Mikhail Zabaluev <mhz@altlinux.org>, 2006.
 # Yuri Kozlov <yuray@komyakino.ru>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013.
diff --git a/messages/ru/LC_MESSAGES/639-3.mo b/messages/ru/LC_MESSAGES/639-3.mo
index daa2fcd3..e3188caf 100644
Binary files a/messages/ru/LC_MESSAGES/639-3.mo and b/messages/ru/LC_MESSAGES/639-3.mo differ
diff --git a/messages/rw/LC_MESSAGES/3166-1.mo b/messages/rw/LC_MESSAGES/3166-1.mo
index 03dc9b66..6f0e55cb 100644
Binary files a/messages/rw/LC_MESSAGES/3166-1.mo and b/messages/rw/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/rw/LC_MESSAGES/3166-1.po b/messages/rw/LC_MESSAGES/3166-1.po
index 5d3df0a1..9d27b0f7 100644
--- a/messages/rw/LC_MESSAGES/3166-1.po
+++ b/messages/rw/LC_MESSAGES/3166-1.po
@@ -1,9 +1,11 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2004
+# Translation of ISO 3166-1 to Kinyarwanda
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
-# Viateur MUGENZI <muvia@hotmail.com>, 2004.
 #
-# #  Note: Steve Murphy is not a translator-- he is a technical coordinator
+# Copyright ©
+# Viateur MUGENZI <muvia@hotmail.com>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/rw/LC_MESSAGES/3166-3.mo b/messages/rw/LC_MESSAGES/3166-3.mo
index 55e4318e..82622430 100644
Binary files a/messages/rw/LC_MESSAGES/3166-3.mo and b/messages/rw/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/rw/LC_MESSAGES/4217.mo b/messages/rw/LC_MESSAGES/4217.mo
index 93f9b1ae..c17a4511 100644
Binary files a/messages/rw/LC_MESSAGES/4217.mo and b/messages/rw/LC_MESSAGES/4217.mo differ
diff --git a/messages/rw/LC_MESSAGES/639-2.mo b/messages/rw/LC_MESSAGES/639-2.mo
index 7636633b..c34a4c3d 100644
Binary files a/messages/rw/LC_MESSAGES/639-2.mo and b/messages/rw/LC_MESSAGES/639-2.mo differ
diff --git a/messages/rw/LC_MESSAGES/639-2.po b/messages/rw/LC_MESSAGES/639-2.po
index ce7b943c..38bb958f 100644
--- a/messages/rw/LC_MESSAGES/639-2.po
+++ b/messages/rw/LC_MESSAGES/639-2.po
@@ -1,12 +1,11 @@
-# Translation of ISO-639 (language names) to Kinyarwanda
+# Translation of ISO 639-2 to Kinyarwanda
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Viateur MUGENZI <muvia@hotmail.com>, 2004.
-#
-# Note: Steve Murphy is not a translator-- he is a technical coordinator
-#
+# Copyright ©
+# Viateur MUGENZI <muvia@hotmail.com>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/rw/LC_MESSAGES/639-3.mo b/messages/rw/LC_MESSAGES/639-3.mo
index 4df89854..d99c47c2 100644
Binary files a/messages/rw/LC_MESSAGES/639-3.mo and b/messages/rw/LC_MESSAGES/639-3.mo differ
diff --git a/messages/sc/LC_MESSAGES/3166-1.mo b/messages/sc/LC_MESSAGES/3166-1.mo
index 2b686524..2872503c 100644
Binary files a/messages/sc/LC_MESSAGES/3166-1.mo and b/messages/sc/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/sc/LC_MESSAGES/3166-1.po b/messages/sc/LC_MESSAGES/3166-1.po
index 3f01c0ee..42dca655 100644
--- a/messages/sc/LC_MESSAGES/3166-1.po
+++ b/messages/sc/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Sardinian
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/sd/LC_MESSAGES/3166-1.mo b/messages/sd/LC_MESSAGES/3166-1.mo
index 0d6d22df..d48a1b97 100644
Binary files a/messages/sd/LC_MESSAGES/3166-1.mo and b/messages/sd/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/sd/LC_MESSAGES/3166-1.po b/messages/sd/LC_MESSAGES/3166-1.po
index 5b008fb8..e73c8ad1 100644
--- a/messages/sd/LC_MESSAGES/3166-1.po
+++ b/messages/sd/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Sindhi
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/si/LC_MESSAGES/3166-1.mo b/messages/si/LC_MESSAGES/3166-1.mo
index 870d8acb..e0464ba2 100644
Binary files a/messages/si/LC_MESSAGES/3166-1.mo and b/messages/si/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/si/LC_MESSAGES/3166-1.po b/messages/si/LC_MESSAGES/3166-1.po
index 7bd6f710..ae44c571 100644
--- a/messages/si/LC_MESSAGES/3166-1.po
+++ b/messages/si/LC_MESSAGES/3166-1.po
@@ -1,9 +1,10 @@
-# Translation of ISO 3166 (country names) to Sinhala
+# Translation of ISO 3166-1 to Sinhala; Sinhalese
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-#
 # Danishka Navin <danishka@gmail.com>, 2011.
 msgid ""
 msgstr ""
diff --git a/messages/si/LC_MESSAGES/3166-3.mo b/messages/si/LC_MESSAGES/3166-3.mo
index 3e490cd7..834727f1 100644
Binary files a/messages/si/LC_MESSAGES/3166-3.mo and b/messages/si/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/sk/LC_MESSAGES/15924.mo b/messages/sk/LC_MESSAGES/15924.mo
index 48058f35..c61f95b8 100644
Binary files a/messages/sk/LC_MESSAGES/15924.mo and b/messages/sk/LC_MESSAGES/15924.mo differ
diff --git a/messages/sk/LC_MESSAGES/3166-1.mo b/messages/sk/LC_MESSAGES/3166-1.mo
index 7e967103..29d1fc0b 100644
Binary files a/messages/sk/LC_MESSAGES/3166-1.mo and b/messages/sk/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/sk/LC_MESSAGES/3166-1.po b/messages/sk/LC_MESSAGES/3166-1.po
old mode 100755
new mode 100644
index a77f9dc2..464db72a
--- a/messages/sk/LC_MESSAGES/3166-1.po
+++ b/messages/sk/LC_MESSAGES/3166-1.po
@@ -1,15 +1,19 @@
-# Translation of ISO-3166 (country names) to Slovak
+# Translation of ISO 3166-1 to Slovak
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
-# Copyright (C)
-# Free Software Foundation, Inc., 2004
+#
+# Notes:
+# source:
+# http://www.geodesy.gov.sk
+# http://www.fao.org/ (historic names)
+#
+# Copyright ©
 # Peter Mann <Peter.Mann@tuke.sk>, 2004, 2006.
 # Pavol Cvengros <orpheus@hq.alert.sk>, 2001.
-# (translations from drakfw)
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
 # Ivan Masár <helix84@centrum.sk>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2017.
-# source:
-# http://www.geodesy.gov.sk
-# http://www.fao.org/ (historic names)
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/sk/LC_MESSAGES/3166-2.mo b/messages/sk/LC_MESSAGES/3166-2.mo
index 40691c9a..9256f5cc 100644
Binary files a/messages/sk/LC_MESSAGES/3166-2.mo and b/messages/sk/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/sk/LC_MESSAGES/3166-3.mo b/messages/sk/LC_MESSAGES/3166-3.mo
index 1936a73c..b32d82b6 100644
Binary files a/messages/sk/LC_MESSAGES/3166-3.mo and b/messages/sk/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/sk/LC_MESSAGES/4217.mo b/messages/sk/LC_MESSAGES/4217.mo
index 54c32ac6..044e4406 100644
Binary files a/messages/sk/LC_MESSAGES/4217.mo and b/messages/sk/LC_MESSAGES/4217.mo differ
diff --git a/messages/sk/LC_MESSAGES/639-2.mo b/messages/sk/LC_MESSAGES/639-2.mo
index ab7758b2..c1e66fa4 100644
Binary files a/messages/sk/LC_MESSAGES/639-2.mo and b/messages/sk/LC_MESSAGES/639-2.mo differ
diff --git a/messages/sk/LC_MESSAGES/639-2.po b/messages/sk/LC_MESSAGES/639-2.po
old mode 100755
new mode 100644
index f622e5eb..9eb07b7d
--- a/messages/sk/LC_MESSAGES/639-2.po
+++ b/messages/sk/LC_MESSAGES/639-2.po
@@ -1,7 +1,11 @@
-# Slovak translations of ISO 639 Language names
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Slovak
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
+# This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Alastair McKinstry <mckinstry@computer.org>, 2002.
-# translation:
 # Ivan Masár <helix84@centrum.sk>, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2017.
 # bronto, 2007.
 msgid ""
diff --git a/messages/sk/LC_MESSAGES/639-3.mo b/messages/sk/LC_MESSAGES/639-3.mo
index 984ccbbb..8163790f 100644
Binary files a/messages/sk/LC_MESSAGES/639-3.mo and b/messages/sk/LC_MESSAGES/639-3.mo differ
diff --git a/messages/sl/LC_MESSAGES/15924.mo b/messages/sl/LC_MESSAGES/15924.mo
index dda474d4..e5a38fa3 100644
Binary files a/messages/sl/LC_MESSAGES/15924.mo and b/messages/sl/LC_MESSAGES/15924.mo differ
diff --git a/messages/sl/LC_MESSAGES/3166-1.mo b/messages/sl/LC_MESSAGES/3166-1.mo
index d4279ee8..c88666b9 100644
Binary files a/messages/sl/LC_MESSAGES/3166-1.mo and b/messages/sl/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/sl/LC_MESSAGES/3166-1.po b/messages/sl/LC_MESSAGES/3166-1.po
index 0258c691..7d499179 100644
--- a/messages/sl/LC_MESSAGES/3166-1.po
+++ b/messages/sl/LC_MESSAGES/3166-1.po
@@ -1,12 +1,13 @@
-# Slovenian translations of ISO 3166 country names
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+# Translation of ISO 3166-1 to Slovenian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Alastair McKinstry <mckinstry@computer.org>, 2002.
-# Translations from KDE:
 # Roman Maurer <roman.maurer@amis.net>, 2002.
 # Primož Peterlin <primozz.peterlin@gmail.com>, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
-#
-# $Id: iso_3166-3.49.sl.po,v 1.2 2013/12/09 21:22:05 peterlin Exp $
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/sl/LC_MESSAGES/3166-2.mo b/messages/sl/LC_MESSAGES/3166-2.mo
index 17ea42c1..e29376c0 100644
Binary files a/messages/sl/LC_MESSAGES/3166-2.mo and b/messages/sl/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/sl/LC_MESSAGES/3166-3.mo b/messages/sl/LC_MESSAGES/3166-3.mo
index 02324c4e..89006b63 100644
Binary files a/messages/sl/LC_MESSAGES/3166-3.mo and b/messages/sl/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/sl/LC_MESSAGES/4217.mo b/messages/sl/LC_MESSAGES/4217.mo
index 60405c19..37ad87e8 100644
Binary files a/messages/sl/LC_MESSAGES/4217.mo and b/messages/sl/LC_MESSAGES/4217.mo differ
diff --git a/messages/sl/LC_MESSAGES/639-2.mo b/messages/sl/LC_MESSAGES/639-2.mo
index 0161dab7..57676001 100644
Binary files a/messages/sl/LC_MESSAGES/639-2.mo and b/messages/sl/LC_MESSAGES/639-2.mo differ
diff --git a/messages/sl/LC_MESSAGES/639-2.po b/messages/sl/LC_MESSAGES/639-2.po
index 955fd6e6..94199ded 100644
--- a/messages/sl/LC_MESSAGES/639-2.po
+++ b/messages/sl/LC_MESSAGES/639-2.po
@@ -1,10 +1,13 @@
-# -*- mode:po; coding:utf-8; -*- Slovenian translation for ISO 639 language names
-# Copyright (C) 2000, 2005, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Slovenian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Andraz Tori <andraz.tori1@@guest.arnes.si> 2000.
 # Alastair McKinstry, <mckinstry@@computer.org>, 2001.
 # Primož Peterlin <primozz.peterlin@gmail.com> 2005, 2009, 2010, 2011, 2013.
-# $Id: iso_639-3.41.sl.po,v 1.2 2013/03/09 12:36:42 peterlin Exp $
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/sl/LC_MESSAGES/639-3.mo b/messages/sl/LC_MESSAGES/639-3.mo
index a5f1d8f0..5b128725 100644
Binary files a/messages/sl/LC_MESSAGES/639-3.mo and b/messages/sl/LC_MESSAGES/639-3.mo differ
diff --git a/messages/so/LC_MESSAGES/3166-1.mo b/messages/so/LC_MESSAGES/3166-1.mo
index 61221828..d6f73f66 100644
Binary files a/messages/so/LC_MESSAGES/3166-1.mo and b/messages/so/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/so/LC_MESSAGES/3166-1.po b/messages/so/LC_MESSAGES/3166-1.po
index 757edd3f..3c711b91 100644
--- a/messages/so/LC_MESSAGES/3166-1.po
+++ b/messages/so/LC_MESSAGES/3166-1.po
@@ -1,15 +1,13 @@
-# Translation of ISO-3166 (country names) to Somali
+# Translation of ISO 3166-1 to Somali
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry, <mckinstry@debian.org>, 2004.
-#   Data taken from ICU-2.8:
-#   - Daniel Yacob <yacob@geez.org>, Ge'ez Frontier Foundation
-#   - Mohamed Diriye Abdullahi <diriyeam@magellan.umontreal.ca>, 2004
-#   - Department of Linguistics and Translation, Universite de Montreal, Montreal
-#
-#
+# Copyright ©
+# Alastair McKinstry, <mckinstry@debian.org>, 2004.
+# Daniel Yacob <yacob@geez.org>
+# Mohamed Diriye Abdullahi <diriyeam@magellan.umontreal.ca>, 2004
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/so/LC_MESSAGES/3166-3.mo b/messages/so/LC_MESSAGES/3166-3.mo
index 38528f30..271bb6bc 100644
Binary files a/messages/so/LC_MESSAGES/3166-3.mo and b/messages/so/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/son/LC_MESSAGES/3166-1.mo b/messages/son/LC_MESSAGES/3166-1.mo
index 5cf8f8c1..75433535 100644
Binary files a/messages/son/LC_MESSAGES/3166-1.mo and b/messages/son/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/son/LC_MESSAGES/3166-1.po b/messages/son/LC_MESSAGES/3166-1.po
index 9582b746..17041e95 100644
--- a/messages/son/LC_MESSAGES/3166-1.po
+++ b/messages/son/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Songhai languages
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/sq/LC_MESSAGES/3166-1.mo b/messages/sq/LC_MESSAGES/3166-1.mo
index cb1635e3..35aead2a 100644
Binary files a/messages/sq/LC_MESSAGES/3166-1.mo and b/messages/sq/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/sq/LC_MESSAGES/3166-1.po b/messages/sq/LC_MESSAGES/3166-1.po
index 533558d9..c6a4be1e 100644
--- a/messages/sq/LC_MESSAGES/3166-1.po
+++ b/messages/sq/LC_MESSAGES/3166-1.po
@@ -1,10 +1,12 @@
-# Translation of ISO-3166 (country names) to Albanian
+# Translation of ISO 3166-1 to Albanian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004
-#   Elian Myftiu <elian.myftiu@gmail.com>, 2004,2006.
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004
+# Elian Myftiu <elian.myftiu@gmail.com>, 2004,2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/sq/LC_MESSAGES/3166-3.mo b/messages/sq/LC_MESSAGES/3166-3.mo
index 8368c8dc..0051e8d1 100644
Binary files a/messages/sq/LC_MESSAGES/3166-3.mo and b/messages/sq/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/sr/LC_MESSAGES/15924.mo b/messages/sr/LC_MESSAGES/15924.mo
index 60b817c0..1714f466 100644
Binary files a/messages/sr/LC_MESSAGES/15924.mo and b/messages/sr/LC_MESSAGES/15924.mo differ
diff --git a/messages/sr/LC_MESSAGES/3166-1.mo b/messages/sr/LC_MESSAGES/3166-1.mo
index 658498b3..a95221b8 100644
Binary files a/messages/sr/LC_MESSAGES/3166-1.mo and b/messages/sr/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/sr/LC_MESSAGES/3166-1.po b/messages/sr/LC_MESSAGES/3166-1.po
index 14314ddc..c98351d1 100644
--- a/messages/sr/LC_MESSAGES/3166-1.po
+++ b/messages/sr/LC_MESSAGES/3166-1.po
@@ -1,6 +1,10 @@
-# Translation of ISO 3166 to Serbian.
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Translation of ISO 3166-1 to Serbian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Milos Komarcevic <kmilos@gmail.com>, Caslav Ilic <caslav.ilic@gmx.net>, 2009.
 # Aleksandar Jelenak <aleksandar.jelenak@gmail.com>, 2012.
 # Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014—2015.
diff --git a/messages/sr/LC_MESSAGES/3166-2.mo b/messages/sr/LC_MESSAGES/3166-2.mo
index ac477dbf..af12bf6f 100644
Binary files a/messages/sr/LC_MESSAGES/3166-2.mo and b/messages/sr/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/sr/LC_MESSAGES/3166-3.mo b/messages/sr/LC_MESSAGES/3166-3.mo
index 7c4f858f..7e30a46d 100644
Binary files a/messages/sr/LC_MESSAGES/3166-3.mo and b/messages/sr/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/sr/LC_MESSAGES/4217.mo b/messages/sr/LC_MESSAGES/4217.mo
index 34945fbb..5e409b07 100644
Binary files a/messages/sr/LC_MESSAGES/4217.mo and b/messages/sr/LC_MESSAGES/4217.mo differ
diff --git a/messages/sr/LC_MESSAGES/639-2.mo b/messages/sr/LC_MESSAGES/639-2.mo
index daca61ea..230e59d8 100644
Binary files a/messages/sr/LC_MESSAGES/639-2.mo and b/messages/sr/LC_MESSAGES/639-2.mo differ
diff --git a/messages/sr/LC_MESSAGES/639-2.po b/messages/sr/LC_MESSAGES/639-2.po
index 196feae8..3dfe93e4 100644
--- a/messages/sr/LC_MESSAGES/639-2.po
+++ b/messages/sr/LC_MESSAGES/639-2.po
@@ -1,6 +1,10 @@
-# Translation of ISO 639 to Serbian.
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Serbian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
 # Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
diff --git a/messages/sr/LC_MESSAGES/639-3.mo b/messages/sr/LC_MESSAGES/639-3.mo
index f456ed28..1baf6216 100644
Binary files a/messages/sr/LC_MESSAGES/639-3.mo and b/messages/sr/LC_MESSAGES/639-3.mo differ
diff --git a/messages/sr/LC_MESSAGES/639-5.mo b/messages/sr/LC_MESSAGES/639-5.mo
index 21b09283..4c633980 100644
Binary files a/messages/sr/LC_MESSAGES/639-5.mo and b/messages/sr/LC_MESSAGES/639-5.mo differ
diff --git a/messages/sr@latin/LC_MESSAGES/15924.mo b/messages/sr@latin/LC_MESSAGES/15924.mo
index bbe21ea0..327836f6 100644
Binary files a/messages/sr@latin/LC_MESSAGES/15924.mo and b/messages/sr@latin/LC_MESSAGES/15924.mo differ
diff --git a/messages/sr@latin/LC_MESSAGES/3166-1.mo b/messages/sr@latin/LC_MESSAGES/3166-1.mo
index f676afae..9acb378b 100644
Binary files a/messages/sr@latin/LC_MESSAGES/3166-1.mo and b/messages/sr@latin/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/sr@latin/LC_MESSAGES/3166-1.po b/messages/sr@latin/LC_MESSAGES/3166-1.po
index b3e28675..ed28dab1 100644
--- a/messages/sr@latin/LC_MESSAGES/3166-1.po
+++ b/messages/sr@latin/LC_MESSAGES/3166-1.po
@@ -1,6 +1,10 @@
-# Translation of ISO 3166 to Serbian.
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Translation of ISO 3166-1 to Serbian (Latin script)
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Milos Komarcevic <kmilos@gmail.com>, Caslav Ilic <caslav.ilic@gmx.net>, 2009.
 # Aleksandar Jelenak <aleksandar.jelenak@gmail.com>, 2012.
 # Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2014—2015.
diff --git a/messages/sr@latin/LC_MESSAGES/3166-2.mo b/messages/sr@latin/LC_MESSAGES/3166-2.mo
index e7c6a671..76b4bcf7 100644
Binary files a/messages/sr@latin/LC_MESSAGES/3166-2.mo and b/messages/sr@latin/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/sr@latin/LC_MESSAGES/3166-3.mo b/messages/sr@latin/LC_MESSAGES/3166-3.mo
index d2563b17..8ab8f1b0 100644
Binary files a/messages/sr@latin/LC_MESSAGES/3166-3.mo and b/messages/sr@latin/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/sr@latin/LC_MESSAGES/4217.mo b/messages/sr@latin/LC_MESSAGES/4217.mo
index 674c3239..2df386ad 100644
Binary files a/messages/sr@latin/LC_MESSAGES/4217.mo and b/messages/sr@latin/LC_MESSAGES/4217.mo differ
diff --git a/messages/sr@latin/LC_MESSAGES/639-2.mo b/messages/sr@latin/LC_MESSAGES/639-2.mo
index 2d4db625..d4632bc0 100644
Binary files a/messages/sr@latin/LC_MESSAGES/639-2.mo and b/messages/sr@latin/LC_MESSAGES/639-2.mo differ
diff --git a/messages/sr@latin/LC_MESSAGES/639-2.po b/messages/sr@latin/LC_MESSAGES/639-2.po
index 622b0dbd..33a62c32 100644
--- a/messages/sr@latin/LC_MESSAGES/639-2.po
+++ b/messages/sr@latin/LC_MESSAGES/639-2.po
@@ -1,6 +1,10 @@
-# Translation of ISO 639 to Serbian.
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Serbian (Latin script)
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
 # Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2014.
 msgid ""
diff --git a/messages/sr@latin/LC_MESSAGES/639-3.mo b/messages/sr@latin/LC_MESSAGES/639-3.mo
index 8df047e3..db69b3a3 100644
Binary files a/messages/sr@latin/LC_MESSAGES/639-3.mo and b/messages/sr@latin/LC_MESSAGES/639-3.mo differ
diff --git a/messages/sr@latin/LC_MESSAGES/639-5.mo b/messages/sr@latin/LC_MESSAGES/639-5.mo
index 0a11a2e2..4f70638b 100644
Binary files a/messages/sr@latin/LC_MESSAGES/639-5.mo and b/messages/sr@latin/LC_MESSAGES/639-5.mo differ
diff --git a/messages/sv/LC_MESSAGES/15924.mo b/messages/sv/LC_MESSAGES/15924.mo
index e522c538..c70b17be 100644
Binary files a/messages/sv/LC_MESSAGES/15924.mo and b/messages/sv/LC_MESSAGES/15924.mo differ
diff --git a/messages/sv/LC_MESSAGES/3166-1.mo b/messages/sv/LC_MESSAGES/3166-1.mo
index 5aa0731c..2098a353 100644
Binary files a/messages/sv/LC_MESSAGES/3166-1.mo and b/messages/sv/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/sv/LC_MESSAGES/3166-1.po b/messages/sv/LC_MESSAGES/3166-1.po
index 8e965f56..9e96b7c9 100644
--- a/messages/sv/LC_MESSAGES/3166-1.po
+++ b/messages/sv/LC_MESSAGES/3166-1.po
@@ -1,12 +1,14 @@
-# Swedish translations of ISO-3166 country names.
-# Copyright (C) 2001, 2003, 2004, 2007, 2011 Free Software Foundation, Inc.
+# Translation of ISO 3166-1 to Swedish
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Mattias Newzella <newzella@linux.nu, 2001.
-#  (translations from drakfw)
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
 # Christian Rose <menthos@menthos.com>, 2004.
 # Daniel Nylander <po@danielnylander.se>, 2007, 2011.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/sv/LC_MESSAGES/3166-2.mo b/messages/sv/LC_MESSAGES/3166-2.mo
index 469cdd01..b5427a9a 100644
Binary files a/messages/sv/LC_MESSAGES/3166-2.mo and b/messages/sv/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/sv/LC_MESSAGES/3166-3.mo b/messages/sv/LC_MESSAGES/3166-3.mo
index 5a827c12..2d320222 100644
Binary files a/messages/sv/LC_MESSAGES/3166-3.mo and b/messages/sv/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/sv/LC_MESSAGES/4217.mo b/messages/sv/LC_MESSAGES/4217.mo
index 291a9908..872fa4d4 100644
Binary files a/messages/sv/LC_MESSAGES/4217.mo and b/messages/sv/LC_MESSAGES/4217.mo differ
diff --git a/messages/sv/LC_MESSAGES/639-2.mo b/messages/sv/LC_MESSAGES/639-2.mo
index 59e8d822..27e44eed 100644
Binary files a/messages/sv/LC_MESSAGES/639-2.mo and b/messages/sv/LC_MESSAGES/639-2.mo differ
diff --git a/messages/sv/LC_MESSAGES/639-2.po b/messages/sv/LC_MESSAGES/639-2.po
index 28912225..0b2f5880 100644
--- a/messages/sv/LC_MESSAGES/639-2.po
+++ b/messages/sv/LC_MESSAGES/639-2.po
@@ -1,9 +1,10 @@
-# Swedish translation of ISO 639 language names.
-# Copyright © 2004, 2016, 2017 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Swedish
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
-# Christian Rose <menthos@menthos.com>, 2004.
-# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2016, 2017.
 #
+# Notes:
 # Many of these names are taken directly from
 # http://www.softwolves.pp.se/misc/spraklista.html, a page maintained by
 # Peter Karlsson <peter@softwolves.pp.se> which contains an extensive list of
@@ -12,7 +13,6 @@
 # Additionally, most Swedish language names are taken from
 # http://www.libris.kb.se/tjanster/katalogisering/formathandbok/sprakkoder.htm
 #
-#
 # Please note that many common language names in Swedish as a general rule
 # usually end in "ska". Nationality adjectives on the other hand usually end
 # in "sk". Please don't confuse the two.
@@ -26,6 +26,9 @@
 # But since this is a list, rather than language names used inside
 # sentences, these translated language names use capital initial letters.
 #
+# Copyright ©
+# Christian Rose <menthos@menthos.com>, 2004.
+# Anders Jonsson <anders.jonsson@norsjovallen.se>, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/sv/LC_MESSAGES/639-3.mo b/messages/sv/LC_MESSAGES/639-3.mo
index 298e0ef1..344a6b0b 100644
Binary files a/messages/sv/LC_MESSAGES/639-3.mo and b/messages/sv/LC_MESSAGES/639-3.mo differ
diff --git a/messages/sv/LC_MESSAGES/639-5.mo b/messages/sv/LC_MESSAGES/639-5.mo
index 1d6da200..a74fe46e 100644
Binary files a/messages/sv/LC_MESSAGES/639-5.mo and b/messages/sv/LC_MESSAGES/639-5.mo differ
diff --git a/messages/sw/LC_MESSAGES/3166-1.mo b/messages/sw/LC_MESSAGES/3166-1.mo
index 0f48cfa4..f936ff89 100644
Binary files a/messages/sw/LC_MESSAGES/3166-1.mo and b/messages/sw/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/sw/LC_MESSAGES/3166-1.po b/messages/sw/LC_MESSAGES/3166-1.po
index 0b65dd4e..10de8a91 100644
--- a/messages/sw/LC_MESSAGES/3166-1.po
+++ b/messages/sw/LC_MESSAGES/3166-1.po
@@ -1,10 +1,10 @@
-# translation of iso_3166-3.9.po to Swahili
-# Translation of ISO 3166 (country names) to LANGUAGE
+# Translation of ISO 3166-1 to Swahili
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-#
 # Muhsin Omar <mrfroasty@gmail.com>, 2009.
 msgid ""
 msgstr ""
diff --git a/messages/sw/LC_MESSAGES/3166-3.mo b/messages/sw/LC_MESSAGES/3166-3.mo
index 85934e85..6b101efd 100644
Binary files a/messages/sw/LC_MESSAGES/3166-3.mo and b/messages/sw/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ta/LC_MESSAGES/3166-1.mo b/messages/ta/LC_MESSAGES/3166-1.mo
index 7c7c8a2b..06c54932 100644
Binary files a/messages/ta/LC_MESSAGES/3166-1.mo and b/messages/ta/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ta/LC_MESSAGES/3166-1.po b/messages/ta/LC_MESSAGES/3166-1.po
index 5bd37e8b..05313880 100644
--- a/messages/ta/LC_MESSAGES/3166-1.po
+++ b/messages/ta/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# translation of iso-codes_iso_3166_ta.po to Tamil
-# Translation of ISO 3166 (country names) to Tamil
+# Translation of ISO 3166-1 to Tamil
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-#   Dr.T.Vasudevan <agnihot3@gmail.com>, 2007, 2008.
-# Copyright (C)
+# Copyright ©
+# Dr.T.Vasudevan <agnihot3@gmail.com>, 2007, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ta/LC_MESSAGES/3166-3.mo b/messages/ta/LC_MESSAGES/3166-3.mo
index f7b90c66..0835ff0a 100644
Binary files a/messages/ta/LC_MESSAGES/3166-3.mo and b/messages/ta/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ta/LC_MESSAGES/639-2.mo b/messages/ta/LC_MESSAGES/639-2.mo
index a973e0cd..e59316c2 100644
Binary files a/messages/ta/LC_MESSAGES/639-2.mo and b/messages/ta/LC_MESSAGES/639-2.mo differ
diff --git a/messages/ta/LC_MESSAGES/639-2.po b/messages/ta/LC_MESSAGES/639-2.po
index 9ec6454f..67a838d5 100644
--- a/messages/ta/LC_MESSAGES/639-2.po
+++ b/messages/ta/LC_MESSAGES/639-2.po
@@ -1,13 +1,11 @@
-# translation of iso_639-3.10.2.po to Tamil
-# translation of iso_639-3.10.2.ta.po to
-# translation of en_ZA.po to
-# Translation of ISO 639 (language names) to English (South Africa)
+# Translation of ISO 639-2 to Tamil
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#
-#   Dwayne Bailey <dwayne@translate.org.za>, 2009.
+# Copyright ©
+# Dwayne Bailey <dwayne@translate.org.za>, 2009.
 # I. Felix <ifelix25@gmail.com>, 2009.
 msgid ""
 msgstr ""
diff --git a/messages/ta/LC_MESSAGES/639-3.mo b/messages/ta/LC_MESSAGES/639-3.mo
index a9db8319..2ca6e673 100644
Binary files a/messages/ta/LC_MESSAGES/639-3.mo and b/messages/ta/LC_MESSAGES/639-3.mo differ
diff --git a/messages/te/LC_MESSAGES/3166-1.mo b/messages/te/LC_MESSAGES/3166-1.mo
index c27bb6d6..fd462797 100644
Binary files a/messages/te/LC_MESSAGES/3166-1.mo and b/messages/te/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/te/LC_MESSAGES/3166-1.po b/messages/te/LC_MESSAGES/3166-1.po
index 690fd2da..1dcc64fb 100644
--- a/messages/te/LC_MESSAGES/3166-1.po
+++ b/messages/te/LC_MESSAGES/3166-1.po
@@ -1,4 +1,6 @@
-# Translation of ISO 3166 (country names) to Telugu
+# Translation of ISO 3166-1 to Telugu
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
diff --git a/messages/te/LC_MESSAGES/3166-3.mo b/messages/te/LC_MESSAGES/3166-3.mo
index cafcc9aa..9c589f33 100644
Binary files a/messages/te/LC_MESSAGES/3166-3.mo and b/messages/te/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/te/LC_MESSAGES/639-2.mo b/messages/te/LC_MESSAGES/639-2.mo
index 6d69716a..7634e045 100644
Binary files a/messages/te/LC_MESSAGES/639-2.mo and b/messages/te/LC_MESSAGES/639-2.mo differ
diff --git a/messages/te/LC_MESSAGES/639-2.po b/messages/te/LC_MESSAGES/639-2.po
index c4cf57dd..0774cf74 100644
--- a/messages/te/LC_MESSAGES/639-2.po
+++ b/messages/te/LC_MESSAGES/639-2.po
@@ -1,4 +1,6 @@
-# Translation of ISO 639 (language names) to Telugu
+# Translation of ISO 639-2 to Telugu
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
diff --git a/messages/th/LC_MESSAGES/15924.mo b/messages/th/LC_MESSAGES/15924.mo
index 7781506d..43bc55d4 100644
Binary files a/messages/th/LC_MESSAGES/15924.mo and b/messages/th/LC_MESSAGES/15924.mo differ
diff --git a/messages/th/LC_MESSAGES/3166-1.mo b/messages/th/LC_MESSAGES/3166-1.mo
index 39d23197..4c27733b 100644
Binary files a/messages/th/LC_MESSAGES/3166-1.mo and b/messages/th/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/th/LC_MESSAGES/3166-1.po b/messages/th/LC_MESSAGES/3166-1.po
index 8db4d081..59b2809d 100644
--- a/messages/th/LC_MESSAGES/3166-1.po
+++ b/messages/th/LC_MESSAGES/3166-1.po
@@ -1,14 +1,13 @@
-# Translation of ISO-3166 (country names) to Thai
+# Translation of ISO 3166-1 to Thai
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002,2003
-#   Alastair McKinstry <mckinstry@computer.org>, 2002, 2004
-#   Translations from KDE:
-#   - Thanomsub Noppaburana <donga@midaassets.com>
-#   Theppitak Karoonboonyanan <theppitak@gmail.com>, 2005-2016
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002, 2004
+# Thanomsub Noppaburana <donga@midaassets.com>
+# Theppitak Karoonboonyanan <theppitak@gmail.com>, 2005-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/th/LC_MESSAGES/3166-2.mo b/messages/th/LC_MESSAGES/3166-2.mo
index 49d28a31..438e559a 100644
Binary files a/messages/th/LC_MESSAGES/3166-2.mo and b/messages/th/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/th/LC_MESSAGES/3166-3.mo b/messages/th/LC_MESSAGES/3166-3.mo
index d5fa1be4..dbbf1075 100644
Binary files a/messages/th/LC_MESSAGES/3166-3.mo and b/messages/th/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/th/LC_MESSAGES/4217.mo b/messages/th/LC_MESSAGES/4217.mo
index 2a420c2e..027fa734 100644
Binary files a/messages/th/LC_MESSAGES/4217.mo and b/messages/th/LC_MESSAGES/4217.mo differ
diff --git a/messages/th/LC_MESSAGES/639-2.mo b/messages/th/LC_MESSAGES/639-2.mo
index f36b30e2..029e2ae7 100644
Binary files a/messages/th/LC_MESSAGES/639-2.mo and b/messages/th/LC_MESSAGES/639-2.mo differ
diff --git a/messages/th/LC_MESSAGES/639-2.po b/messages/th/LC_MESSAGES/639-2.po
index f52d1121..aa681a41 100644
--- a/messages/th/LC_MESSAGES/639-2.po
+++ b/messages/th/LC_MESSAGES/639-2.po
@@ -1,13 +1,13 @@
-# Translation of ISO-639 (language names) to Thai
+# Translation of ISO 639-2 to Thai
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002-2015
-#   Alastair McKinstry <mckinstry@computer.org>, 2002
-#   Thanomsub Noppaburana <donga@midaassets.com> (Translations from KDE)
-#   Theppitak Karoonboonyanan <theppitak@gmail.com>, 2005-2015
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002
+# Thanomsub Noppaburana <donga@midaassets.com>
+# Theppitak Karoonboonyanan <theppitak@gmail.com>, 2005-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/th/LC_MESSAGES/639-3.mo b/messages/th/LC_MESSAGES/639-3.mo
index d2d0246e..ec615a45 100644
Binary files a/messages/th/LC_MESSAGES/639-3.mo and b/messages/th/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ti/LC_MESSAGES/3166-1.mo b/messages/ti/LC_MESSAGES/3166-1.mo
index a42a110f..bed0370a 100644
Binary files a/messages/ti/LC_MESSAGES/3166-1.mo and b/messages/ti/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ti/LC_MESSAGES/3166-1.po b/messages/ti/LC_MESSAGES/3166-1.po
index f3a53966..1d28e004 100644
--- a/messages/ti/LC_MESSAGES/3166-1.po
+++ b/messages/ti/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO-3166 (country names) to Tigrinya
+# Translation of ISO 3166-1 to Tigrinya
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ti/LC_MESSAGES/3166-3.mo b/messages/ti/LC_MESSAGES/3166-3.mo
index 9f41e29b..651477b2 100644
Binary files a/messages/ti/LC_MESSAGES/3166-3.mo and b/messages/ti/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ti/LC_MESSAGES/639-2.mo b/messages/ti/LC_MESSAGES/639-2.mo
index 125eefdc..84102a13 100644
Binary files a/messages/ti/LC_MESSAGES/639-2.mo and b/messages/ti/LC_MESSAGES/639-2.mo differ
diff --git a/messages/ti/LC_MESSAGES/639-2.po b/messages/ti/LC_MESSAGES/639-2.po
index c94098d4..c69f3430 100644
--- a/messages/ti/LC_MESSAGES/639-2.po
+++ b/messages/ti/LC_MESSAGES/639-2.po
@@ -1,10 +1,11 @@
-# Translation of ISO-639 (language names) to Tigrinya
+# Translation of ISO 639-2 to Tigrinya
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/ti/LC_MESSAGES/639-3.mo b/messages/ti/LC_MESSAGES/639-3.mo
index 6b730dfa..30b542a9 100644
Binary files a/messages/ti/LC_MESSAGES/639-3.mo and b/messages/ti/LC_MESSAGES/639-3.mo differ
diff --git a/messages/tig/LC_MESSAGES/3166-1.mo b/messages/tig/LC_MESSAGES/3166-1.mo
index e540583f..ca04a472 100644
Binary files a/messages/tig/LC_MESSAGES/3166-1.mo and b/messages/tig/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/tig/LC_MESSAGES/3166-1.po b/messages/tig/LC_MESSAGES/3166-1.po
index 6b1adf9e..aa3840be 100644
--- a/messages/tig/LC_MESSAGES/3166-1.po
+++ b/messages/tig/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO-3166 (country names) to Tigre
+# Translation of ISO 3166-1 to Tigre
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/tig/LC_MESSAGES/3166-3.mo b/messages/tig/LC_MESSAGES/3166-3.mo
index fe462a64..827a34d0 100644
Binary files a/messages/tig/LC_MESSAGES/3166-3.mo and b/messages/tig/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/tig/LC_MESSAGES/639-2.mo b/messages/tig/LC_MESSAGES/639-2.mo
index 87baccfb..059aa194 100644
Binary files a/messages/tig/LC_MESSAGES/639-2.mo and b/messages/tig/LC_MESSAGES/639-2.mo differ
diff --git a/messages/tig/LC_MESSAGES/639-2.po b/messages/tig/LC_MESSAGES/639-2.po
index 7e47a3f1..296b15fd 100644
--- a/messages/tig/LC_MESSAGES/639-2.po
+++ b/messages/tig/LC_MESSAGES/639-2.po
@@ -1,10 +1,11 @@
-# Translation of ISO-639 (language names) to Tigre
+# Translation of ISO 639-2 to Tigre
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/tig/LC_MESSAGES/639-3.mo b/messages/tig/LC_MESSAGES/639-3.mo
index ac62219f..e6e598c2 100644
Binary files a/messages/tig/LC_MESSAGES/639-3.mo and b/messages/tig/LC_MESSAGES/639-3.mo differ
diff --git a/messages/tk/LC_MESSAGES/3166-1.mo b/messages/tk/LC_MESSAGES/3166-1.mo
index 92e54689..8d07cad4 100644
Binary files a/messages/tk/LC_MESSAGES/3166-1.mo and b/messages/tk/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/tk/LC_MESSAGES/3166-1.po b/messages/tk/LC_MESSAGES/3166-1.po
index 5b7dd9cf..434be32f 100644
--- a/messages/tk/LC_MESSAGES/3166-1.po
+++ b/messages/tk/LC_MESSAGES/3166-1.po
@@ -1,12 +1,11 @@
-# Translation of ISO-3166 (country names) to Turkmen
+# Translation of ISO 3166-1 to Turkmen
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2004
-#   Kakilik Project <kakilik.sourceforge.net>, 2004
-#   Kakilik Group <kakilikgroup@yahoo.com>, 2004.
-#
+# Copyright ©
+# Kakilik Group <kakilikgroup@yahoo.com>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/tk/LC_MESSAGES/3166-3.mo b/messages/tk/LC_MESSAGES/3166-3.mo
index 0a0792fe..35ae9c5e 100644
Binary files a/messages/tk/LC_MESSAGES/3166-3.mo and b/messages/tk/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/tl/LC_MESSAGES/3166-1.mo b/messages/tl/LC_MESSAGES/3166-1.mo
index 09fe2567..d37fc7b5 100644
Binary files a/messages/tl/LC_MESSAGES/3166-1.mo and b/messages/tl/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/tl/LC_MESSAGES/3166-1.po b/messages/tl/LC_MESSAGES/3166-1.po
index d9fd0010..08a7b3aa 100644
--- a/messages/tl/LC_MESSAGES/3166-1.po
+++ b/messages/tl/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO-3166 (country names) to Tagalog
+# Translation of ISO 3166-1 to Tagalog
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Eric Pareja <xenos@upm.edu.ph> 2005,2006
-#
+# Copyright ©
+# Eric Pareja <xenos@upm.edu.ph> 2005,2006
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/tl/LC_MESSAGES/3166-3.mo b/messages/tl/LC_MESSAGES/3166-3.mo
index faddc9dc..725693d3 100644
Binary files a/messages/tl/LC_MESSAGES/3166-3.mo and b/messages/tl/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/tr/LC_MESSAGES/15924.mo b/messages/tr/LC_MESSAGES/15924.mo
index 04722c54..f7193101 100644
Binary files a/messages/tr/LC_MESSAGES/15924.mo and b/messages/tr/LC_MESSAGES/15924.mo differ
diff --git a/messages/tr/LC_MESSAGES/3166-1.mo b/messages/tr/LC_MESSAGES/3166-1.mo
index 2616b42f..6fbc3f3c 100644
Binary files a/messages/tr/LC_MESSAGES/3166-1.mo and b/messages/tr/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/tr/LC_MESSAGES/3166-1.po b/messages/tr/LC_MESSAGES/3166-1.po
index 1612c265..2602e7ec 100644
--- a/messages/tr/LC_MESSAGES/3166-1.po
+++ b/messages/tr/LC_MESSAGES/3166-1.po
@@ -1,18 +1,17 @@
-# Translation of ISO 3166 (country names) to Turkish
+# Translation of ISO 3166-1 to Turkish
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-#   Free Software Foundation, Inc., 2004.
-#   Nilgün Belma Bugüner <nilgun@fide.org>, 2001.
-#   Ömer Fadıl USTA <omer_fad@hotmail.com>, 1999.
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   (translations from drakfw)
-#   Recai Oktaş <roktas@omu.edu.tr>, 2004.
-#   Mert Dirik <mertdirik@gmail.com>, 2008.
-#   İsmail Baydan <ibaydan@gmail.com>, 2011.
-#   Atila KOÇ <koc@artielektronik.com.tr>, 2013-2015.
-#
+# Nilgün Belma Bugüner <nilgun@fide.org>, 2001.
+# Ömer Fadıl USTA <omer_fad@hotmail.com>, 1999.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Recai Oktaş <roktas@omu.edu.tr>, 2004.
+# Mert Dirik <mertdirik@gmail.com>, 2008.
+# İsmail Baydan <ibaydan@gmail.com>, 2011.
+# Atila KOÇ <koc@artielektronik.com.tr>, 2013-2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/tr/LC_MESSAGES/3166-2.mo b/messages/tr/LC_MESSAGES/3166-2.mo
index 39fbb798..bb3720d2 100644
Binary files a/messages/tr/LC_MESSAGES/3166-2.mo and b/messages/tr/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/tr/LC_MESSAGES/3166-3.mo b/messages/tr/LC_MESSAGES/3166-3.mo
index 636e0ce4..a6d21731 100644
Binary files a/messages/tr/LC_MESSAGES/3166-3.mo and b/messages/tr/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/tr/LC_MESSAGES/4217.mo b/messages/tr/LC_MESSAGES/4217.mo
index 43bdfaf5..e02dff02 100644
Binary files a/messages/tr/LC_MESSAGES/4217.mo and b/messages/tr/LC_MESSAGES/4217.mo differ
diff --git a/messages/tr/LC_MESSAGES/639-2.mo b/messages/tr/LC_MESSAGES/639-2.mo
index c837e74e..22843564 100644
Binary files a/messages/tr/LC_MESSAGES/639-2.mo and b/messages/tr/LC_MESSAGES/639-2.mo differ
diff --git a/messages/tr/LC_MESSAGES/639-2.po b/messages/tr/LC_MESSAGES/639-2.po
index e9de563a..bf5932ee 100644
--- a/messages/tr/LC_MESSAGES/639-2.po
+++ b/messages/tr/LC_MESSAGES/639-2.po
@@ -1,15 +1,15 @@
-# Translation of ISO-639 (language names) to Turkish.
+# Translation of ISO 639-2 to Turkish
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C) 2013
-#
-#   Free Software Foundation, Inc., 2000,2004.
-#   Fatih Demir <kabalak@gmx.net>, 2000.
-#   Kemal Yilmaz <kyilmaz@uekae.tubitak.gov.tr>, 2001.
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Volkan Gezer <volkangezer@gmail.com>, 2013.
-#   Dmitry Sivachenko <trtrmitya@gmail.com>, 2015.
+# Copyright ©
+# Fatih Demir <kabalak@gmx.net>, 2000.
+# Kemal Yilmaz <kyilmaz@uekae.tubitak.gov.tr>, 2001.
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
+# Volkan Gezer <volkangezer@gmail.com>, 2013.
+# Dmitry Sivachenko <trtrmitya@gmail.com>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/tr/LC_MESSAGES/639-3.mo b/messages/tr/LC_MESSAGES/639-3.mo
index 0cdb740a..296c0654 100644
Binary files a/messages/tr/LC_MESSAGES/639-3.mo and b/messages/tr/LC_MESSAGES/639-3.mo differ
diff --git a/messages/tt/LC_MESSAGES/3166-1.mo b/messages/tt/LC_MESSAGES/3166-1.mo
index 37a7a639..b23af05b 100644
Binary files a/messages/tt/LC_MESSAGES/3166-1.mo and b/messages/tt/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/tt/LC_MESSAGES/3166-1.po b/messages/tt/LC_MESSAGES/3166-1.po
index 59dcc50a..6e6d59cb 100644
--- a/messages/tt/LC_MESSAGES/3166-1.po
+++ b/messages/tt/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO-3166 (country names) to Tatar
+# Translation of ISO 3166-1 to Tatar
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Beznen Soft <tatarish.l10n@gmail.com>, 2005.
-#
+# Copyright ©
+# Beznen Soft <tatarish.l10n@gmail.com>, 2005.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/tt/LC_MESSAGES/3166-3.mo b/messages/tt/LC_MESSAGES/3166-3.mo
index 2e45c615..3543030d 100644
Binary files a/messages/tt/LC_MESSAGES/3166-3.mo and b/messages/tt/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/tt/LC_MESSAGES/639-2.mo b/messages/tt/LC_MESSAGES/639-2.mo
index c5bb7e07..6992fd14 100644
Binary files a/messages/tt/LC_MESSAGES/639-2.mo and b/messages/tt/LC_MESSAGES/639-2.mo differ
diff --git a/messages/tt/LC_MESSAGES/639-2.po b/messages/tt/LC_MESSAGES/639-2.po
index 0d8497c7..4038ed39 100644
--- a/messages/tt/LC_MESSAGES/639-2.po
+++ b/messages/tt/LC_MESSAGES/639-2.po
@@ -1,10 +1,11 @@
-# Translation of ISO-639 (language names) to Tatar
+# Translation of ISO 639-2 to Tatar
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/tt/LC_MESSAGES/639-3.mo b/messages/tt/LC_MESSAGES/639-3.mo
index 372a1571..ab367b47 100644
Binary files a/messages/tt/LC_MESSAGES/639-3.mo and b/messages/tt/LC_MESSAGES/639-3.mo differ
diff --git a/messages/tt@iqtelif/LC_MESSAGES/3166-1.mo b/messages/tt@iqtelif/LC_MESSAGES/3166-1.mo
index acfcac47..3c8521a4 100644
Binary files a/messages/tt@iqtelif/LC_MESSAGES/3166-1.mo and b/messages/tt@iqtelif/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/tt@iqtelif/LC_MESSAGES/3166-1.po b/messages/tt@iqtelif/LC_MESSAGES/3166-1.po
index d97fdc9a..7537d1e0 100644
--- a/messages/tt@iqtelif/LC_MESSAGES/3166-1.po
+++ b/messages/tt@iqtelif/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO-3166 (country names) to Tatar
+# Translation of ISO 3166-1 to Tatar (IQTElif script)
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Beznen Soft <tatarish.l10n@gmail.com>, 2005.
-#
+# Copyright ©
+# Beznen Soft <tatarish.l10n@gmail.com>, 2005.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/tt@iqtelif/LC_MESSAGES/3166-3.mo b/messages/tt@iqtelif/LC_MESSAGES/3166-3.mo
index 52b590df..c314f514 100644
Binary files a/messages/tt@iqtelif/LC_MESSAGES/3166-3.mo and b/messages/tt@iqtelif/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/tt@iqtelif/LC_MESSAGES/639-2.mo b/messages/tt@iqtelif/LC_MESSAGES/639-2.mo
index eaed5388..145dbabc 100644
Binary files a/messages/tt@iqtelif/LC_MESSAGES/639-2.mo and b/messages/tt@iqtelif/LC_MESSAGES/639-2.mo differ
diff --git a/messages/tt@iqtelif/LC_MESSAGES/639-2.po b/messages/tt@iqtelif/LC_MESSAGES/639-2.po
index 3b9eb441..779192b6 100644
--- a/messages/tt@iqtelif/LC_MESSAGES/639-2.po
+++ b/messages/tt@iqtelif/LC_MESSAGES/639-2.po
@@ -1,10 +1,11 @@
-# Translation of ISO-639 (language names) to Tatar
+# Translation of ISO 639-2 to Tatar (IQTElif script)
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/tt@iqtelif/LC_MESSAGES/639-3.mo b/messages/tt@iqtelif/LC_MESSAGES/639-3.mo
index ba95f4cd..e33d55ef 100644
Binary files a/messages/tt@iqtelif/LC_MESSAGES/639-3.mo and b/messages/tt@iqtelif/LC_MESSAGES/639-3.mo differ
diff --git a/messages/ug/LC_MESSAGES/3166-1.mo b/messages/ug/LC_MESSAGES/3166-1.mo
index e73fc09f..3149fbbf 100644
Binary files a/messages/ug/LC_MESSAGES/3166-1.mo and b/messages/ug/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ug/LC_MESSAGES/3166-1.po b/messages/ug/LC_MESSAGES/3166-1.po
index 95fa32d5..3d14df69 100644
--- a/messages/ug/LC_MESSAGES/3166-1.po
+++ b/messages/ug/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO 3166 (country names) to Uyghur
+# Translation of ISO 3166-1 to Uighur; Uyghur
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
 # Abduqadir Abliz <sahran.ug@gmail.com>, 2011.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ug/LC_MESSAGES/3166-3.mo b/messages/ug/LC_MESSAGES/3166-3.mo
index 6e5a024c..f0940778 100644
Binary files a/messages/ug/LC_MESSAGES/3166-3.mo and b/messages/ug/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/uk/LC_MESSAGES/15924.mo b/messages/uk/LC_MESSAGES/15924.mo
index d96b00c5..adbcebeb 100644
Binary files a/messages/uk/LC_MESSAGES/15924.mo and b/messages/uk/LC_MESSAGES/15924.mo differ
diff --git a/messages/uk/LC_MESSAGES/3166-1.mo b/messages/uk/LC_MESSAGES/3166-1.mo
index 82335203..86da40bd 100644
Binary files a/messages/uk/LC_MESSAGES/3166-1.mo and b/messages/uk/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/uk/LC_MESSAGES/3166-1.po b/messages/uk/LC_MESSAGES/3166-1.po
index a270828d..3f094700 100644
--- a/messages/uk/LC_MESSAGES/3166-1.po
+++ b/messages/uk/LC_MESSAGES/3166-1.po
@@ -1,9 +1,10 @@
-# Translation of ISO 3166 (country names) to Ukrainian
+# Translation of ISO 3166-1 to Ukrainian
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C) 2010 Free Software Foundation, Inc.
-#
+# Copyright ©
 # Yuri Chornoivan <yurchor@ukr.net>, 2010, 2011, 2012, 2013, 2015.
 # Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2010.
 msgid ""
diff --git a/messages/uk/LC_MESSAGES/3166-2.mo b/messages/uk/LC_MESSAGES/3166-2.mo
index 07b016bf..9ecbf046 100644
Binary files a/messages/uk/LC_MESSAGES/3166-2.mo and b/messages/uk/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/uk/LC_MESSAGES/3166-3.mo b/messages/uk/LC_MESSAGES/3166-3.mo
index 3ba3fee6..d3403c0b 100644
Binary files a/messages/uk/LC_MESSAGES/3166-3.mo and b/messages/uk/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/uk/LC_MESSAGES/4217.mo b/messages/uk/LC_MESSAGES/4217.mo
index a54cbf3b..3e06b29d 100644
Binary files a/messages/uk/LC_MESSAGES/4217.mo and b/messages/uk/LC_MESSAGES/4217.mo differ
diff --git a/messages/uk/LC_MESSAGES/639-2.mo b/messages/uk/LC_MESSAGES/639-2.mo
index 31fbe461..051dac6f 100644
Binary files a/messages/uk/LC_MESSAGES/639-2.mo and b/messages/uk/LC_MESSAGES/639-2.mo differ
diff --git a/messages/uk/LC_MESSAGES/639-2.po b/messages/uk/LC_MESSAGES/639-2.po
index a39447ba..845f4a10 100644
--- a/messages/uk/LC_MESSAGES/639-2.po
+++ b/messages/uk/LC_MESSAGES/639-2.po
@@ -1,9 +1,10 @@
-# Translation of ISO 639 (language names) to Ukrainian
+# Translation of ISO 639-2 to Ukrainian
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-#
 # Yuri Chornoivan <yurchor@ukr.net>, 2010, 2012, 2013, 2015.
 msgid ""
 msgstr ""
diff --git a/messages/uk/LC_MESSAGES/639-3.mo b/messages/uk/LC_MESSAGES/639-3.mo
index 33285fb4..9006806e 100644
Binary files a/messages/uk/LC_MESSAGES/639-3.mo and b/messages/uk/LC_MESSAGES/639-3.mo differ
diff --git a/messages/uk/LC_MESSAGES/639-5.mo b/messages/uk/LC_MESSAGES/639-5.mo
index ca06763d..e09f932a 100644
Binary files a/messages/uk/LC_MESSAGES/639-5.mo and b/messages/uk/LC_MESSAGES/639-5.mo differ
diff --git a/messages/ur/LC_MESSAGES/3166-1.mo b/messages/ur/LC_MESSAGES/3166-1.mo
index 504109ea..4c75df3e 100644
Binary files a/messages/ur/LC_MESSAGES/3166-1.mo and b/messages/ur/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ur/LC_MESSAGES/3166-1.po b/messages/ur/LC_MESSAGES/3166-1.po
index 791f3cf9..ba6ec0ab 100644
--- a/messages/ur/LC_MESSAGES/3166-1.po
+++ b/messages/ur/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Urdu
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/uz/LC_MESSAGES/3166-1.mo b/messages/uz/LC_MESSAGES/3166-1.mo
index aeed05ad..e1ed9fa6 100644
Binary files a/messages/uz/LC_MESSAGES/3166-1.mo and b/messages/uz/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/uz/LC_MESSAGES/3166-1.po b/messages/uz/LC_MESSAGES/3166-1.po
index f7c426f5..88e05019 100644
--- a/messages/uz/LC_MESSAGES/3166-1.po
+++ b/messages/uz/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Uzbek
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ve/LC_MESSAGES/3166-1.mo b/messages/ve/LC_MESSAGES/3166-1.mo
index a56f2c52..9e408fd7 100644
Binary files a/messages/ve/LC_MESSAGES/3166-1.mo and b/messages/ve/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/ve/LC_MESSAGES/3166-1.po b/messages/ve/LC_MESSAGES/3166-1.po
index c2232934..00baa3ca 100644
--- a/messages/ve/LC_MESSAGES/3166-1.po
+++ b/messages/ve/LC_MESSAGES/3166-1.po
@@ -1,12 +1,12 @@
-# Translation of ISO-3166 (country names) to Venda
+# Translation of ISO 3166-1 to Venda
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002
-#   Alastair McKinstry <mckinstry@computer.org>, 2003
-#   Fhatuwani Rambau <fhatuwani@translate.org.za>, 2002
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2003
+# Fhatuwani Rambau <fhatuwani@translate.org.za>, 2002
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/ve/LC_MESSAGES/3166-2.mo b/messages/ve/LC_MESSAGES/3166-2.mo
index 47291742..efdb9e28 100644
Binary files a/messages/ve/LC_MESSAGES/3166-2.mo and b/messages/ve/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/ve/LC_MESSAGES/3166-3.mo b/messages/ve/LC_MESSAGES/3166-3.mo
index d9d4ee3a..29268501 100644
Binary files a/messages/ve/LC_MESSAGES/3166-3.mo and b/messages/ve/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/ve/LC_MESSAGES/639-2.mo b/messages/ve/LC_MESSAGES/639-2.mo
index 4354f11b..5784d0fc 100644
Binary files a/messages/ve/LC_MESSAGES/639-2.mo and b/messages/ve/LC_MESSAGES/639-2.mo differ
diff --git a/messages/ve/LC_MESSAGES/639-2.po b/messages/ve/LC_MESSAGES/639-2.po
index f913f132..4213623f 100644
--- a/messages/ve/LC_MESSAGES/639-2.po
+++ b/messages/ve/LC_MESSAGES/639-2.po
@@ -1,12 +1,11 @@
-# Translation of ISO-639 (language names) to Venda
+# Translation of ISO 639-2 to Venda
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2001
-#   Alastair McKinstry <mckinstry@computer.org>, 2001.
-#   Fhatuwani Rambau <fhatuwani@translate.org.za>, 2002,2003 (Translations from KDE)
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2001.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/ve/LC_MESSAGES/639-3.mo b/messages/ve/LC_MESSAGES/639-3.mo
index 6b714610..eccc78bf 100644
Binary files a/messages/ve/LC_MESSAGES/639-3.mo and b/messages/ve/LC_MESSAGES/639-3.mo differ
diff --git a/messages/vi/LC_MESSAGES/15924.mo b/messages/vi/LC_MESSAGES/15924.mo
index fa2db811..f979e89f 100644
Binary files a/messages/vi/LC_MESSAGES/15924.mo and b/messages/vi/LC_MESSAGES/15924.mo differ
diff --git a/messages/vi/LC_MESSAGES/3166-1.mo b/messages/vi/LC_MESSAGES/3166-1.mo
index 794eb0a0..19f973b8 100644
Binary files a/messages/vi/LC_MESSAGES/3166-1.mo and b/messages/vi/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/vi/LC_MESSAGES/3166-1.po b/messages/vi/LC_MESSAGES/3166-1.po
index fd6f76c8..98f8af89 100644
--- a/messages/vi/LC_MESSAGES/3166-1.po
+++ b/messages/vi/LC_MESSAGES/3166-1.po
@@ -1,10 +1,13 @@
-# Vietnamese translation for iso_3166.
-# Copyright © 2009 Free Software Foundation, Inc.
+# Translation of ISO 3166-1 to Vietnamese
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Nguyễn Hùng Vũ <vuhung16@bigfoot.com>
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2009.
 # Hoang Nguyen <Minhhoang1004@gmail.com>, 2012.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/vi/LC_MESSAGES/3166-2.mo b/messages/vi/LC_MESSAGES/3166-2.mo
index 58d1581e..3490bfa6 100644
Binary files a/messages/vi/LC_MESSAGES/3166-2.mo and b/messages/vi/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/vi/LC_MESSAGES/3166-3.mo b/messages/vi/LC_MESSAGES/3166-3.mo
index 5bddde19..6b34721f 100644
Binary files a/messages/vi/LC_MESSAGES/3166-3.mo and b/messages/vi/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/vi/LC_MESSAGES/4217.mo b/messages/vi/LC_MESSAGES/4217.mo
index 9b4c086e..3dc1ba30 100644
Binary files a/messages/vi/LC_MESSAGES/4217.mo and b/messages/vi/LC_MESSAGES/4217.mo differ
diff --git a/messages/vi/LC_MESSAGES/639-2.mo b/messages/vi/LC_MESSAGES/639-2.mo
index 47ba1aa1..5408f83b 100644
Binary files a/messages/vi/LC_MESSAGES/639-2.mo and b/messages/vi/LC_MESSAGES/639-2.mo differ
diff --git a/messages/vi/LC_MESSAGES/639-2.po b/messages/vi/LC_MESSAGES/639-2.po
index 891fdaf4..26c82df9 100644
--- a/messages/vi/LC_MESSAGES/639-2.po
+++ b/messages/vi/LC_MESSAGES/639-2.po
@@ -1,9 +1,12 @@
-# Vietnamese translation for iso_639.
-# Copyright © 2009 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Vietnamese
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # Nguyễn Hùng Vũ <vuhung16@bigfoot.com>, 2001.
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2009.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/vi/LC_MESSAGES/639-3.mo b/messages/vi/LC_MESSAGES/639-3.mo
index 8ce29907..ba4a4bca 100644
Binary files a/messages/vi/LC_MESSAGES/639-3.mo and b/messages/vi/LC_MESSAGES/639-3.mo differ
diff --git a/messages/wa/LC_MESSAGES/3166-1.mo b/messages/wa/LC_MESSAGES/3166-1.mo
index 725f3931..81fcfa8d 100644
Binary files a/messages/wa/LC_MESSAGES/3166-1.mo and b/messages/wa/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/wa/LC_MESSAGES/3166-1.po b/messages/wa/LC_MESSAGES/3166-1.po
index eec5fd63..84cb6e89 100644
--- a/messages/wa/LC_MESSAGES/3166-1.po
+++ b/messages/wa/LC_MESSAGES/3166-1.po
@@ -1,8 +1,11 @@
-# Translation of `iso_3166_1' messages to Walloon.
+# Translation of ISO 3166-1 to Walloon
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
-# Copyright (C) 2004 Free Software Foundation, Inc.
-# Pablo Saratxaga <pablo@walon.org>, 2004,2012.
 #
+# Copyright ©
+# Pablo Saratxaga <pablo@walon.org>, 2004,2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/wa/LC_MESSAGES/3166-2.mo b/messages/wa/LC_MESSAGES/3166-2.mo
index 3e66b699..8d11113e 100644
Binary files a/messages/wa/LC_MESSAGES/3166-2.mo and b/messages/wa/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/wa/LC_MESSAGES/3166-3.mo b/messages/wa/LC_MESSAGES/3166-3.mo
index a26f0b92..9f2055f4 100644
Binary files a/messages/wa/LC_MESSAGES/3166-3.mo and b/messages/wa/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/wa/LC_MESSAGES/639-2.mo b/messages/wa/LC_MESSAGES/639-2.mo
index 40364c7c..cc298dce 100644
Binary files a/messages/wa/LC_MESSAGES/639-2.mo and b/messages/wa/LC_MESSAGES/639-2.mo differ
diff --git a/messages/wa/LC_MESSAGES/639-2.po b/messages/wa/LC_MESSAGES/639-2.po
index 709f506c..13819d39 100644
--- a/messages/wa/LC_MESSAGES/639-2.po
+++ b/messages/wa/LC_MESSAGES/639-2.po
@@ -1,10 +1,13 @@
-# Translation into the walloon language. of ISO 639 Language names
+# Translation of ISO 639-2 to Walloon
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Pablo Saratxaga <pablo@walon.org> 2001 (translations from galeon)
+#
+# Copyright ©
+# Pablo Saratxaga <pablo@walon.org>, 2001.
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
 # Pablo Saratxaga <pablo@walon.org>, 2004, 2007, 2012.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/wa/LC_MESSAGES/639-3.mo b/messages/wa/LC_MESSAGES/639-3.mo
index 2c6f1905..08295c9f 100644
Binary files a/messages/wa/LC_MESSAGES/639-3.mo and b/messages/wa/LC_MESSAGES/639-3.mo differ
diff --git a/messages/wal/LC_MESSAGES/3166-1.mo b/messages/wal/LC_MESSAGES/3166-1.mo
index 017d18fb..0a227156 100644
Binary files a/messages/wal/LC_MESSAGES/3166-1.mo and b/messages/wal/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/wal/LC_MESSAGES/3166-1.po b/messages/wal/LC_MESSAGES/3166-1.po
index 9e652d1a..2746d7ac 100644
--- a/messages/wal/LC_MESSAGES/3166-1.po
+++ b/messages/wal/LC_MESSAGES/3166-1.po
@@ -1,10 +1,11 @@
-# Translation of ISO-3166 (country names) to Walamo
+# Translation of ISO 3166-1 to Walamo
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Alastair McKinstry <mckinstry@debian.org>, 2004.
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@debian.org>, 2004.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/wal/LC_MESSAGES/3166-3.mo b/messages/wal/LC_MESSAGES/3166-3.mo
index 4ad22024..254d652f 100644
Binary files a/messages/wal/LC_MESSAGES/3166-3.mo and b/messages/wal/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/wo/LC_MESSAGES/3166-1.mo b/messages/wo/LC_MESSAGES/3166-1.mo
index 13460d43..1e2525a3 100644
Binary files a/messages/wo/LC_MESSAGES/3166-1.mo and b/messages/wo/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/wo/LC_MESSAGES/3166-1.po b/messages/wo/LC_MESSAGES/3166-1.po
index 477e711e..3c24f1b6 100644
--- a/messages/wo/LC_MESSAGES/3166-1.po
+++ b/messages/wo/LC_MESSAGES/3166-1.po
@@ -1,11 +1,11 @@
-# translation of wo.po to Wolof
-# Translation of ISO-3166 (country names) to Wolof
+# Translation of ISO 3166-1 to Wolof
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#
-#   Mouhamadou Mamoune Mbacke <mouhamadoumamoune@gmail.com>, 2005, 2006, 2007, 2008.
+# Copyright ©
+# Mouhamadou Mamoune Mbacke <mouhamadoumamoune@gmail.com>, 2005, 2006, 2007, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: wo\n"
diff --git a/messages/wo/LC_MESSAGES/3166-3.mo b/messages/wo/LC_MESSAGES/3166-3.mo
index 99834721..3c1ac02c 100644
Binary files a/messages/wo/LC_MESSAGES/3166-3.mo and b/messages/wo/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/xh/LC_MESSAGES/3166-1.mo b/messages/xh/LC_MESSAGES/3166-1.mo
index 98a8286c..86683a35 100644
Binary files a/messages/xh/LC_MESSAGES/3166-1.mo and b/messages/xh/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/xh/LC_MESSAGES/3166-1.po b/messages/xh/LC_MESSAGES/3166-1.po
index 69025301..4cef225a 100644
--- a/messages/xh/LC_MESSAGES/3166-1.po
+++ b/messages/xh/LC_MESSAGES/3166-1.po
@@ -1,14 +1,12 @@
-# Translation of ISO-3166 (country names) to Xhosa
+# Translation of ISO 3166-1 to Xhosa
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002,2003
-#   Alastair McKinstry <mckinstry@computer.org>, 2002.
-#   Translations from KDE:
-#   - Antoinette Dekeni <antoinette@translate.org.za>, 2002
-#
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002.
+# Antoinette Dekeni <antoinette@translate.org.za>, 2002
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/xh/LC_MESSAGES/3166-3.mo b/messages/xh/LC_MESSAGES/3166-3.mo
index a1b0435e..37717312 100644
Binary files a/messages/xh/LC_MESSAGES/3166-3.mo and b/messages/xh/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/xh/LC_MESSAGES/639-2.mo b/messages/xh/LC_MESSAGES/639-2.mo
index 83422f9a..5518f7d8 100644
Binary files a/messages/xh/LC_MESSAGES/639-2.mo and b/messages/xh/LC_MESSAGES/639-2.mo differ
diff --git a/messages/xh/LC_MESSAGES/639-2.po b/messages/xh/LC_MESSAGES/639-2.po
index 63c24f23..9b279d94 100644
--- a/messages/xh/LC_MESSAGES/639-2.po
+++ b/messages/xh/LC_MESSAGES/639-2.po
@@ -1,13 +1,12 @@
-# Translation of ISO-639 (language names) to Xhosa
+# Translation of ISO 639-2 to Xhosa
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002
-#   Alastair McKinstry <mckinstry@computer.org>, 2002
-#   Translations from KDE:
-#   Antoinette Dekeni <antoinette@translate.org.za>
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002
+# Antoinette Dekeni <antoinette@translate.org.za>
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/xh/LC_MESSAGES/639-3.mo b/messages/xh/LC_MESSAGES/639-3.mo
index 91fb4eef..bebfb7b0 100644
Binary files a/messages/xh/LC_MESSAGES/639-3.mo and b/messages/xh/LC_MESSAGES/639-3.mo differ
diff --git a/messages/yo/LC_MESSAGES/3166-1.mo b/messages/yo/LC_MESSAGES/3166-1.mo
index 92b62225..4450c8d4 100644
Binary files a/messages/yo/LC_MESSAGES/3166-1.mo and b/messages/yo/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/yo/LC_MESSAGES/3166-1.po b/messages/yo/LC_MESSAGES/3166-1.po
index b14ab4ed..b17c7e84 100644
--- a/messages/yo/LC_MESSAGES/3166-1.po
+++ b/messages/yo/LC_MESSAGES/3166-1.po
@@ -1,12 +1,10 @@
-# Translation of ISO 3166-1 to LANGUAGE
+# Translation of ISO 3166-1 to Yoruba
 # Codes for the representation of names of countries and their subdivisions
 # Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
 # Copyright ©
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/zh_CN/LC_MESSAGES/15924.mo b/messages/zh_CN/LC_MESSAGES/15924.mo
index 47dd0d63..5f6eff5f 100644
Binary files a/messages/zh_CN/LC_MESSAGES/15924.mo and b/messages/zh_CN/LC_MESSAGES/15924.mo differ
diff --git a/messages/zh_CN/LC_MESSAGES/3166-1.mo b/messages/zh_CN/LC_MESSAGES/3166-1.mo
index c4f71944..0a7dda40 100644
Binary files a/messages/zh_CN/LC_MESSAGES/3166-1.mo and b/messages/zh_CN/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/zh_CN/LC_MESSAGES/3166-1.po b/messages/zh_CN/LC_MESSAGES/3166-1.po
index 5e3e2ade..1606ff57 100644
--- a/messages/zh_CN/LC_MESSAGES/3166-1.po
+++ b/messages/zh_CN/LC_MESSAGES/3166-1.po
@@ -1,16 +1,15 @@
-# Translation of ISO-3166 (country names) to Simplified Chinese
+# Translation of ISO 3166-1 to Simplified Chinese
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002, 2003, 2007, 2008.
-#   Alastair McKinstry <mckinstry@computer.org>, 2002.
-#   Translations taken from KDE:
-#   - Wang Jian <lark@linux.net.cn>, 2000.
-#   - Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004 - 2006.
-#   LI Daobing <lidaobing@gmail.com>, 2007, 2008, 2009, 2010, 2011, 2013.
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002.
+# Wang Jian <lark@linux.net.cn>, 2000.
+# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004 - 2006.
+# LI Daobing <lidaobing@gmail.com>, 2007, 2008, 2009, 2010, 2011, 2013.
 # YunQiang Su <wzssyqa@gmail.com>, 2011.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/zh_CN/LC_MESSAGES/3166-2.mo b/messages/zh_CN/LC_MESSAGES/3166-2.mo
index 55365cae..4939a026 100644
Binary files a/messages/zh_CN/LC_MESSAGES/3166-2.mo and b/messages/zh_CN/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/zh_CN/LC_MESSAGES/3166-3.mo b/messages/zh_CN/LC_MESSAGES/3166-3.mo
index c5759420..168f1e7e 100644
Binary files a/messages/zh_CN/LC_MESSAGES/3166-3.mo and b/messages/zh_CN/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/zh_CN/LC_MESSAGES/4217.mo b/messages/zh_CN/LC_MESSAGES/4217.mo
index 47f3ebad..b683b681 100644
Binary files a/messages/zh_CN/LC_MESSAGES/4217.mo and b/messages/zh_CN/LC_MESSAGES/4217.mo differ
diff --git a/messages/zh_CN/LC_MESSAGES/639-2.mo b/messages/zh_CN/LC_MESSAGES/639-2.mo
index 993148df..470e766d 100644
Binary files a/messages/zh_CN/LC_MESSAGES/639-2.mo and b/messages/zh_CN/LC_MESSAGES/639-2.mo differ
diff --git a/messages/zh_CN/LC_MESSAGES/639-2.po b/messages/zh_CN/LC_MESSAGES/639-2.po
index 2a67a084..fbaf7014 100644
--- a/messages/zh_CN/LC_MESSAGES/639-2.po
+++ b/messages/zh_CN/LC_MESSAGES/639-2.po
@@ -1,12 +1,13 @@
-# Translation of ISO-639 (language names) to Simplified Chinese
+# Translation of ISO 639-2 to Simplified Chinese
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C) 2001, 2007, 2008 Free Software Foundation, Inc.
+# Copyright ©
 # LI Daobing <lidaobing@gmail.com>, 2007, 2008, 2009, 2010.
 # Mai Hao Hui <mhh@126.com>, 2001 (translations from galeon)
 # Alastair McKinstry <mckinstry@computer.org>, 2001
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/zh_CN/LC_MESSAGES/639-3.mo b/messages/zh_CN/LC_MESSAGES/639-3.mo
index 73e94c81..e467cbbc 100644
Binary files a/messages/zh_CN/LC_MESSAGES/639-3.mo and b/messages/zh_CN/LC_MESSAGES/639-3.mo differ
diff --git a/messages/zh_HK/LC_MESSAGES/15924.mo b/messages/zh_HK/LC_MESSAGES/15924.mo
index 81f2c323..05eae0b6 100644
Binary files a/messages/zh_HK/LC_MESSAGES/15924.mo and b/messages/zh_HK/LC_MESSAGES/15924.mo differ
diff --git a/messages/zh_HK/LC_MESSAGES/3166-1.mo b/messages/zh_HK/LC_MESSAGES/3166-1.mo
index a5306b00..b68ac711 100644
Binary files a/messages/zh_HK/LC_MESSAGES/3166-1.mo and b/messages/zh_HK/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/zh_HK/LC_MESSAGES/3166-1.po b/messages/zh_HK/LC_MESSAGES/3166-1.po
index e3e07123..7ca1fd5f 100644
--- a/messages/zh_HK/LC_MESSAGES/3166-1.po
+++ b/messages/zh_HK/LC_MESSAGES/3166-1.po
@@ -1,24 +1,22 @@
-# Translation of ISO-3166 (country names) to Chinese (Hong Kong)
+# Translation of ISO 3166-1 to Chinese (Hong Kong)
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
+# Notes:
 # Source of information:
 # 中國駐外使館
 #   http://www.immd.gov.hk/chtml/embassy.htm
 # 立法會參考資料摘要《商標條例》
 #   http://www.hkbu.edu.hk/~copyrigh/document/LegCo_Brief_full%20(Chin).pdf
 #
-#
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002,2003.
-#   Alastair McKinstry <mckinstry@computer.org>, 2002.
-#   Translations taken from KDE:
-#   - AceLan <acelan@kde.linux.org.tw> 2001
-#   - Kenduest Lee <kenduest@i18n.linux.org.tw> 2001
-#   Based on zh_TW translation of evolution:
-#   - Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005
-#   Abel Cheung <abelcheung@gmail.com>, 2006
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002.
+# AceLan <acelan@kde.linux.org.tw> 2001
+# Kenduest Lee <kenduest@i18n.linux.org.tw> 2001
+# Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005
+# Abel Cheung <abelcheung@gmail.com>, 2006
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/zh_HK/LC_MESSAGES/3166-3.mo b/messages/zh_HK/LC_MESSAGES/3166-3.mo
index 7a2594fe..ef296753 100644
Binary files a/messages/zh_HK/LC_MESSAGES/3166-3.mo and b/messages/zh_HK/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/zh_HK/LC_MESSAGES/4217.mo b/messages/zh_HK/LC_MESSAGES/4217.mo
index 91210bb9..8134abb4 100644
Binary files a/messages/zh_HK/LC_MESSAGES/4217.mo and b/messages/zh_HK/LC_MESSAGES/4217.mo differ
diff --git a/messages/zh_HK/LC_MESSAGES/639-2.mo b/messages/zh_HK/LC_MESSAGES/639-2.mo
index a53e6e37..04f74240 100644
Binary files a/messages/zh_HK/LC_MESSAGES/639-2.mo and b/messages/zh_HK/LC_MESSAGES/639-2.mo differ
diff --git a/messages/zh_HK/LC_MESSAGES/639-2.po b/messages/zh_HK/LC_MESSAGES/639-2.po
index 7a1ccbab..92d0ddae 100644
--- a/messages/zh_HK/LC_MESSAGES/639-2.po
+++ b/messages/zh_HK/LC_MESSAGES/639-2.po
@@ -1,16 +1,15 @@
-# Translation of ISO-639 (language names) to Chinese (Hong Kong)
+# Translation of ISO 639-2 to Chinese (Hong Kong)
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-#   Converted from coresponding translation in simplified Chinese, thanks to:
-#   LI Daobing <lidaobing@gmail.com>, 2007.
-#   Hominid He(viperii) <hominid@39.net>, 2007.
-#   Mai Hao Hui <mhh@126.com>, 2001 (translations from galeon)
-#   Alastair McKinstry <mckinstry@computer.org>, 2001
-#
-# Copyright (C) 2001, 2007 Free Software Foundation, Inc.
+# Copyright ©
+# LI Daobing <lidaobing@gmail.com>, 2007.
+# Hominid He(viperii) <hominid@39.net>, 2007.
+# Mai Hao Hui <mhh@126.com>, 2001.
+# Alastair McKinstry <mckinstry@computer.org>, 2001
 # Abel Cheung <abelcheung@gmail.com>, 2007.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/zh_TW/LC_MESSAGES/15924.mo b/messages/zh_TW/LC_MESSAGES/15924.mo
index 2089da54..dfb46c52 100644
Binary files a/messages/zh_TW/LC_MESSAGES/15924.mo and b/messages/zh_TW/LC_MESSAGES/15924.mo differ
diff --git a/messages/zh_TW/LC_MESSAGES/3166-1.mo b/messages/zh_TW/LC_MESSAGES/3166-1.mo
index 9965e887..f003fa8e 100644
Binary files a/messages/zh_TW/LC_MESSAGES/3166-1.mo and b/messages/zh_TW/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/zh_TW/LC_MESSAGES/3166-1.po b/messages/zh_TW/LC_MESSAGES/3166-1.po
index 2bc4208c..1a4d67d1 100644
--- a/messages/zh_TW/LC_MESSAGES/3166-1.po
+++ b/messages/zh_TW/LC_MESSAGES/3166-1.po
@@ -1,14 +1,15 @@
-# Translation of ISO-3166 (country names) to Traditional Chinese.
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Translation of ISO 3166-1 to Traditional Chinese
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
+#
 # This file is distributed under the same license as the iso-codes package.
-#   Free Software Foundation, Inc., 2002, 2003.
-#   Alastair McKinstry <mckinstry@computer.org>, 2002.
-#   Translations from KDE:
-#   - AceLan <acelan@kde.linux.org.tw>, 2001.
-#   - Kenduest Lee <kenduest@i18n.linux.org.tw>, 2001.
-#   Tetralet <tetralet@gmail.com> 2004, 2007, 2008, 2009, 2010.
-#   Wei-Lun Chao <bluebat@member.fsf.org> 2010, 2012, 2013.
 #
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002.
+# AceLan <acelan@kde.linux.org.tw>, 2001.
+# Kenduest Lee <kenduest@i18n.linux.org.tw>, 2001.
+# Tetralet <tetralet@gmail.com> 2004, 2007, 2008, 2009, 2010.
+# Wei-Lun Chao <bluebat@member.fsf.org> 2010, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/zh_TW/LC_MESSAGES/3166-2.mo b/messages/zh_TW/LC_MESSAGES/3166-2.mo
index 4c7a2902..a3257229 100644
Binary files a/messages/zh_TW/LC_MESSAGES/3166-2.mo and b/messages/zh_TW/LC_MESSAGES/3166-2.mo differ
diff --git a/messages/zh_TW/LC_MESSAGES/3166-3.mo b/messages/zh_TW/LC_MESSAGES/3166-3.mo
index f6d1f036..25897fb6 100644
Binary files a/messages/zh_TW/LC_MESSAGES/3166-3.mo and b/messages/zh_TW/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/zh_TW/LC_MESSAGES/4217.mo b/messages/zh_TW/LC_MESSAGES/4217.mo
index fb4114a7..04783ab9 100644
Binary files a/messages/zh_TW/LC_MESSAGES/4217.mo and b/messages/zh_TW/LC_MESSAGES/4217.mo differ
diff --git a/messages/zh_TW/LC_MESSAGES/639-2.mo b/messages/zh_TW/LC_MESSAGES/639-2.mo
index f3b3508c..6a341ca5 100644
Binary files a/messages/zh_TW/LC_MESSAGES/639-2.mo and b/messages/zh_TW/LC_MESSAGES/639-2.mo differ
diff --git a/messages/zh_TW/LC_MESSAGES/639-2.po b/messages/zh_TW/LC_MESSAGES/639-2.po
index a6b79d1e..714d5067 100644
--- a/messages/zh_TW/LC_MESSAGES/639-2.po
+++ b/messages/zh_TW/LC_MESSAGES/639-2.po
@@ -1,6 +1,10 @@
-# Traditional Chinese translation for ISO 639 Language names.
-# Copyright (C) 2001 Free Software Foundation, Inc.
+# Translation of ISO 639-2 to Traditional Chinese
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
+#
 # This file is distributed under the same license as the iso-codes package.
+#
+# Copyright ©
 # LI Daobing <lidaobing@gmail.com>, 2007.
 # Hominid He(viperii) <hominid@39.net>, 2007.
 # Mai Hao Hui <mhh@126.com>, 2001.
@@ -9,7 +13,6 @@
 # Alastair McKinstry <mckinstry@computer.org>, 2001.
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005.
 # Wei-Lun Chao <bluebat@member.fsf.org>, 2009, 2013.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/zh_TW/LC_MESSAGES/639-3.mo b/messages/zh_TW/LC_MESSAGES/639-3.mo
index 8e698383..1aecaf78 100644
Binary files a/messages/zh_TW/LC_MESSAGES/639-3.mo and b/messages/zh_TW/LC_MESSAGES/639-3.mo differ
diff --git a/messages/zu/LC_MESSAGES/3166-1.mo b/messages/zu/LC_MESSAGES/3166-1.mo
index 3e0afae6..127790d7 100644
Binary files a/messages/zu/LC_MESSAGES/3166-1.mo and b/messages/zu/LC_MESSAGES/3166-1.mo differ
diff --git a/messages/zu/LC_MESSAGES/3166-1.po b/messages/zu/LC_MESSAGES/3166-1.po
index d2465bcf..b416951f 100644
--- a/messages/zu/LC_MESSAGES/3166-1.po
+++ b/messages/zu/LC_MESSAGES/3166-1.po
@@ -1,14 +1,12 @@
-# Translation of ISO-3166 (country names) to Zulu
+# Translation of ISO 3166-1 to Zulu
+# Codes for the representation of names of countries and their subdivisions
+# Part 1: Country codes
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002,2003
-#   Alastair McKinstry <mckinstry@computer.org>, 2002
-#   Translations from KDE:
-#   - Thobile Mhlongo <thobile@translate.org.za>, 2002
-#
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002
+# Thobile Mhlongo <thobile@translate.org.za>, 2002
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_3166-1\n"
diff --git a/messages/zu/LC_MESSAGES/3166-3.mo b/messages/zu/LC_MESSAGES/3166-3.mo
index 3a14af9b..b683e19a 100644
Binary files a/messages/zu/LC_MESSAGES/3166-3.mo and b/messages/zu/LC_MESSAGES/3166-3.mo differ
diff --git a/messages/zu/LC_MESSAGES/639-2.mo b/messages/zu/LC_MESSAGES/639-2.mo
index 65f990eb..adec03db 100644
Binary files a/messages/zu/LC_MESSAGES/639-2.mo and b/messages/zu/LC_MESSAGES/639-2.mo differ
diff --git a/messages/zu/LC_MESSAGES/639-2.po b/messages/zu/LC_MESSAGES/639-2.po
index 325a7415..513694b5 100644
--- a/messages/zu/LC_MESSAGES/639-2.po
+++ b/messages/zu/LC_MESSAGES/639-2.po
@@ -1,13 +1,12 @@
-# Translation of ISO-639 (language names) to Zulu
+# Translation of ISO 639-2 to Zulu
+# Codes for the representation of names of languages
+# Part 2: Alpha-3 code
 #
 # This file is distributed under the same license as the iso-codes package.
 #
-# Copyright (C)
-#   Free Software Foundation, Inc., 2002
-#   Alastair McKinstry <mckinstry@computer.org>, 2002
-#   Translations from KDE:
-#   Thobile Mhlongo <thobile@translate.org.za>
-#
+# Copyright ©
+# Alastair McKinstry <mckinstry@computer.org>, 2002
+# Thobile Mhlongo <thobile@translate.org.za>
 msgid ""
 msgstr ""
 "Project-Id-Version: iso_639-2\n"
diff --git a/messages/zu/LC_MESSAGES/639-3.mo b/messages/zu/LC_MESSAGES/639-3.mo
index 01d1d479..59af1513 100644
Binary files a/messages/zu/LC_MESSAGES/639-3.mo and b/messages/zu/LC_MESSAGES/639-3.mo differ