- i18n: update da fr nb nl uk, and msgmerge (Translation Project).

6 files changed, 92 insertions, 86 deletions

diff --git a/CHANGES b/CHANGES
index 47e9fb4..6c52690 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.17 -> 2.0:
+    - jbj: i18n: update da fr nb nl uk, and msgmerge (Translation Project).
     - jbj: i18n: add gu hr ia kn pt_BR ta, msgmerge (Translation Project).
     - devzero2000: add cpp suppressions directive for dealing with
       false positive. Enable cppcheck inline suppression for
diff --git a/po/da.po b/po/da.po
index e03c07c..3d23d2c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,15 +1,15 @@
 # Danish translation of popt.
-# Copyright (C) 2008 popt.
+# Copyright (C) 2015 popt.
 # This file is distributed under the same license as the popt package.
 # Martin Hansen <mah@k64.dk>, 2001.
-# Joe Hansen <joedalton2@yahoo.dk>, 2008.
+# Joe Hansen <joedalton2@yahoo.dk>, 2008, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt-1.14\n"
+"Project-Id-Version: popt-1.16\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2014-08-13 13:27-0400\n"
-"PO-Revision-Date: 2008-09-15 00:00+0000\n"
+"PO-Revision-Date: 2015-03-18 00:00+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -64,7 +64,7 @@ msgstr "hukommelsestildeling mislykkedes"
 
 #: popt.c:1907
 msgid "config file failed sanity test"
-msgstr ""
+msgstr "konfigurationsfil mislykkede tilregnelighedstest"
 
 #: popt.c:1909
 msgid "option does not take an argument"
@@ -120,7 +120,7 @@ msgstr "INT"
 
 #: popthelp.c:215
 msgid "SHORT"
-msgstr ""
+msgstr "SHORT"
 
 #: popthelp.c:216
 msgid "LONG"
diff --git a/po/fr.po b/po/fr.po
index 9bc7d41..07aca80 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,21 +1,21 @@
 # A French translation for rpm messages
 # Copyright (C) 2003 Free Software Foundation, Inc.
-# This file is distributed under the same license as the RPM package.
+# This file is distributed under the same license as the popt package.
 # RPM French Translation <rpm-fr@livna.org>, 2003.
+# Stéphane Aulery <lkppo@free.fr>
 # JBJ : THANX A LOT !!!
 #
 # N'hésitez pas à m'envoyez un courriel si vous avez des
 # suggestions/corrections.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
+"Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2014-08-13 13:27-0400\n"
-"PO-Revision-Date: 2003-06-22 23:43+0200\n"
-"Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
-"Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
+"PO-Revision-Date: 2015-03-23 13:50+0100\n"
+"Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
+"Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,9 +26,9 @@ msgid "unknown errno"
 msgstr "errno inconnu"
 
 #: popt.c:1439
-#, fuzzy, c-format
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "type(%d) d'option non implémenté dans popt\n"
+msgstr "type d'option (%u) non implémenté dans popt\n"
 
 #: popt.c:1889
 msgid "missing argument"
@@ -36,7 +36,7 @@ msgstr "argument manquant"
 
 #: popt.c:1891
 msgid "unknown option"
-msgstr "option iconnue"
+msgstr "option inconnue"
 
 #: popt.c:1893
 msgid "mutually exclusive logical operations requested"
@@ -48,11 +48,11 @@ msgstr "opt->arg ne devrait pas être NULL"
 
 #: popt.c:1897
 msgid "aliases nested too deeply"
-msgstr "les alias sont trop entremellés"
+msgstr "imbrications trop profondes des alias"
 
 #: popt.c:1899
 msgid "error in parameter quoting"
-msgstr "erreur en citant les paramètres"
+msgstr "erreur d'échappement des paramètres"
 
 #: popt.c:1901
 msgid "invalid numeric value"
@@ -88,11 +88,11 @@ msgstr "erreur inconnue"
 
 #: popthelp.c:83 popthelp.c:94
 msgid "Show this help message"
-msgstr "Montre ce message d'aide"
+msgstr "Affiche ce message d'aide"
 
 #: popthelp.c:84 popthelp.c:95
 msgid "Display brief usage message"
-msgstr "Affiche un bref descriptif de l'utilisation"
+msgstr "Affiche un bref descriptif du fonctionnement"
 
 #: popthelp.c:98
 msgid "Display option defaults in message"
@@ -100,15 +100,15 @@ msgstr "Afficher les valeurs par défaut des options dans le message"
 
 #: popthelp.c:100
 msgid "Terminate options"
-msgstr ""
+msgstr "Terminer les options"
 
 #: popthelp.c:199
 msgid "Help options:"
-msgstr ""
+msgstr "Options d'aide :"
 
 #: popthelp.c:200
 msgid "Options implemented via popt alias/exec:"
-msgstr ""
+msgstr "Options implémentées via popt alias / exec :"
 
 #: popthelp.c:208
 msgid "NONE"
@@ -131,13 +131,12 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:217
-#, fuzzy
 msgid "LONGLONG"
