Change language metadata field to contain language codes

According to the standard specified by GNU: https://www.gnu.org/software/gettext/manual/html_node/Header-Entry.html

Contributes to issue CURA-4113.

40 files changed, 40 insertions, 118 deletions

diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot
index 9b8d7f9639..b81708a10a 100644
--- a/resources/i18n/cura.pot
+++ b/resources/i18n/cura.pot
@@ -11,9 +11,7 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: TEAM\n"
-"Language: LANGUAGE\n"
-"Lang-Code: xx\n"
-"Country-Code: XX\n"
+"Language: xx_XX\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/resources/i18n/de/cura.po b/resources/i18n/de/cura.po
index 50ee3549fd..3e563b3453 100644
--- a/resources/i18n/de/cura.po
+++ b/resources/i18n/de/cura.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:30+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: German\n"
-"Language: German\n"
+"Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: de\n"
-"Country-Code: DE\n"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28
 msgctxt "@action"
diff --git a/resources/i18n/de/fdmextruder.def.json.po b/resources/i18n/de/fdmextruder.def.json.po
index 8f553c0e9c..10944ce277 100644
--- a/resources/i18n/de/fdmextruder.def.json.po
+++ b/resources/i18n/de/fdmextruder.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:30+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: German\n"
-"Language: German\n"
+"Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: de\n"
-"Country-Code: DE\n"
 
 #: fdmextruder.def.json
 msgctxt "machine_settings label"
diff --git a/resources/i18n/de/fdmprinter.def.json.po b/resources/i18n/de/fdmprinter.def.json.po
index 5be8a528da..a1776d3472 100644
--- a/resources/i18n/de/fdmprinter.def.json.po
+++ b/resources/i18n/de/fdmprinter.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:31+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: German\n"
-"Language: German\n"
+"Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: de\n"
-"Country-Code: DE\n"
 
 #: fdmprinter.def.json
 msgctxt "machine_settings label"
diff --git a/resources/i18n/en/cura.po b/resources/i18n/en/cura.po
index f7329a9ca2..3da9b321d1 100644
--- a/resources/i18n/en/cura.po
+++ b/resources/i18n/en/cura.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-02 16:53+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: English\n"
+"Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: en\n"
-"Country-Code: US\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28
diff --git a/resources/i18n/es/cura.po b/resources/i18n/es/cura.po
index dd2352bfe5..cd8fd41081 100644
--- a/resources/i18n/es/cura.po
+++ b/resources/i18n/es/cura.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:30+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Spanish\n"
-"Language: Spanish\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: es\n"
-"Country-Code: ES\n"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28
 msgctxt "@action"
diff --git a/resources/i18n/es/fdmextruder.def.json.po b/resources/i18n/es/fdmextruder.def.json.po
index 669049f073..692448c397 100644
--- a/resources/i18n/es/fdmextruder.def.json.po
+++ b/resources/i18n/es/fdmextruder.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:31+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Spanish\n"
-"Language: Spanish\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: es\n"
-"Country-Code: ES\n"
 
 #: fdmextruder.def.json
 msgctxt "machine_settings label"
diff --git a/resources/i18n/es/fdmprinter.def.json.po b/resources/i18n/es/fdmprinter.def.json.po
index 301a5ae985..5130f1d250 100644
--- a/resources/i18n/es/fdmprinter.def.json.po
+++ b/resources/i18n/es/fdmprinter.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:31+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Spanish\n"
-"Language: Spanish\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: es\n"
-"Country-Code: ES\n"
 
 #: fdmprinter.def.json
 msgctxt "machine_settings label"
