mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 04:01:08 +00:00
Merge branch 'master' into 0.11
Conflicts: configure.ac gst/gstbus.c
This commit is contained in:
Sebastian Dröge
commit
5fe9bcd989
12 changed files with 61 additions and 81 deletions
|
|
@ -3,7 +3,7 @@
|
|||
<description>standard GStreamer elements</description>
|
||||
<filename>../../plugins/elements/.libs/libgstcoreelements.so</filename>
|
||||
<basename>libgstcoreelements.so</basename>
|
||||
<version>0.10.32.2</version>
|
||||
<version>0.10.32.4</version>
|
||||
<license>LGPL</license>
|
||||
<source>gstreamer</source>
|
||||
<package>GStreamer prerelease</package>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<description>GStreamer core indexers</description>
|
||||
<filename>../../plugins/indexers/.libs/libgstcoreindexers.so</filename>
|
||||
<basename>libgstcoreindexers.so</basename>
|
||||
<version>0.10.32.2</version>
|
||||
<version>0.10.32.4</version>
|
||||
<license>LGPL</license>
|
||||
<source>gstreamer</source>
|
||||
<package>GStreamer prerelease</package>
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
<plugin>
|
||||
<name>staticelements</name> <description>core elements linked into the GStreamer library</description> <filename></filename> <basename></basename> <version>0.10.29.1</version> <license>LGPL</license> <source>gstreamer</source> <package>GStreamer git</package> <origin>Unknown package origin</origin> <elements>
|
||||
<element>
|
||||
<name>bin</name> <longname>Generic bin</longname> <class>Generic/Bin</class> <description>Simple container object</description> <author>Erik Walthinsen <omega@cse.ogi.edu>,Wim Taymans <wim.taymans@gmail.com></author> <pads>
|
||||
</pads>
|
||||
</element>
|
||||
<element>
|
||||
<name>pipeline</name> <longname>Pipeline object</longname> <class>Generic/Bin</class> <description>Complete pipeline object</description> <author>Erik Walthinsen <omega@cse.ogi.edu>, Wim Taymans <wim@fluendo.com></author> <pads>
|
||||
</pads>
|
||||
</element>
|
||||
</elements>
|
||||
</plugin>
|
||||
|
|
@ -26,6 +26,7 @@
|
|||
|
||||
#include <glib-object.h>
|
||||
#include <gst/gstobject.h>
|
||||
#include <gst/gstplugin.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
|
|
|||
23
po/bg.po
23
po/bg.po
|
|
@ -1,15 +1,15 @@
|
|||
# Bulgarian translation of gstreamer.
|
||||
# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software Fondation, Inc.
|
||||
# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Fondation, Inc.
|
||||
# This file is distributed under the same license as the gstreamer package.
|
||||
# Alexander Shopov <ash@contact.bg>, 2005, 2006, 2007, 2008, 2009, 2010.
|
||||
# Alexander Shopov <ash@contact.bg>, 2005, 2006, 2007, 2008, 2009, 2010, 2011.
|
||||
#
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gstreamer 0.10.30.3\n"
|
||||
"Project-Id-Version: gstreamer 0.10.32.2\n"
|
||||
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
|
||||
"POT-Creation-Date: 2011-04-16 14:53+0100\n"
|
||||
"PO-Revision-Date: 2010-11-04 14:22+0200\n"
|
||||
"POT-Creation-Date: 2011-04-27 11:27+0100\n"
|
||||
"PO-Revision-Date: 2011-04-26 22:40+0300\n"
|
||||
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
|
||||
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
|
||||
"Language: bg\n"
|
||||
|
|
@ -109,8 +109,8 @@ msgid ""
|
|||
"GStreamer error: state change failed and some element failed to post a "
|
||||
"proper error message with the reason for the failure."
|
||||
msgstr ""
|
||||
"Грешка на GStreamer: неуспех при промяната на състоянието, а някой от "
|
||||
"елементите пропусна да подаде съобщение за грешка с причината за това."
|
||||
"Грешка на GStreamer: неуспешна промяна на състоянието, а някой от елементите "
|
||||
"пропусна да подаде съобщение за грешка с причината за това."
|
||||
|
||||
msgid "Internal GStreamer error: pad problem."
|
||||
msgstr "Вътрешна грешка на GStreamer: проблем в допълването."
|
||||
|
|
@ -406,12 +406,11 @@ msgstr "адрес за авторски права"
|
|||
msgid "URI to the copyright notice of the data"
|
||||
msgstr "адрес на означението на авторските права на данните"
|
||||
|
||||
#, fuzzy
|
||||
msgid "encoded by"
|
||||
msgstr "кодер"
|
||||
msgstr "кодирано от"
|
||||
|
||||
msgid "name of the encoding person or organization"
|
||||
msgstr ""
|
||||
msgstr "име на човека или организацията извършващи кодирането"
|
||||
|
||||
msgid "contact"
|
||||
msgstr "контакт"
|
||||
|
|
@ -1056,7 +1055,7 @@ msgid "WARNING: element named '%s' not found.\n"
|
|||
msgstr "ПРЕДУПРЕЖДЕНИЕ: елементът на име „%s“ не е открит.\n"
|
||||
|
||||
msgid "Index statistics"
|
||||
msgstr ""
|
||||
msgstr "Статистика на индекса"
|
||||
|
||||
#, c-format
|
||||
msgid "Got message #%u from element \"%s\" (%s): "
|
||||
|
|
@ -1167,7 +1166,7 @@ msgstr ""
|
|||
"Принудително извеждане на EOS за източниците преди спирането на конвейера"
|
||||
|
||||
msgid "Gather and print index statistics"
|
||||
msgstr ""
|
||||
msgstr "Събиране и показване на статистика за индекса"
|
||||
|
||||
#, c-format
|
||||
msgid "ERROR: pipeline could not be constructed: %s.\n"
|
||||
|
|
|
|||
17
po/de.po
17
po/de.po
|
|
@ -3,14 +3,14 @@
|
|||
# This file is distributed under the same license as the gstreamer package.
|
||||
#
|
||||
# Roland Illig <roland.illig@gmx.de>, 2004.
|
||||
# Christian Kirbach <christian.kirbach@googlemail.com>, 2009, 2010.
|
||||
# Christian Kirbach <christian.kirbach@googlemail.com>, 2009, 2010, 2011.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gstreamer 0.10.30.3\n"
|
||||
"Project-Id-Version: gstreamer 0.10.32.2\n"
|
||||
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
|
||||
"POT-Creation-Date: 2011-04-16 14:53+0100\n"
|
||||
"PO-Revision-Date: 2010-10-25 00:05+0200\n"
|
||||
"POT-Creation-Date: 2011-04-30 15:35+0100\n"
|
||||
"PO-Revision-Date: 2011-04-27 23:44+0200\n"
|
||||
"Last-Translator: Christian Kirbach <christian.kirbach@googlemail.com>\n"
|
||||
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
|
||||
"Language: de\n"
|
||||
|
|
@ -420,12 +420,11 @@ msgstr "Copyright-URI"
|
|||
msgid "URI to the copyright notice of the data"
|
||||
msgstr "URI zu der Copyrightangabe der Daten"
|
||||
|
||||
#, fuzzy
|
||||
msgid "encoded by"
|
||||
msgstr "Codierer"
|
||||
msgstr "codiert durch"
|
||||
|
||||
msgid "name of the encoding person or organization"
|
||||
msgstr ""
|
||||
msgstr "Der Name der codierenden Person oder Organisation"
|
||||
|
||||
msgid "contact"
|
||||
msgstr "Kontakt"
|
||||
|
|
@ -1076,7 +1075,7 @@ msgid "WARNING: element named '%s' not found.\n"
|
|||
msgstr "WARNUNG: Element namens »%s« nicht gefunden.\n"
|
||||
|
||||
msgid "Index statistics"
|
||||
msgstr ""
|
||||
msgstr "Index-Statistiken"
|
||||
|
||||
#, c-format
|
||||
msgid "Got message #%u from element \"%s\" (%s): "
|
||||
|
|
@ -1188,7 +1187,7 @@ msgid "Force EOS on sources before shutting the pipeline down"
|
|||
msgstr "EOS auf Quelle vor dem Beenden der Leitung erzwingen"
|
||||
|
||||
msgid "Gather and print index statistics"
|
||||
msgstr ""
|
||||
msgstr "Index-Statistiken sammeln und ausgeben"
|
||||
|
||||
#, c-format
|
||||
msgid "ERROR: pipeline could not be constructed: %s.\n"
|
||||
|
|
|
|||
19
po/fr.po
19
po/fr.po
|
|
@ -1,16 +1,16 @@
|
|||
# Translation of GStreamer to French
|
||||
# Copyright (C) 2003-2010 GStreamer core team
|
||||
# Copyright (C) 2003-2011 GStreamer core team
|
||||
# This file is distributed under the same license as the gstreamer package.
|
||||
#
|
||||
# Thomas Vander Stichele <thomas@apestaart.org>, 2004.
|
||||
# Claude Paroz <claude@2xlibre.net>, 2008-2010.
|
||||
# Claude Paroz <claude@2xlibre.net>, 2008-2011.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gstreamer 0.10.30.3\n"
|
||||
"Project-Id-Version: gstreamer 0.10.32.2\n"
|
||||
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
|
||||
"POT-Creation-Date: 2011-04-16 14:53+0100\n"
|
||||
"PO-Revision-Date: 2010-10-27 08:47+0200\n"
|
||||
"POT-Creation-Date: 2011-04-30 15:35+0100\n"
|
||||
"PO-Revision-Date: 2011-04-28 09:34+0200\n"
|
||||
"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
|
||||
"Language-Team: French <traduc@traduc.org>\n"
|
||||
"Language: fr\n"
|
||||
|
|
@ -407,12 +407,11 @@ msgstr "URI du copyright"
|
|||
msgid "URI to the copyright notice of the data"
|
||||
msgstr "URI vers l'information de copyright des données"
|
||||
|
||||
#, fuzzy
|
||||
msgid "encoded by"
|
||||
msgstr "codeur"
|
||||
msgstr "codé par"
|
||||
|
||||
msgid "name of the encoding person or organization"
|
||||
msgstr ""
|
||||
msgstr "nom de la personne ou de l'organisation qui a effectué le codage"
|
||||
|
||||
msgid "contact"
|
||||
msgstr "contact"
|
||||
|
|
@ -1063,7 +1062,7 @@ msgid "WARNING: element named '%s' not found.\n"
|
|||
msgstr "AVERTISSEMENT : l'élément nommé « %s » est introuvable.\n"
|
||||
|
||||
msgid "Index statistics"
|
||||
msgstr ""
|
||||
msgstr "Statistiques d'index"
|
||||
|
||||
#, c-format
|
||||
msgid "Got message #%u from element \"%s\" (%s): "
|
||||
|
|
@ -1171,7 +1170,7 @@ msgid "Force EOS on sources before shutting the pipeline down"
|
|||
msgstr "Force l'EOS sur les sources avant de fermer le pipeline"
|
||||
|
||||
msgid "Gather and print index statistics"
|
||||
msgstr ""
|
||||
msgstr "Rassemble et affiche les statistiques d'index"
|
||||
|
||||
#, c-format
|
||||
msgid "ERROR: pipeline could not be constructed: %s.\n"
|
||||
|
|
|
|||
19
po/nl.po
19
po/nl.po
|
|
@ -1,17 +1,17 @@
|
|||
# translation of gstreamer-0.10.30.3.po to Dutch
|
||||
# translation of gstreamer-0.10.32.2.po to Dutch
|
||||
# Dutch translation of gstreamer
|
||||
# Copyright (C) 2003-2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
|
||||
# This file is distributed under the same license as the gstreamer package.
|
||||
#
|
||||
# Thomas Vander Stichele <thomas@apestaart.org>, 2004.
|
||||
# Taco Witte <tcwitte@cs.uu.nl>, 2006.
|
||||
# Freek de Kruijf <f.de.kruijf@gmail.com>, 2007, 2008, 2009, 2010.
|
||||
# Freek de Kruijf <f.de.kruijf@gmail.com>, 2007, 2008, 2009, 2010, 2011.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gstreamer 0.10.30.3\n"
|
||||
"Project-Id-Version: gstreamer 0.10.32.2\n"
|
||||
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
|
||||
"POT-Creation-Date: 2011-04-16 14:53+0100\n"
|
||||
"PO-Revision-Date: 2010-10-25 19:10+0200\n"
|
||||
"POT-Creation-Date: 2011-04-27 11:27+0100\n"
|
||||
"PO-Revision-Date: 2011-04-26 23:10+0200\n"
|
||||
"Last-Translator: Freek de Kruijf <f.de.kruijf@gmail.com>\n"
|
||||
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
|
||||
"Language: nl\n"
|
||||
|
|
@ -410,12 +410,11 @@ msgstr "auteursrecht-uri"
|
|||
msgid "URI to the copyright notice of the data"
|
||||
msgstr "URI naar de auteursrechtvermelding van de gegevens"
|
||||
|
||||
#, fuzzy
|
||||
msgid "encoded by"
|
||||
msgstr "encoder"
|
||||
msgstr "gecodeerd door"
|
||||
|
||||
msgid "name of the encoding person or organization"
|
||||
msgstr ""
|
||||
msgstr "naam van de coderende persoon of organisatie"
|
||||
|
||||
msgid "contact"
|
||||
msgstr "contact"
|
||||
|
|
@ -1064,7 +1063,7 @@ msgid "WARNING: element named '%s' not found.\n"
|
|||
msgstr "WAARSCHUWING: element met naam '%s' niet gevonden.\n"
|
||||
|
||||
msgid "Index statistics"
|
||||
msgstr ""
|
||||
msgstr "Indexstatistieken"
|
||||
|
||||
#, c-format
|
||||
msgid "Got message #%u from element \"%s\" (%s): "
|
||||
|
|
@ -1172,7 +1171,7 @@ msgid "Force EOS on sources before shutting the pipeline down"
|
|||
msgstr "Forceer een EOS op de bron bij het afsluiten van de pijplijn"
|
||||
|
||||
msgid "Gather and print index statistics"
|
||||
msgstr ""
|
||||
msgstr "Verzamel en print indexstatistieken"
|
||||
|
||||
#, c-format
|
||||
msgid "ERROR: pipeline could not be constructed: %s.\n"
|
||||
|
|
|
|||
17
po/pl.po
17
po/pl.po
|
|
@ -1,13 +1,13 @@
|
|||
# Polish translation for gstreamer.
|
||||
# This file is distributed under the same license as the gstreamer package.
|
||||
# Jakub Bogusz <qboosh@pld-linux.org>, 2007-2010.
|
||||
# Jakub Bogusz <qboosh@pld-linux.org>, 2007-2011.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gstreamer 0.10.30.3\n"
|
||||
"Project-Id-Version: gstreamer 0.10.32.2\n"
|
||||
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
|
||||
"POT-Creation-Date: 2011-04-16 14:53+0100\n"
|
||||
"PO-Revision-Date: 2010-10-24 18:54+0200\n"
|
||||
"POT-Creation-Date: 2011-04-27 11:27+0100\n"
|
||||
"PO-Revision-Date: 2011-04-26 17:54+0200\n"
|
||||
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
|
||||
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
|
||||
"Language: pl\n"
|
||||
|
|
@ -403,12 +403,11 @@ msgstr "URI praw autorskich"
|
|||
msgid "URI to the copyright notice of the data"
|
||||
msgstr "URI do informacji o prawach autorskich do tych danych"
|
||||
|
||||
#, fuzzy
|
||||
msgid "encoded by"
|
||||
msgstr "koder"
|
||||
msgstr "kodujący"
|
||||
|
||||
msgid "name of the encoding person or organization"
|
||||
msgstr ""
|
||||
msgstr "nazwa osoby lub organizacji kodującej nagranie"
|
||||
|
||||
msgid "contact"
|
||||
msgstr "kontakt"
|
||||
|
|
@ -1058,7 +1057,7 @@ msgid "WARNING: element named '%s' not found.\n"
|
|||
msgstr "UWAGA: nie znaleziono elementu o nazwie '%s'.\n"
|
||||
|
||||
msgid "Index statistics"
|
||||
msgstr ""
|
||||
msgstr "Statystyki indeksu"
|
||||
|
||||
#, c-format
|
||||
msgid "Got message #%u from element \"%s\" (%s): "
|
||||
|
|
@ -1166,7 +1165,7 @@ msgid "Force EOS on sources before shutting the pipeline down"
|
|||
msgstr "Wymuszanie EOS na źródłach przed zamknięciem potoku"
|
||||
|
||||
msgid "Gather and print index statistics"
|
||||
msgstr ""
|
||||
msgstr "Zebranie i wypisanie statystyk indeksu"
|
||||
|
||||
#, c-format
|
||||
msgid "ERROR: pipeline could not be constructed: %s.\n"
|
||||
|
|
|
|||
20
po/ru.po
20
po/ru.po
|
|
@ -4,13 +4,13 @@
|
|||
# Peter Astakhov <astakhovp@mail.ru>, 2005.
|
||||
# Артём Попов <artfwo@gmail.com>, 2009.
|
||||
# Pavel Maryanov <acid_jack@ukr.net>, 2009.
|
||||
# Yuri Kozlov <yuray@komyakino.ru>, 2010.
|
||||
# Yuri Kozlov <yuray@komyakino.ru>, 2010, 2011.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gstreamer-0.10.30.3\n"
|
||||
"Project-Id-Version: gstreamer-0.10.32.2\n"
|
||||
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n"
|
||||
"POT-Creation-Date: 2011-04-16 14:53+0100\n"
|
||||
"PO-Revision-Date: 2010-10-25 14:54+0400\n"
|
||||
"POT-Creation-Date: 2011-04-27 11:27+0100\n"
|
||||
"PO-Revision-Date: 2011-04-26 20:25+0400\n"
|
||||
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
|
||||
"Language-Team: Russian <gnu@mx.ru>\n"
|
||||
"Language: ru\n"
|
||||
|
|
@ -406,12 +406,11 @@ msgstr "URI авторских прав"
|
|||
msgid "URI to the copyright notice of the data"
|
||||
msgstr "URI уведомления об авторских правах"
|
||||
|
||||
#, fuzzy
|
||||
msgid "encoded by"
|
||||
msgstr "кодировщик"
|
||||
msgstr "Кодирование выполнено"
|
||||
|
||||
msgid "name of the encoding person or organization"
|
||||
msgstr ""
|
||||
msgstr "Имя человека или название организации, выполнявшей кодировку"
|
||||
|
||||
msgid "contact"
|
||||
msgstr "контакт"
|
||||
|
|
@ -1058,7 +1057,7 @@ msgid "WARNING: element named '%s' not found.\n"
|
|||
msgstr "ПРЕДУПРЕЖДЕНИЕ: элемент с именем «%s» не найден.\n"
|
||||
|
||||
msgid "Index statistics"
|
||||
msgstr ""
|
||||
msgstr "Индексная статистика"
|
||||
|
||||
#, c-format
|
||||
msgid "Got message #%u from element \"%s\" (%s): "
|
||||
|
|
@ -1166,7 +1165,7 @@ msgid "Force EOS on sources before shutting the pipeline down"
|
|||
msgstr "Выдать EOS в источники перед закрытием конвейера"
|
||||
|
||||
msgid "Gather and print index statistics"
|
||||
msgstr ""
|
||||
msgstr "Собрать и вывести индексную статистику"
|
||||
|
||||
#, c-format
|
||||
msgid "ERROR: pipeline could not be constructed: %s.\n"
|
||||
|
|
@ -1287,9 +1286,6 @@ msgstr "Освобождение конвейера...\n"
|
|||
#~ msgid "Added path %s to %s \n"
|
||||
#~ msgstr "Добавлен путь %s к %s \n"
|
||||
|
||||
#~ msgid "Rebuilding %s (%s) ...\n"
|
||||
#~ msgstr "Перестариваю %s (%s) ...\n"
|
||||
|
||||
#~ msgid "Trying to load %s ...\n"
|
||||
#~ msgstr "Пытаюсь загрузить %s ...\n"
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
#define GST_PACKAGE_ORIGIN "Unknown package origin"
|
||||
|
||||
/* GStreamer package release date/time for plugins as YYYY-MM-DD */
|
||||
#define GST_PACKAGE_RELEASE_DATETIME "2011-04-16T12:48Z"
|
||||
#define GST_PACKAGE_RELEASE_DATETIME "2011-04-30T14:22Z"
|
||||
|
||||
/* location of the installed gst-plugin-scanner */
|
||||
#define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\gst-plugin-scanner"
|
||||
|
|
@ -340,7 +340,7 @@
|
|||
#define PACKAGE_NAME "GStreamer"
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#define PACKAGE_STRING "GStreamer 0.10.32.2"
|
||||
#define PACKAGE_STRING "GStreamer 0.10.32.4"
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#define PACKAGE_TARNAME "gstreamer"
|
||||
|
|
@ -349,7 +349,7 @@
|
|||
#undef PACKAGE_URL
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#define PACKAGE_VERSION "0.10.32.2"
|
||||
#define PACKAGE_VERSION "0.10.32.4"
|
||||
|
||||
/* directory where plugins are located */
|
||||
#ifdef _DEBUG
|
||||
|
|
@ -380,7 +380,7 @@
|
|||
#undef USE_POISONING
|
||||
|
||||
/* Version number of package */
|
||||
#define VERSION "0.10.32.2"
|
||||
#define VERSION "0.10.32.4"
|
||||
|
||||
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
|
||||
significant byte first (like Motorola and SPARC, unlike Intel). */
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ G_BEGIN_DECLS
|
|||
* The nano version of GStreamer at compile time:
|
||||
* Actual releases have 0, GIT versions have 1, prerelease versions have 2-...
|
||||
*/
|
||||
#define GST_VERSION_NANO (2)
|
||||
#define GST_VERSION_NANO (4)
|
||||
|
||||
/**
|
||||
* GST_CHECK_VERSION:
|
||||
|
|
|
|||
Loading…
Reference in a new issue