Merge branch 'master' into 0.11

Conflicts:
	ext/a52dec/gsta52dec.c
	ext/a52dec/gsta52dec.h
	ext/lame/gstlame.c
	ext/lame/gstlame.h
	ext/lame/gstlamemp3enc.c
	ext/mad/gstmad.c
	ext/mad/gstmad.h
	gst/mpegaudioparse/gstmpegaudioparse.c
	gst/mpegstream/gstdvddemux.c
	gst/realmedia/rdtdepay.c
	po/es.po
	po/lv.po
	po/sr.po

2 files changed, 77 insertions, 1 deletions

diff --git a/po/LINGUAS b/po/LINGUAS
index 41a20ce6..f1763268 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-af az bg ca cs da de el en_GB es eu fi fr gl hu id it ja lt lv ms mt nb nl or pl pt_BR ro ru sk sl sq sr sv tr uk vi zh_CN
+af az bg ca cs da de el en_GB eo es eu fi fr gl hu id it ja lt lv ms mt nb nl or pl pt_BR ro ru sk sl sq sr sv tr uk vi zh_CN
diff --git a/po/eo.po b/po/eo.po
new file mode 100644
index 00000000..774cfc8d
--- /dev/null
+++ b/po/eo.po
@@ -0,0 +1,76 @@
+# Esperanto translation for gst-plugins-ugly.
+# Copyright (C) 2011 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gst-plugins-ugly package.
+# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gst-plugins-ugly 0.10.17.2\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
+"POT-Creation-Date: 2011-12-10 15:17+0000\n"
+"PO-Revision-Date: 2011-06-04 22:24+0200\n"
+"Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.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"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+msgid "Could not read from CD."
+msgstr "Ne eblis legi de la KD."
+
+msgid "Could not open CD device for reading."
+msgstr "Ne eblis malfermi la KD-aparaton por legi."
+
+msgid "Disc is not an Audio CD."
+msgstr "La disko ne estas son-KD."
+
+msgid "Could not open DVD"
+msgstr "Ne eblis malfermi la DVD-n"
+
+#, c-format
+msgid "Could not open DVD title %d"
+msgstr "Ne eblis malfermi la titolon \"%d\" de la DVD"
+
+#, c-format
+msgid "Failed to go to chapter %d of DVD title %d"
+msgstr "Fiaksi iri al la ĉapitro %d de la DVD-titolo %d"
+
+#, c-format
+msgid ""
+"Could not open DVD title %d. Interactive titles are not supported by this "
+"element"
+msgstr ""
+"Ne eblis malfermi la DVD-titolon \"%d\". Interagaj titoloj ne estas "
+"suptenata de tiu elemento"
+
+msgid ""
+"Could not read DVD. This may be because the DVD is encrypted and a DVD "
+"decryption library is not installed."
+msgstr ""
+"Ne eblis legi la DVD-n. Eble la DVD estas ĉifrita sed biblioteko por DVD-"
+"malĉifrado ne estas instalite."
+
+msgid "Could not read DVD."
+msgstr "Ne eblis legi la DVD-n."
+
+msgid "Failed to configure LAME encoder. Check your encoding parameters."
+msgstr "Fiaskis agordi la LAME-kodilon. Kontrolu viajn kodad-parametrojn."
+
+#, c-format
+msgid ""
+"The requested bitrate %d kbit/s for property '%s' is not allowed. The "
+"bitrate was changed to %d kbit/s."
+msgstr ""
+"La petita bitrapido je %d kBit/s ne estas permesata por la atributo \"%s\". "
+"La bitrapido estas ŝanĝite al %d kBit/s."
+
+msgid "Failed to configure TwoLAME encoder. Check your encoding parameters."
+msgstr "Fiaskis agordi la TwoLAME-kodilon. Kontrolu viajn kodad-parametrojn."
+
+msgid "This stream contains no data."
+msgstr "Tiu fluo enhavas neniun datumon."
+
+msgid "Internal data stream error."
+msgstr "Interna datum-flu-eraro."