diff --git a/ChangeLog b/ChangeLog
index 294e147396..d0df82dfeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2006-04-01  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+	  clean up, use AS_VERSION and AS_NANO
+	* gst/matroska/matroska-mux.c: (gst_matroska_mux_start):
+	  use PACKAGE_VERSION define
+	* po/af.po:
+	* po/az.po:
+	* po/cs.po:
+	* po/en_GB.po:
+	* po/hu.po:
+	* po/it.po:
+	* po/nb.po:
+	* po/nl.po:
+	* po/or.po:
+	* po/sq.po:
+	* po/sr.po:
+	* po/sv.po:
+	* po/uk.po:
+	* po/vi.po:
+	  updated
+
 2006-03-31  Sebastien Moutte  <sebastien@moutte.net>
 
 	* ext\jpeg\smokecodec.c:
diff --git a/common b/common
index c18b429f2a..e430cd53b0 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit c18b429f2a3698b6fc5e849a637aa0c8b91e82b9
+Subproject commit e430cd53b02f6d37da6200ac81c89c588f99b089
diff --git a/configure.ac b/configure.ac
index 1cb417fbbd..35f4418131 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,20 @@
 AC_PREREQ(2.52)
 
 dnl initialize autoconf
-dnl we don't specify PACKAGE and VERSION because AS_VERSION puts it together
-AC_INIT
-
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(gst-plugins-good, GST_PLUGINS_GOOD_VERSION, 0, 10, 2, 1,
-    GST_CVS="no", GST_CVS="yes")
+AC_INIT(GStreamer Good Plug-ins, 0.10.2.1,
+    http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
+    gst-plugins-good)
+
+dnl initialize automake
+AM_INIT_AUTOMAKE
+
+dnl define PACKAGE_VERSION_* variables
+AS_VERSION
+
+dnl check if this is a release version
+AS_NANO(GST_CVS="no", GST_CVS="yes")
 
 dnl can autoconf find the source ?
 AC_CONFIG_SRCDIR([gst/law/alaw.c])
@@ -21,13 +28,8 @@ AM_MAINTAINER_MODE
 dnl sets host_* variables
 AC_CANONICAL_HOST
 
-dnl initialize automake
-dnl FIXME: this is deprecated use, we should move PACKAGE and VERSION to
-dnl AC_INIT, but then we need to parse the version to pass to AS_VERSION
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-
 dnl our libraries and install dirs use major.minor as a version
-GST_MAJORMINOR=$GST_PLUGINS_GOOD_VERSION_MAJOR.$GST_PLUGINS_GOOD_VERSION_MINOR
+GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR
 dnl we override it here if we need to for the release candidate of new series
 GST_MAJORMINOR=0.10
 AC_SUBST(GST_MAJORMINOR)
@@ -63,7 +65,7 @@ GST_ARG_GCOV
 GST_ARG_EXAMPLES
 
 GST_ARG_WITH_PKG_CONFIG_PATH
-GST_ARG_WITH_PACKAGE_NAME([GStreamer Good Plug-ins])
+GST_ARG_WITH_PACKAGE_NAME
 GST_ARG_WITH_PACKAGE_ORIGIN
 
 dnl these are all the gst plug-ins, compilable without additional libs
@@ -113,6 +115,7 @@ AC_ARG_WITH(plugins,
 
 dnl disable gst plugins we might not be able to build on this
 dnl platform: udp and rtsp (ugly but minimally invasive)
+dnl FIXME: maybe move to sys
 AC_CHECK_HEADERS([sys/socket.h], HAVE_SYS_SOCKET_H=yes)
 AM_CONDITIONAL(HAVE_SYS_SOCKET_H, test "x$HAVE_SYS_SOCKET_H" = "xyes")
 
@@ -145,8 +148,6 @@ dnl common/m4/gst-arch.m4
 dnl check CPU type
 GST_ARCH
 
-AC_SUBST(GST_CTRL_LIBS)
-
 dnl Determine endianness
 AC_C_BIGENDIAN
 
@@ -177,6 +178,8 @@ dnl check for documentation tools
 GTK_DOC_CHECK([1.3])
 AS_PATH_PYTHON([2.1])
 
+dnl *** checks for libraries ***
+
 dnl *** checks for header files ***
 
 dnl check if we have ANSI C header files
@@ -187,9 +190,13 @@ AC_CHECK_HEADERS([netinet/in.h])
 AC_CHECK_HEADERS([winsock2.h])
 AM_CONDITIONAL(HAVE_WINSOCK2_H, test "x$HAVE_WINSOCK2_H" = "xyes")
 
+dnl *** checks for types/defines ***
+
 dnl Check for FIONREAD ioctl declaration.  This check is needed
 dnl for the UDP plugin to build on Solaris 
-GST_CHECK_FIONREAD()
+GST_CHECK_FIONREAD
+
+dnl *** checks for structures ***
 
 dnl *** checks for compiler characteristics ***
 
@@ -688,15 +695,4 @@ gst-plugins-good.spec
 )
 AC_OUTPUT
 