-msgstr "LONG"
+msgstr "LONGLONG"
 
 #: popthelp.c:218
 msgid "STRING"
-msgstr "CHAINE"
+msgstr "CHAÎNE"
 
 #: popthelp.c:219
 msgid "FLOAT"
@@ -153,8 +152,8 @@ msgstr "ARG"
 
 #: popthelp.c:664
 msgid "Usage:"
-msgstr "Utilisation:"
+msgstr "Usage :"
 
 #: popthelp.c:689
 msgid "[OPTION...]"
-msgstr "[OPTION...]"
+msgstr "[OPTION…]"
diff --git a/po/nb.po b/po/nb.po
index 59ec3da..2059a9a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3,22 +3,21 @@
 # This file is distributed under the same license as the popt package.
 #
 # Kjartan Maraas <kmaraas@online.no>, 2008
-# Johnny A. Solbu <johnny@solbu.net>, 2012
+# Johnny A. Solbu <johnny@solbu.net>, 2012, 2014-2015
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.14\n"
+"Project-Id-Version: popt 1.16\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2014-08-13 13:27-0400\n"
-"PO-Revision-Date: 2014-07-24 21:13+0100\n"
+"PO-Revision-Date: 2015-03-29 17:30+0100\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Norwegian Bokmal\n"
-"X-Poedit-Country: NORWAY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: popt.c:54
 msgid "unknown errno"
@@ -67,7 +66,7 @@ msgstr "minneallokering feilet"
 
 #: popt.c:1907
 msgid "config file failed sanity test"
-msgstr ""
+msgstr "konfig-filen feilet tilregnelighettesten"
 
 #: popt.c:1909
 msgid "option does not take an argument"
@@ -123,7 +122,7 @@ msgstr "HELTALL"
 
 #: popthelp.c:215
 msgid "SHORT"
-msgstr ""
+msgstr "KORT"
 
 #: popthelp.c:216
 msgid "LONG"
diff --git a/po/nl.po b/po/nl.po
index 2321824..9d5585b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,23 +1,26 @@
 # Dutch messages for popt.
 # This file is put in the public domain.
-# Tim Van Holder <tim.van.holder@telenet.be>, 2007, 2008.
 #
+# Tim Van Holder <tim.van.holder@telenet.be>, 2007, 2008.
+# Benno Schulenberg <benno@vertaalt.nl>, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.14\n"
+"Project-Id-Version: popt 1.16\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2014-08-13 13:27-0400\n"
-"PO-Revision-Date: 2008-02-20 19:26+0100\n"
-"Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
+"PO-Revision-Date: 2015-03-29 17:15+0200\n"
+"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: popt.c:54
 msgid "unknown errno"
-msgstr "onbekend foutnummer (errno)"
+msgstr "onbekend foutnummer"
 
 #: popt.c:1439
 #, c-format
@@ -34,7 +37,7 @@ msgstr "onbekende optie"
 
 #: popt.c:1893
 msgid "mutually exclusive logical operations requested"
-msgstr "elkaar uitsluitende logische operatoren werden gevraagd"
+msgstr "de gevraagde logische operatoren sluiten elkaar uit"
 
 #: popt.c:1895
 msgid "opt->arg should not be NULL"
@@ -55,15 +58,15 @@ msgstr "ongeldige numerieke waarde"
 
 #: popt.c:1903
 msgid "number too large or too small"
-msgstr "getal is te klein of te groot"
+msgstr "getal is te groot of te klein"
 
 #: popt.c:1905
 msgid "memory allocation failed"
-msgstr "reserveren van geheugen is mislukt"
+msgstr "onvoldoende geheugen beschikbaar"
 
 #: popt.c:1907
 msgid "config file failed sanity test"
-msgstr ""
+msgstr "configuratiebestand is niet gezond"
 
 #: popt.c:1909
 msgid "option does not take an argument"
@@ -95,16 +98,16 @@ msgstr "De standaardwaarden van opties tonen in de tekst"
 
 #: popthelp.c:100
 msgid "Terminate options"
-msgstr "Opties beëindigen"
+msgstr "Einde van de opties"
 
 # of "Help-opties:"?
 #: popthelp.c:199
 msgid "Help options:"
-msgstr "Hulp-opties:"
+msgstr "Hulpopties:"
 
 #: popthelp.c:200
 msgid "Options implemented via popt alias/exec:"
-msgstr "Opties geïmplementeerd d.m.v. popt alias/exec:"
+msgstr "Opties geïmplementeerd via popt alias/exec:"
 
 #: popthelp.c:208
 msgid "NONE"
@@ -120,7 +123,7 @@ msgstr "INT"
 
 #: popthelp.c:215
 msgid "SHORT"
-msgstr ""
+msgstr "SHORT"
 
 #: popthelp.c:216
 msgid "LONG"
diff --git a/po/uk.po b/po/uk.po
index 2aec67f..b60d484 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,68 +1,73 @@
 # Translation into the ukrainian language.
 # Copyright (C) 1999 Free Software Foundation, Inc.