diff --git a/resources/i18n/fdmextruder.def.json.pot b/resources/i18n/fdmextruder.def.json.pot
index 8a8b4b089a..ea5c05f6cf 100644
--- a/resources/i18n/fdmextruder.def.json.pot
+++ b/resources/i18n/fdmextruder.def.json.pot
@@ -11,9 +11,7 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: TEAM\n"
-"Language: LANGUAGE\n"
-"Lang-Code: xx\n"
-"Country-Code: XX\n"
+"Language: xx_XX\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/resources/i18n/fdmprinter.def.json.pot b/resources/i18n/fdmprinter.def.json.pot
index 4b4c3ada46..3863eb1757 100644
--- a/resources/i18n/fdmprinter.def.json.pot
+++ b/resources/i18n/fdmprinter.def.json.pot
@@ -11,9 +11,7 @@ msgstr ""
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: TEAM\n"
-"Language: LANGUAGE\n"
-"Lang-Code: xx\n"
-"Country-Code: XX\n"
+"Language: xx_XX\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/resources/i18n/fi/cura.po b/resources/i18n/fi/cura.po
index b872da2ead..f54122c4d6 100644
--- a/resources/i18n/fi/cura.po
+++ b/resources/i18n/fi/cura.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:30+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Finnish\n"
-"Language: Finnish\n"
+"Language: fi_FI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: fi\n"
-"Country-Code: FI\n"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28
 msgctxt "@action"
diff --git a/resources/i18n/fi/fdmextruder.def.json.po b/resources/i18n/fi/fdmextruder.def.json.po
index 853a7056aa..9ac62d86c3 100644
--- a/resources/i18n/fi/fdmextruder.def.json.po
+++ b/resources/i18n/fi/fdmextruder.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:31+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Finnish\n"
-"Language: Finnish\n"
+"Language: fi_FI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: fi\n"
-"Country-Code: FI\n"
 
 #: fdmextruder.def.json
 msgctxt "machine_settings label"
diff --git a/resources/i18n/fi/fdmprinter.def.json.po b/resources/i18n/fi/fdmprinter.def.json.po
index 420dee6594..35ceb2a12e 100644
--- a/resources/i18n/fi/fdmprinter.def.json.po
+++ b/resources/i18n/fi/fdmprinter.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:31+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Finnish\n"
-"Language: Finnish\n"
+"Language: fi_FI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: fi\n"
-"Country-Code: FI\n"
 
 #: fdmprinter.def.json
 msgctxt "machine_settings label"
diff --git a/resources/i18n/fr/cura.po b/resources/i18n/fr/cura.po
index 92057792fb..2e400a9bdb 100644
--- a/resources/i18n/fr/cura.po
+++ b/resources/i18n/fr/cura.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:30+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: French\n"
-"Language: French\n"
+"Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: fr\n"
-"Country-Code: FR\n"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28
 msgctxt "@action"
diff --git a/resources/i18n/fr/fdmextruder.def.json.po b/resources/i18n/fr/fdmextruder.def.json.po
index 1b4b4d7d17..6f8beee36a 100644
--- a/resources/i18n/fr/fdmextruder.def.json.po
+++ b/resources/i18n/fr/fdmextruder.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:31+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: French\n"
-"Language: French\n"
+"Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: fr\n"
-"Country-Code: FR\n"
 
 #: fdmextruder.def.json
 msgctxt "machine_settings label"
diff --git a/resources/i18n/fr/fdmprinter.def.json.po b/resources/i18n/fr/fdmprinter.def.json.po
index 2329f1f67d..e644927c40 100644
--- a/resources/i18n/fr/fdmprinter.def.json.po
+++ b/resources/i18n/fr/fdmprinter.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:31+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: French\n"
-"Language: French\n"
+"Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: fr\n"
-"Country-Code: FR\n"
 
 #: fdmprinter.def.json
 msgctxt "machine_settings label"
diff --git a/resources/i18n/it/cura.po b/resources/i18n/it/cura.po
index 2fd75845ef..60b383dafd 100644
--- a/resources/i18n/it/cura.po
+++ b/resources/i18n/it/cura.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:30+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Italian\n"
-"Language: Italian\n"
+"Language: it_IT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: it\n"
-"Country-Code: IT\n"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28
 msgctxt "@action"
diff --git a/resources/i18n/it/fdmextruder.def.json.po b/resources/i18n/it/fdmextruder.def.json.po
index 109defa4e5..f6a3c95a76 100644
--- a/resources/i18n/it/fdmextruder.def.json.po
+++ b/resources/i18n/it/fdmextruder.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:31+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Italian\n"
-"Language: Italian\n"
+"Language: it_IT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: it\n"
-"Country-Code: IT\n"
 
 #: fdmextruder.def.json
 msgctxt "machine_settings label"