-echo "configure: *** Core plug-ins, always built:"
-( for i in $GST_PLUGINS_ALL; do echo -e '\t'$i; done ) | sort
-echo
-echo -n "configure: *** Plug-ins relying on libraries that will be built:"
-echo -e "$GST_PLUGINS_YES" | sort
-echo
-echo -n "configure: *** Plug-ins relying on libraries that will NOT be built:"
-echo -e "$GST_PLUGINS_NO" | sort
-echo
-if test "x$BUILD_EXTERNAL" = "xno"; then
-  echo "configure: *** No external plug-ins will be built"
-fi
+GST_OUTPUT_PLUGINS
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index cb56c29120..b19793cd3b 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -1068,7 +1068,7 @@ gst_matroska_mux_start (GstMatroskaMux * mux)
   gst_ebml_write_float (ebml, GST_MATROSKA_ID_DURATION,
       duration / gst_guint64_to_gdouble (mux->time_scale));
   gst_ebml_write_utf8 (ebml, GST_MATROSKA_ID_MUXINGAPP,
-      "GStreamer plugin version " GST_PLUGINS_GOOD_VERSION);
+      "GStreamer plugin version " PACKAGE_VERSION);
   if (mux->writing_app && mux->writing_app[0]) {
     gst_ebml_write_utf8 (ebml, GST_MATROSKA_ID_WRITINGAPP, mux->writing_app);
   }
diff --git a/po/af.po b/po/af.po
index 370ebcb06f..91f5d96750 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 19:58+0100\n"
+"POT-Creation-Date: 2006-03-17 16:42+0100\n"
 "PO-Revision-Date: 2004-03-18 14:16+0200\n"
 "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
 "Language-Team: Afrikaans <i18n@af.org.za>\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:438
-#: gst/wavparse/gstwavparse.c:1149
+#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:458
+#: gst/wavparse/gstwavparse.c:1231
 msgid "Internal data stream error."
 msgstr ""
 
-#: gst/avi/gstavimux.c:1009
+#: gst/avi/gstavimux.c:1019
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Geen of ongeldige klanktoevoer, AVI-stroom sal korrup wees."
 
diff --git a/po/az.po b/po/az.po
index 4423681e36..e8b3556276 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins-0.8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 19:58+0100\n"
+"POT-Creation-Date: 2006-03-17 16:42+0100\n"
 "PO-Revision-Date: 2004-03-19 18:29+0200\n"
 "Last-Translator: Metin Amiroff <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:438
-#: gst/wavparse/gstwavparse.c:1149
+#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:458
+#: gst/wavparse/gstwavparse.c:1231
 msgid "Internal data stream error."
 msgstr ""
 
-#: gst/avi/gstavimux.c:1009
+#: gst/avi/gstavimux.c:1019
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Səhv ya da olmayan audio girişi, AVI yayımı pozulacaqdır."
 
diff --git a/po/cs.po b/po/cs.po
index cf649c5889..0138581a3a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 19:58+0100\n"
+"POT-Creation-Date: 2006-03-17 16:42+0100\n"
 "PO-Revision-Date: 2004-08-08 22:58+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:438
-#: gst/wavparse/gstwavparse.c:1149
+#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:458
+#: gst/wavparse/gstwavparse.c:1231
 msgid "Internal data stream error."
 msgstr ""
 