-# Yuri Syrota <rasta@renome.rovno.ua>, 1999.
+# This file is distributed under the same license as the popt package.
 #
+# Yuri Syrota <rasta@renome.rovno.ua>, 1999.
+# Yuri Chornoivan <yurchor@ukr.net>, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
+"Project-Id-Version: popt 1.16\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2014-08-13 13:27-0400\n"
-"PO-Revision-Date: 1999-09-30 16:54+0200\n"
-"Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
-"Language-Team: Ukrainian <uk@li.org>\n"
+"PO-Revision-Date: 2015-03-29 18:07+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-u\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"X-Generator: Lokalize 1.5\n"
 
 #: popt.c:54
 msgid "unknown errno"
-msgstr ""
+msgstr "невідомий номер помилки"
 
 #: popt.c:1439
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr ""
+msgstr "тип параметра (%u) у popt не реалізовано\n"
 
 #: popt.c:1889
 msgid "missing argument"
-msgstr ""
+msgstr "пропущено аргумент"
 
 #: popt.c:1891
 msgid "unknown option"
-msgstr ""
+msgstr "невідомий параметр"
 
 #: popt.c:1893
 msgid "mutually exclusive logical operations requested"
-msgstr ""
+msgstr "надійшов запит на взаємно виключні логічні операції"
 
 #: popt.c:1895
 msgid "opt->arg should not be NULL"
-msgstr ""
+msgstr "параметр->аргумент повинне не дорівнювати NULL"
 
 #: popt.c:1897
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "надто великий рівень вкладеності у альтернативних назвах"
 
 #: popt.c:1899
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "помилка у використанні лапок у параметрі"
 
 #: popt.c:1901
 msgid "invalid numeric value"
-msgstr ""
+msgstr "некоректне числове значення"
 
 #: popt.c:1903
 msgid "number too large or too small"
-msgstr ""
+msgstr "число є надто великим або надто малим"
 
 #: popt.c:1905
 msgid "memory allocation failed"
-msgstr ""
+msgstr "не вдалося отримати місце у пам'яті"
 
 #: popt.c:1907
 msgid "config file failed sanity test"
-msgstr ""
+msgstr "файл налаштувань не пройшов перевірку на чинність"
 
 #: popt.c:1909
 msgid "option does not take an argument"
@@ -78,77 +83,76 @@ msgstr ""
 
 #: popt.c:1917
 msgid "unknown error"
-msgstr ""
+msgstr "невідома помилка"
 
 #: popthelp.c:83 popthelp.c:94
 msgid "Show this help message"
-msgstr "�������� �� ��צ���"
+msgstr "Показати цю довідку"
 
 #: popthelp.c:84 popthelp.c:95
 msgid "Display brief usage message"
-msgstr "�������� ������� ��צ��� ��� ������������"
+msgstr "Показати коротку довідку про використання"
 
 #: popthelp.c:98
-#, fuzzy
 msgid "Display option defaults in message"
-msgstr "�������� ������� ��צ��� ��� ������������"
+msgstr "Показати типові значення параметрів у повідомленні"
 
 #: popthelp.c:100
 msgid "Terminate options"
-msgstr ""
+msgstr "Завершити параметри"
 
 #: popthelp.c:199
 msgid "Help options:"
-msgstr ""
+msgstr "Параметри довідки:"
 
 #: popthelp.c:200
 msgid "Options implemented via popt alias/exec:"
-msgstr ""
+msgstr "Параметри, реалізовані за допомогою alias/exec popt:"
 
 #: popthelp.c:208
 msgid "NONE"
-msgstr ""
+msgstr "НІЧОГО"
 
 #: popthelp.c:210
 msgid "VAL"
-msgstr ""
+msgstr "ЗНАЧЕННЯ"
 
 #: popthelp.c:214
 msgid "INT"
-msgstr ""
+msgstr "ЦІЛЕ"
 
 #: popthelp.c:215
 msgid "SHORT"
-msgstr ""
+msgstr "КОРОТКЕ"
 
 #: popthelp.c:216
 msgid "LONG"
-msgstr ""
+msgstr "ДОВГЕ"
 
 #: popthelp.c:217
 msgid "LONGLONG"
-msgstr ""
+msgstr "LONGLONG"
 
 #: popthelp.c:218
 msgid "STRING"
-msgstr ""
+msgstr "РЯДОК"
 
 #: popthelp.c:219
 msgid "FLOAT"
-msgstr ""
+msgstr "FLOAT"
 
 #: popthelp.c:220
 msgid "DOUBLE"
-msgstr ""
+msgstr "DOUBLE"
 
 #: popthelp.c:223
 msgid "ARG"
-msgstr ""
+msgstr "АРГУМЕНТ"
 
 #: popthelp.c:664
 msgid "Usage:"
-msgstr ""
+msgstr "Користування:"
 
 #: popthelp.c:689
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[ПАРАМЕТР...]"