Fix typo: Makefile.am should not be in .gitignore

35 files changed, 78 insertions, 80 deletions

diff --git a/.gitignore b/.gitignore
index b142194..71c6a99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,7 +79,6 @@ ltmain.sh
 m4
 *.m4
 Makefile
-Makefile.am
 Makefile.in
 Makefile.in.in
 Makevars.template
diff --git a/po/cs.po b/po/cs.po
index 6184dee..e0b2555 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2008-12-08 19:55+0100\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/da.po b/po/da.po
index 5e37a4a..4ef1c9b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2008-09-15 00:00+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
-"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/de.po b/po/de.po
index 5283331..c91cd0b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2009-11-10 19:58+0100\n"
 "Last-Translator: Roland Illig <roland.illig@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/eo.po b/po/eo.po
index 37b1d49..59205a8 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2008-08-03 15:50-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
-"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/es.po b/po/es.po
index b849172..dc8f8bf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2007-12-28 12:22+0100\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: Spanish <es@li.org>\n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/fi.po b/po/fi.po
index 4617983..5b38aed 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2008-02-21 18:19+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
diff --git a/po/fr.po b/po/fr.po
index 5573ad6..247c966 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,14 +12,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Language: \n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/ga.po b/po/ga.po
index 0f21720..c154788 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2008-04-10 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ga\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/gl.po b/po/gl.po
index be10c21..bec9e48 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
-"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/hu.po b/po/hu.po
index 89820ca..a2caeb1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2007-06-21 00:45+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
-"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
diff --git a/po/id.po b/po/id.po
index b4e7c76..7972392 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2008-08-26 14:18+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/is.po b/po/is.po
index 9389851..6646f99 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Language: \n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/it.po b/po/it.po
index f820ca4..82f4004 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2008-11-28 15:32+0100\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "First-Translator: Sandro Bonazzola <sandro.bonazzola@gmail.com>\n"
 "X-Generator: KBabel 1.11.4\n"
 
diff --git a/po/ja.po b/po/ja.po
index 739af32..0b05a16 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2010-10-19 12:01+0900\n"
 "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: popt.c:52
diff --git a/po/ko.po b/po/ko.po
index 06654fa..00f20db 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Language: \n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/lv.po b/po/lv.po
index b904e64..db1c0c1 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2009-04-12 16:34+0300\n"
 "Last-Translator: Rihards Prieditis <RPrieditis@inbox.lv>\n"
 "Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
-"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "X-Generator: Lokalize 0.3\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
diff --git a/po/nb.po b/po/nb.po
index 4d80eef..19ef6d8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
-"Language: no\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Language: no\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/nl.po b/po/nl.po
index df629e0..64f9c78 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2008-02-20 19:26+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\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-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/pl.po b/po/pl.po
index af4f849..19ce591 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2008-02-18 00:30+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/popt.pot b/po/popt.pot
index 7895f34..a1fdbe7 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.17.DEVEL\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pt.po b/po/pt.po
index b742bbf..66f8a52 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/ro.po b/po/ro.po
index 4d8bd80..1b83272 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ro\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/ru.po b/po/ru.po
index 0311a28..f8fcc72 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2009-02-01 13:30+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/sk.po b/po/sk.po
index 3d44d3e..e5f2577 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/sl.po b/po/sl.po
index 2206c85..26b334e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,14 +2,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/sv.po b/po/sv.po
index 758783d..9d73b3b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2008-02-23 20:15+0100\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
-"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/th.po b/po/th.po
index 5197a32..675da6a 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2008-02-19 15:53+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
-"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
 "X-Poedit-Language: Thai\n"
 "X-Poedit-Country: THAILAND\n"
 
diff --git a/po/tr.po b/po/tr.po
index 7ccf39a..804ba17 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/uk.po b/po/uk.po
index 38c33c1..63e8452 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\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"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/vi.po b/po/vi.po
index 68b5ae6..93c2920 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2008-02-18 16:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
diff --git a/po/wa.po b/po/wa.po
index a5cb2ca..f4854e5 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d942938..6c75b87 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2008-02-18 20:16+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2a2e8dd..4eb1bbc 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-10-31 14:57-0400\n"
+"POT-Creation-Date: 2010-11-10 11:07+0100\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 
 #: popt.c:52
 msgid "unknown errno"