-#: gst/avi/gstavimux.c:1009
+#: gst/avi/gstavimux.c:1019
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Žádný nebo neplatný vstup zvuku, proud AVI bude poškozen."
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 8f5fb82c08..8a6ae19553 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 19:58+0100\n"
+"POT-Creation-Date: 2006-03-17 16:42+0100\n"
 "PO-Revision-Date: 2004-04-26 10:41-0400\n"
 "Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
 "Language-Team: English (British) <en_gb@li.org>\n"
@@ -14,12 +14,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:438
-#: gst/wavparse/gstwavparse.c:1149
+#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:458
+#: gst/wavparse/gstwavparse.c:1231
 msgid "Internal data stream error."
 msgstr ""
 
-#: gst/avi/gstavimux.c:1009
+#: gst/avi/gstavimux.c:1019
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "No or invalid input audio, AVI stream will be corrupt."
 
diff --git a/po/hu.po b/po/hu.po
index 1b310da82c..91bdc427cc 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 19:58+0100\n"
+"POT-Creation-Date: 2006-03-17 16:42+0100\n"
 "PO-Revision-Date: 2004-07-18 11:03+0200\n"
 "Last-Translator: Laszlo Dvornik <dvornik@invitel.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -14,12 +14,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:438
-#: gst/wavparse/gstwavparse.c:1149
+#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:458
+#: gst/wavparse/gstwavparse.c:1231
 msgid "Internal data stream error."
 msgstr ""
 
-#: gst/avi/gstavimux.c:1009
+#: gst/avi/gstavimux.c:1019
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Nincs vagy érvénytelen bemeneti hang, az AVI-folyam sérült lesz."
 
diff --git a/po/it.po b/po/it.po
index f3905e7c91..24e9147116 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 19:58+0100\n"
+"POT-Creation-Date: 2006-03-17 16:42+0100\n"
 "PO-Revision-Date: 2004-11-07 19:11+0100\n"
 "Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:438
-#: gst/wavparse/gstwavparse.c:1149
+#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:458
+#: gst/wavparse/gstwavparse.c:1231
 msgid "Internal data stream error."
 msgstr ""
 
-#: gst/avi/gstavimux.c:1009
+#: gst/avi/gstavimux.c:1019
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Ingresso audio assente o non valido. Lo stream AVI risulterà corrotto."
 
diff --git a/po/nb.po b/po/nb.po
index fc6e27f06c..1cb6d20cea 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 19:58+0100\n"
+"POT-Creation-Date: 2006-03-17 16:42+0100\n"
 "PO-Revision-Date: 2004-10-04 15:54+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@broadpark.no>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -14,12 +14,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:438
-#: gst/wavparse/gstwavparse.c:1149
+#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:458
+#: gst/wavparse/gstwavparse.c:1231
 msgid "Internal data stream error."
 msgstr ""
 
-#: gst/avi/gstavimux.c:1009
+#: gst/avi/gstavimux.c:1019
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 1afdb6b6df..9e6768f837 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 19:58+0100\n"
+"POT-Creation-Date: 2006-03-17 16:42+0100\n"
 "PO-Revision-Date: 2004-08-05 16:26+0200\n"
 "Last-Translator: Elros Cyriatan <cyriatan@fastmail.fm>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:438
-#: gst/wavparse/gstwavparse.c:1149
+#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:458
+#: gst/wavparse/gstwavparse.c:1231
 msgid "Internal data stream error."
 msgstr ""
 
-#: gst/avi/gstavimux.c:1009
+#: gst/avi/gstavimux.c:1019
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Geen of ongeldig invoergeluid, AVI-stroom zal slecht zijn."
 
diff --git a/po/or.po b/po/or.po
index 63fd8ce1af..a9e480bdc4 100644
--- a/po/or.po
+++ b/po/or.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2004, Free Software Foundation, Inc.
 # This file is distributed under the same license as the gst-plugins-0.8.3 package.
 # Gora Mohanty <gora_mohanty@yahoo.co.in>, 2004.
-# $Id: or.po,v 1.20 2006/02/08 17:35:05 thaytan Exp $
+# $Id: or.po,v 1.21 2006/02/25 19:07:41 dolphy Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins-0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 19:58+0100\n"
+"POT-Creation-Date: 2006-03-17 16:42+0100\n"
 "PO-Revision-Date: 2004-09-27 13:32+0530\n"
 "Last-Translator: Gora Mohanty <gora_mohanty@yahoo.co.in>\n"
 "Language-Team: Oriya <gora_mohanty@yahoo.co.in>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:438