diff --git a/resources/i18n/it/fdmprinter.def.json.po b/resources/i18n/it/fdmprinter.def.json.po
index 6d705385c4..82a079d01d 100644
--- a/resources/i18n/it/fdmprinter.def.json.po
+++ b/resources/i18n/it/fdmprinter.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:31+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Italian\n"
-"Language: Italian\n"
+"Language: it_IT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: it\n"
-"Country-Code: IT\n"
 
 #: fdmprinter.def.json
 msgctxt "machine_settings label"
diff --git a/resources/i18n/jp/cura.po b/resources/i18n/jp/cura.po
index abbb692beb..72d030c87b 100644
--- a/resources/i18n/jp/cura.po
+++ b/resources/i18n/jp/cura.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-03-27 17:27+0200\n"
 "Last-Translator: None\n"
 "Language-Team: None\n"
-"Language: Japanese\n"
+"Language: ja_JP\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: ja\n"
-"Country-Code: JP\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28
diff --git a/resources/i18n/jp/fdmextruder.def.json.po b/resources/i18n/jp/fdmextruder.def.json.po
index 4f01e23966..5fc4694fc9 100644
--- a/resources/i18n/jp/fdmextruder.def.json.po
+++ b/resources/i18n/jp/fdmextruder.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-04 10:18+0900\n"
 "Last-Translator: Brule\n"
 "Language-Team: Bryke\n"
-"Language: Japanese\n"
+"Language: ja_JP\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: ja\n"
-"Country-Code: JP\n"
 "X-Generator: Poedit 2.0.1\n"
 
 #: fdmextruder.def.json
diff --git a/resources/i18n/jp/fdmprinter.def.json.po b/resources/i18n/jp/fdmprinter.def.json.po
index 487740ebbf..7fee36c229 100644
--- a/resources/i18n/jp/fdmprinter.def.json.po
+++ b/resources/i18n/jp/fdmprinter.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-14 15:18+0900\n"
 "Last-Translator: Brule\n"
 "Language-Team: Brule\n"
-"Language: Japanese\n"
+"Language: ja_JP\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: ja\n"
-"Country-Code: JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.0.2\n"
 
diff --git a/resources/i18n/ko/cura.po b/resources/i18n/ko/cura.po
index ab572868d9..e0f1fa34ae 100644
--- a/resources/i18n/ko/cura.po
+++ b/resources/i18n/ko/cura.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-03-27 17:27+0200\n"
 "Last-Translator: None\n"
 "Language-Team: None\n"
-"Language: Korean\n"
+"Language: ko_KR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: ko\n"
-"Country-Code: KR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0\n"
 
diff --git a/resources/i18n/ko/fdmextruder.def.json.po b/resources/i18n/ko/fdmextruder.def.json.po
index c527cdd050..1cfdaa11a8 100644
--- a/resources/i18n/ko/fdmextruder.def.json.po
+++ b/resources/i18n/ko/fdmextruder.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-08 21:57+0900\n"
 "Last-Translator: None\n"
 "Language-Team: None\n"
-"Language: ko\n"
+"Language: ko_KR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: ko\n"
-"Country-Code: KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.0.3\n"
 
diff --git a/resources/i18n/ko/fdmprinter.def.json.po b/resources/i18n/ko/fdmprinter.def.json.po
index d347d0c68e..06dfd79408 100644
--- a/resources/i18n/ko/fdmprinter.def.json.po
+++ b/resources/i18n/ko/fdmprinter.def.json.po
@@ -11,7 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2017-08-08 23:38+0900\n"
 "Last-Translator: None\n"
 "Language-Team: None\n"
-"Language: ko\n"
+"Language: ko_KR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/resources/i18n/nl/cura.po b/resources/i18n/nl/cura.po
index 59b249ec7b..639fe9169a 100644
--- a/resources/i18n/nl/cura.po
+++ b/resources/i18n/nl/cura.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:30+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Dutch\n"
-"Language: Dutch\n"
+"Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: nl\n"
-"Country-Code: NL\n"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28
 msgctxt "@action"