diff --git a/poptparse.c b/poptparse.c
index 8db84d4..09c7c1f 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -3,7 +3,7 @@
  */
 
 /* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
-   file accompanying popt source distributions, available from 
+   file accompanying popt source distributions, available from
    ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
@@ -49,8 +49,8 @@ int poptDupArgv(int argc, const char **argv,
 	nb += strlen(argv[i]) + 1;
     }
 #endif
-	
-    dst = xmalloc(nb);
+
+    dst = (char*) xmalloc(nb);
 assert(dst);	/* XXX can't happen */
     if (dst == NULL)
 	return POPT_ERROR_MALLOC;
@@ -85,7 +85,7 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
     const char * se;
     char quote = '\0';
     size_t argvAlloced = POPT_ARGV_ARRAY_GROW_DELTA;
-    const char ** argv = xmalloc(sizeof(*argv) * argvAlloced);
+    const char ** argv = (const char**) xmalloc(sizeof(*argv) * argvAlloced);
     int argc = 0;
     size_t ns = strlen(s);
     char * t = NULL;
@@ -95,7 +95,7 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
 assert(argv);	/* XXX can't happen */
     if (argv == NULL) return rc;
 
-    te = t = xcalloc((size_t)1, ns + 1);
+    te = t = (char*) xcalloc((size_t)1, ns + 1);
 assert(te);	/* XXX can't happen */
     if (te == NULL) {
 	argv = _free(argv);
@@ -121,7 +121,7 @@ assert(te);	/* XXX can't happen */
 		te++, argc++;
 		if (argc == argvAlloced) {
 		    argvAlloced += POPT_ARGV_ARRAY_GROW_DELTA;
-		    argv = xrealloc(argv, sizeof(*argv) * argvAlloced);
+		    argv = (const char**) xrealloc(argv, sizeof(*argv) * argvAlloced);
 assert(argv);	/* XXX can't happen */
 		    if (argv == NULL) goto exit;
 		}
@@ -167,7 +167,7 @@ int poptConfigFileToString(FILE *fp, char ** argstrp,
 		/*@unused@*/ UNUSED(int flags))
 {
     size_t nline = 8192;	/* XXX configurable? */
-    char * line = alloca(nline);
+    char * line = (char*) alloca(nline);
     char * argstr;
     char * q;
     char * x;
@@ -185,7 +185,7 @@ int poptConfigFileToString(FILE *fp, char ** argstrp,
     if (fp == NULL)
 	return POPT_ERROR_NULLARG;
 
-    argstr = xmalloc(maxargvlen * sizeof(*argstr));
+    argstr = (char*) xmalloc(maxargvlen * sizeof(*argstr));
 assert(argstr);	/* XXX can't happen */
     if (argstr == NULL) return POPT_ERROR_MALLOC;
     argstr[0] = '\0';
@@ -223,7 +223,7 @@ assert(argstr);	/* XXX can't happen */
 	    argvlen += (t = (size_t)(q - l)) + (sizeof(" --")-1);
 	    if (argvlen >= maxargvlen) {
 		maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2;
-		argstr = xrealloc(argstr, maxargvlen);
+		argstr = (char*) xrealloc(argstr, maxargvlen);
 assert(argstr);	/* XXX can't happen */
 		if (argstr == NULL) return POPT_ERROR_MALLOC;
 	    }
@@ -233,7 +233,7 @@ assert(argstr);	/* XXX can't happen */
 	}
 	if (*q != '=')
 	    continue;	/* XXX for now, silently ignore bogus line */
-		
+
 	/* *q is an equal sign. */
 	*q++ = '\0';
 
@@ -253,7 +253,7 @@ assert(argstr);	/* XXX can't happen */
 	argvlen += t + (sizeof("' --='")-1);
 	if (argvlen >= maxargvlen) {
 	    maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2;
-	    argstr = xrealloc(argstr, maxargvlen);
+	    argstr = (char*) xrealloc(argstr, maxargvlen);
 assert(argstr);	/* XXX can't happen */
 	    if (argstr == NULL) return POPT_ERROR_MALLOC;
 	}