-#: gst/wavparse/gstwavparse.c:1149
+#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:458
+#: gst/wavparse/gstwavparse.c:1231
 msgid "Internal data stream error."
 msgstr ""
 
-#: gst/avi/gstavimux.c:1009
+#: gst/avi/gstavimux.c:1019
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "ନିବେଶ ଧ୍ବନି ନାହିଁ ବା ଅବୈଧ ଅଛି. ଏ.ଭି.ଆଇ. ଧାରା ଭ୍ରଷ୍ଟ ହୋଇଯିବ."
 
diff --git a/po/sq.po b/po/sq.po
index 148c0e0b44..053e646dc4 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 19:58+0100\n"
+"POT-Creation-Date: 2006-03-17 16:42+0100\n"
 "PO-Revision-Date: 2004-08-07 20:29+0200\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: Albanian <begraj@hotmail.com>\n"
@@ -14,12 +14,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:438
-#: gst/wavparse/gstwavparse.c:1149
+#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:458
+#: gst/wavparse/gstwavparse.c:1231
 msgid "Internal data stream error."
 msgstr ""
 
-#: gst/avi/gstavimux.c:1009
+#: gst/avi/gstavimux.c:1019
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Input audio i gabuar ose mungon, stream AVI mund të jetë i dëmtuar."
 
diff --git a/po/sr.po b/po/sr.po
index 5fcaefd44d..599fdda337 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 19:58+0100\n"
+"POT-Creation-Date: 2006-03-17 16:42+0100\n"
 "PO-Revision-Date: 2004-03-13 00:18+0100\n"
 "Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
 "Language-Team: Serbian <gnu@prevod.org>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :  (n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:438
-#: gst/wavparse/gstwavparse.c:1149
+#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:458
+#: gst/wavparse/gstwavparse.c:1231
 msgid "Internal data stream error."
 msgstr ""
 
-#: gst/avi/gstavimux.c:1009
+#: gst/avi/gstavimux.c:1019
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Улазног звука нема или је неисправан, АВИ ток ће бити искварен."
 
diff --git a/po/sv.po b/po/sv.po
index 136abe3942..977aed6318 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 19:58+0100\n"
+"POT-Creation-Date: 2006-03-17 16:42+0100\n"
 "PO-Revision-Date: 2004-08-03 20:53+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:438
-#: gst/wavparse/gstwavparse.c:1149
+#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:458
+#: gst/wavparse/gstwavparse.c:1231
 msgid "Internal data stream error."
 msgstr ""
 
-#: gst/avi/gstavimux.c:1009
+#: gst/avi/gstavimux.c:1019
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Inget eller ogiltigt inljud. AVI-flödet kommer att skadas."
 
diff --git a/po/uk.po b/po/uk.po
index 301558929e..ed4bb31de7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 19:58+0100\n"
+"POT-Creation-Date: 2006-03-17 16:42+0100\n"
 "PO-Revision-Date: 2004-08-03 15:40+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -15,12 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:438
-#: gst/wavparse/gstwavparse.c:1149
+#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:458
+#: gst/wavparse/gstwavparse.c:1231
 msgid "Internal data stream error."
 msgstr ""
 
-#: gst/avi/gstavimux.c:1009
+#: gst/avi/gstavimux.c:1019
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr "Відсутній або неправильний вхід звуку, AVI потік буде пошкоджений."
 
diff --git a/po/vi.po b/po/vi.po
index aa0dbacc15..61e68352c6 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins-0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 19:58+0100\n"
+"POT-Creation-Date: 2006-03-17 16:42+0100\n"
 "PO-Revision-Date: 2005-01-22 17:17+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net> \n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:438
-#: gst/wavparse/gstwavparse.c:1149
+#: ext/libpng/gstpngdec.c:275 ext/libpng/gstpngdec.c:458
+#: gst/wavparse/gstwavparse.c:1231
 msgid "Internal data stream error."
 msgstr ""
 
-#: gst/avi/gstavimux.c:1009
+#: gst/avi/gstavimux.c:1019
 msgid "No or invalid input audio, AVI stream will be corrupt."
 msgstr ""
 "Chưa có dữ liệu âm thanh nhập, hoặc dữ liệu âm thanh nhập không hợp lệ. Sẽ "