diff --git a/resources/i18n/nl/fdmextruder.def.json.po b/resources/i18n/nl/fdmextruder.def.json.po
index 9cca542a31..a72e57782c 100644
--- a/resources/i18n/nl/fdmextruder.def.json.po
+++ b/resources/i18n/nl/fdmextruder.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:30+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Dutch\n"
-"Language: Dutch\n"
+"Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: nl\n"
-"Country-Code: NL\n"
 
 #: fdmextruder.def.json
 msgctxt "machine_settings label"
diff --git a/resources/i18n/nl/fdmprinter.def.json.po b/resources/i18n/nl/fdmprinter.def.json.po
index 9747528f23..2fed3af7cd 100644
--- a/resources/i18n/nl/fdmprinter.def.json.po
+++ b/resources/i18n/nl/fdmprinter.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:31+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Dutch\n"
-"Language: Dutch\n"
+"Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: nl\n"
-"Country-Code: NL\n"
 
 #: fdmprinter.def.json
 msgctxt "machine_settings label"
diff --git a/resources/i18n/pl/cura.po b/resources/i18n/pl/cura.po
index e00c939c46..32a3866129 100644
--- a/resources/i18n/pl/cura.po
+++ b/resources/i18n/pl/cura.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-03 16:14+0200\n"
 "Last-Translator: 'Jaguś' Paweł Jagusiak and Andrzej 'anraf1001' Rafalski\n"
 "Language-Team: reprapy.pl\n"
-"Language: Polish\n"
+"Language: pl_PL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: pl\n"
-"Country-Code: PL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.3\n"
 
diff --git a/resources/i18n/pl/fdmextruder.def.json.po b/resources/i18n/pl/fdmextruder.def.json.po
index a2248200b3..9ffea3316f 100644
--- a/resources/i18n/pl/fdmextruder.def.json.po
+++ b/resources/i18n/pl/fdmextruder.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-04 12:25+0200\n"
 "Last-Translator: 'Jaguś' Paweł Jagusiak and Andrzej 'anraf1001' Rafalski\n"
 "Language-Team: reprapy.pl\n"
-"Language: Polish\n"
+"Language: pl_PL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: pl\n"
-"Country-Code: PL\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 2.0.3\n"
 
diff --git a/resources/i18n/pl/fdmprinter.def.json.po b/resources/i18n/pl/fdmprinter.def.json.po
index db2e304259..63a4915f22 100644
--- a/resources/i18n/pl/fdmprinter.def.json.po
+++ b/resources/i18n/pl/fdmprinter.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-05 22:00+0200\n"
 "Last-Translator: 'Jaguś' Paweł Jagusiak and Andrzej 'anraf1001' Rafalski\n"
 "Language-Team: reprapy.pl\n"
-"Language: Polish\n"
+"Language: pl_PL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: pl\n"
-"Country-Code: PL\n"
 "X-Generator: Poedit 2.0.3\n"
 
 #: fdmprinter.def.json
diff --git a/resources/i18n/ptbr/cura.po b/resources/i18n/ptbr/cura.po
index 9023ce640d..19929dadaa 100644
--- a/resources/i18n/ptbr/cura.po
+++ b/resources/i18n/ptbr/cura.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-15 07:20-0300\n"
 "Last-Translator: Cláudio Sampaio <patola@makerlinux.com.br>\n"
 "Language-Team: Cláudio Sampaio <patola@makerlinux.com.br> and CoderSquirrel <jasaneschio@gmail.com>\n"
-"Language: Brazillian Portuguese\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: pt\n"
-"Country-Code: BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28
diff --git a/resources/i18n/ptbr/fdmextruder.def.json.po b/resources/i18n/ptbr/fdmextruder.def.json.po
index be7a7e2bb1..0b9a8023d9 100644
--- a/resources/i18n/ptbr/fdmextruder.def.json.po
+++ b/resources/i18n/ptbr/fdmextruder.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-14 04:00-0300\n"
 "Last-Translator: Cláudio Sampaio <patola@makerlinux.com.br>\n"
 "Language-Team: Cláudio Sampaio <patola@makerlinux.com.br> and CoderSquirrel <jasaneschio@gmail.com>\n"
-"Language: Brazillian Portuguese\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: pt\n"
-"Country-Code: BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: fdmextruder.def.json
diff --git a/resources/i18n/ptbr/fdmprinter.def.json.po b/resources/i18n/ptbr/fdmprinter.def.json.po
index 0d573b84f5..fd4ca3fd9c 100644
--- a/resources/i18n/ptbr/fdmprinter.def.json.po
+++ b/resources/i18n/ptbr/fdmprinter.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-15 08:00-0300\n"
 "Last-Translator: Cláudio Sampaio <patola@makerlinux.com.br>\n"
 "Language-Team: Cláudio Sampaio <patola@makerlinux.com.br> and CoderSquirrel <jasaneschio@gmail.com>\n"
-"Language: Brazillian Portuguese\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: pt\n"
-"Country-Code: BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: fdmprinter.def.json
diff --git a/resources/i18n/ru/cura.po b/resources/i18n/ru/cura.po
index 291de08a51..6ec67a1cd8 100755
--- a/resources/i18n/ru/cura.po
+++ b/resources/i18n/ru/cura.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-09 09:49+0300\n"
 "Last-Translator: Ruslan Popov <ruslan.popov@gmail.com>\n"
 "Language-Team: Ruslan Popov\n"
-"Language: Russian\n"
+"Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: ru\n"
-"Country-Code: RU\n"
 "X-Generator: Poedit 2.0\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
diff --git a/resources/i18n/ru/fdmextruder.def.json.po b/resources/i18n/ru/fdmextruder.def.json.po
index 633b487dc2..93b56704e6 100644
--- a/resources/i18n/ru/fdmextruder.def.json.po
+++ b/resources/i18n/ru/fdmextruder.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-09 19:26+0300\n"
 "Last-Translator: Ruslan Popov <ruslan.popov@gmail.com>\n"
 "Language-Team: Ruslan Popov\n"
-"Language: Russian\n"
+"Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: ru\n"
-"Country-Code: RU\n"
 "X-Generator: Poedit 2.0\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
diff --git a/resources/i18n/ru/fdmprinter.def.json.po b/resources/i18n/ru/fdmprinter.def.json.po
index 53ff93c2af..eb3bbf74fd 100755
--- a/resources/i18n/ru/fdmprinter.def.json.po
+++ b/resources/i18n/ru/fdmprinter.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-09 19:26+0300\n"
 "Last-Translator: Ruslan Popov <ruslan.popov@gmail.com>\n"
 "Language-Team: Ruslan Popov\n"
-"Language: Russian\n"
+"Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: ru\n"
-"Country-Code: RU\n"
 "X-Generator: Poedit 2.0\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
diff --git a/resources/i18n/tr/cura.po b/resources/i18n/tr/cura.po
index 511a2ed406..7aaa3afb17 100644
--- a/resources/i18n/tr/cura.po
+++ b/resources/i18n/tr/cura.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:30+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Turkish\n"
-"Language: Turkish\n"
+"Language: tr_TR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: tr\n"
-"Country-Code: TR\n"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:28
 msgctxt "@action"
diff --git a/resources/i18n/tr/fdmextruder.def.json.po b/resources/i18n/tr/fdmextruder.def.json.po
index f02880d767..348d28ab76 100644
--- a/resources/i18n/tr/fdmextruder.def.json.po
+++ b/resources/i18n/tr/fdmextruder.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:30+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Turkish\n"
-"Language: Turkish\n"
+"Language: tr_TR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: tr\n"
-"Country-Code: TR\n"
 
 #: fdmextruder.def.json
 msgctxt "machine_settings label"
diff --git a/resources/i18n/tr/fdmprinter.def.json.po b/resources/i18n/tr/fdmprinter.def.json.po
index c11d5d33af..15fbec28fa 100644
--- a/resources/i18n/tr/fdmprinter.def.json.po
+++ b/resources/i18n/tr/fdmprinter.def.json.po
@@ -11,12 +11,10 @@ msgstr ""
 "PO-Revision-Date: 2017-08-11 14:31+0200\n"
 "Last-Translator: Bothof <info@bothof.nl>\n"
 "Language-Team: Turkish\n"
-"Language: Turkish\n"
+"Language: tr_TR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Lang-Code: tr\n"
-"Country-Code: TR\n"
 
 #: fdmprinter.def.json
 msgctxt "machine_settings label"