summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog22
-rw-r--r--configure.ac2
-rw-r--r--gst-libs/gst/play/play.c80
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/nl.po120
-rw-r--r--po/sv.po132
6 files changed, 181 insertions, 176 deletions
diff --git a/ChangeLog b/ChangeLog
index e0043992..c4e28f08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2004-07-30 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * configure.ac:
+ fix requirement of core
+ * gst-libs/gst/play/play.c: (gst_play_error_plugin),
+ (gst_play_pipeline_setup):
+ don't use colorspace element. do use hermescolorspace element.
+ make macro to get a colorspace element.
+ mark strings for translation.
+ * po/POTFILES.in:
+ add play.c
+ * po/af.po:
+ * po/az.po:
+ * po/cs.po:
+ * po/en_GB.po:
+ * po/hu.po:
+ * po/nl.po:
+ * po/sr.po:
+ * po/sv.po:
+ * po/uk.po:
+ update translations
+
2004-07-30 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* ext/libpng/gstpngenc.c: (gst_pngenc_class_init):
diff --git a/configure.ac b/configure.ac
index bf86ef6c..dfda2755 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,7 +191,7 @@ GST_CHECK_FEATURE(GCONF, [GConf libraries], , [
dnl check for gstreamer
dnl uninstalled is selected preferentially -- see pkg-config(1)
-GST_REQ=0.8.4.0
+GST_REQ=0.8.4
PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ,
HAVE_GST="yes", HAVE_GST="no")
diff --git a/gst-libs/gst/play/play.c b/gst-libs/gst/play/play.c
index bb41bd24..33808579 100644
--- a/gst-libs/gst/play/play.c
+++ b/gst-libs/gst/play/play.c
@@ -23,6 +23,7 @@
#include <string.h>
#include "play.h"
+#include <gst/gst-i18n-plugin.h>
#define TICK_INTERVAL_MSEC 200
@@ -106,10 +107,10 @@ gst_play_error_plugin (const gchar * element, GError ** error)
{
gchar *message;
- message = g_strdup_printf ("The %s element could not be found. "
- "This element is essential for playback. "
- "Please install the right plug-in and verify "
- "that it works by running 'gst-inspect %s'", element, element);
+ message = g_strdup_printf (_("The %s element could not be found. "
+ "This element is essential for playback. "
+ "Please install the right plug-in and verify "
+ "that it works by running 'gst-inspect %s'"), element, element);
gst_play_error_create (error, message);
g_free (message);
return;
@@ -118,13 +119,29 @@ gst_play_error_plugin (const gchar * element, GError ** error)
#define GST_PLAY_MAKE_OR_ERROR(el, factory, name, error) \
G_STMT_START { \
el = gst_element_factory_make (factory, name); \
- if (!GST_IS_ELEMENT (el)) \
- { \
+ if (!GST_IS_ELEMENT (el)) { \
gst_play_error_plugin (factory, error); \
return FALSE; \
} \
} G_STMT_END
+/* Create a colorspace element from the list of acceptable ones;
+ * set error and fail if none found. */
+#define GST_PLAY_MAKE_CS_OR_ERROR(el, name, error) \
+G_STMT_START { \
+ el = gst_element_factory_make ("ffmpegcolorspace", name); \
+ if (!GST_IS_ELEMENT (el)) \
+ el = gst_element_factory_make ("ffcolorspace", name); \
+ if (!GST_IS_ELEMENT (el)) \
+ el = gst_element_factory_make ("hermescolorspace", name); \
+ if (!GST_IS_ELEMENT (el)) { \
+ gst_play_error_create (error, \
+ _("No usable colorspace element could be found.\n" \
+ "Please install one and restart.")); \
+ return FALSE; \
+ } \
+} G_STMT_END
+
#define GST_PLAY_ERROR_RETURN(error, message) \
G_STMT_START { \
gst_play_error_create (error, message); \
@@ -220,19 +237,7 @@ gst_play_pipeline_setup (GstPlay * play, GError ** error)
/* identity ! colorspace ! switch */
GST_PLAY_MAKE_OR_ERROR (identity, "identity", "identity", error);
g_hash_table_insert (play->priv->elements, "identity", identity);
-
- identity_cs = gst_element_factory_make ("ffcolorspace", "identity_cs");
- if (!GST_IS_ELEMENT (identity_cs)) {
- identity_cs =
- gst_element_factory_make ("ffmpegcolorspace", "identity_cs");
- if (!GST_IS_ELEMENT (identity_cs)) {
- identity_cs = gst_element_factory_make ("colorspace", "identity_cs");
- if (!GST_IS_ELEMENT (identity_cs)) {
- gst_play_error_plugin ("colorspace", error);
- return FALSE;
- }
- }
- }
+ GST_PLAY_MAKE_CS_OR_ERROR (identity_cs, "identity_cs", error);
g_hash_table_insert (play->priv->elements, "identity_cs", identity_cs);
gst_bin_add_many (GST_BIN (output_bin), identity, identity_cs, NULL);
if (!gst_element_link (identity, identity_cs))
@@ -264,18 +269,7 @@ gst_play_pipeline_setup (GstPlay * play, GError ** error)
g_hash_table_insert (play->priv->elements, "vis_element", vis_element);
/* Colorspace conversion */
- vis_cs = gst_element_factory_make ("ffcolorspace", "vis_cs");
- if (!GST_IS_ELEMENT (vis_cs)) {
- vis_cs = gst_element_factory_make ("ffmpegcolorspace", "vis_cs");
- if (!GST_IS_ELEMENT (vis_cs)) {
- vis_cs = gst_element_factory_make ("colorspace", "vis_cs");
- if (!GST_IS_ELEMENT (vis_cs)) {
- gst_play_error_plugin ("colorspace", error);
- return FALSE;
- }
- }
- }
-
+ GST_PLAY_MAKE_CS_OR_ERROR (vis_cs, "vis_cs", error);
g_hash_table_insert (play->priv->elements, "vis_cs", vis_cs);
gst_bin_add_many (GST_BIN (vis_bin), vis_queue, vis_element, vis_cs, NULL);
@@ -299,17 +293,7 @@ gst_play_pipeline_setup (GstPlay * play, GError ** error)
g_hash_table_insert (play->priv->elements, "video_switch", video_switch);
/* Colorspace conversion */
- video_cs = gst_element_factory_make ("ffcolorspace", "video_cs");
- if (!GST_IS_ELEMENT (video_cs)) {
- video_cs = gst_element_factory_make ("ffmpegcolorspace", "video_cs");
- if (!GST_IS_ELEMENT (video_cs)) {
- video_cs = gst_element_factory_make ("colorspace", "video_cs");
- if (!GST_IS_ELEMENT (video_cs)) {
- gst_play_error_plugin ("colorspace", error);
- return FALSE;
- }
- }
- }
+ GST_PLAY_MAKE_CS_OR_ERROR (video_cs, "video_cs", error);
g_hash_table_insert (play->priv->elements, "video_cs", video_cs);
/* Software colorbalance */
@@ -318,17 +302,7 @@ gst_play_pipeline_setup (GstPlay * play, GError ** error)
g_hash_table_insert (play->priv->elements, "video_balance", video_balance);
/* Colorspace conversion */
- balance_cs = gst_element_factory_make ("ffcolorspace", "balance_cs");
- if (!GST_IS_ELEMENT (balance_cs)) {
- balance_cs = gst_element_factory_make ("ffmpegcolorspace", "balance_cs");
- if (!GST_IS_ELEMENT (balance_cs)) {
- balance_cs = gst_element_factory_make ("colorspace", "balance_cs");
- if (!GST_IS_ELEMENT (balance_cs)) {
- gst_play_error_plugin ("colorspace", error);
- return FALSE;
- }
- }
- }
+ GST_PLAY_MAKE_CS_OR_ERROR (balance_cs, "balance_cs", error);
g_hash_table_insert (play->priv->elements, "balance_cs", balance_cs);
/* Software scaling of video stream */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ede78f92..d2d28638 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,6 +5,7 @@ ext/gnomevfs/gstgnomevfssrc.c
ext/gnomevfs/gstgnomevfssink.c
ext/sndfile/gstsf.c
gst/avi/gstavimux.c
+gst-libs/gst/play/play.c
sys/dxr3/dxr3audiosink.c
sys/dxr3/dxr3audiosink.c
sys/dxr3/dxr3videosink.c
diff --git a/po/nl.po b/po/nl.po
index bddabef5..73164b55 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,59 +5,59 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gst-plugins 0.8.1\n"
+"Project-Id-Version: gst-plugins 0.8.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-14 20:54+0200\n"
-"PO-Revision-Date: 2004-04-30 15:36+0200\n"
+"POT-Creation-Date: 2004-06-22 16:47+0200\n"
+"PO-Revision-Date: 2004-06-25 19:04+0200\n"
"Last-Translator: Elros Cyriatan <cyriatan@fastmail.fm>\n"
"Language-Team: Dutch <vertaling@nl.linux.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ext/audiofile/gstafsink.c:345 ext/sndfile/gstsf.c:618
+#: ext/audiofile/gstafsink.c:346 ext/sndfile/gstsf.c:621
#, c-format
msgid "Could not open file \"%s\" for writing."
msgstr "Kon \"%s\" niet openen om te schrijven."
-#: ext/audiofile/gstafsink.c:367 ext/audiofile/gstafsrc.c:372
+#: ext/audiofile/gstafsink.c:368 ext/audiofile/gstafsrc.c:373
#, c-format
msgid "Error closing file \"%s\"."
msgstr "Fout bij sluiten bestand \"%s\"."
-#: ext/audiofile/gstafsrc.c:319
+#: ext/audiofile/gstafsrc.c:320
#, c-format
msgid "Could not open file \"%s\" for reading."
msgstr "Kon \"%s\" niet openen om te lezen."
-#: ext/cdparanoia/gstcdparanoia.c:643 ext/cdparanoia/gstcdparanoia.c:659
+#: ext/cdparanoia/gstcdparanoia.c:657 ext/cdparanoia/gstcdparanoia.c:673
msgid "Could not open CD device for reading."
msgstr "Kon het CD-apparaat niet openen om te lezen."
-#: ext/gnomevfs/gstgnomevfssrc.c:1066 ext/gnomevfs/gstgnomevfssrc.c:1089
+#: ext/gnomevfs/gstgnomevfssrc.c:1067 ext/gnomevfs/gstgnomevfssrc.c:1090
#, c-format
msgid "Could not open vfs file \"%s\" for reading."
msgstr "Kon het VFS-bestand \"%s\" niet openen om te lezen."
-#: ext/gnomevfs/gstgnomevfssink.c:343
+#: ext/gnomevfs/gstgnomevfssink.c:344
#, c-format
-msgid "Could not open vfs file \"%s\" for writing."
-msgstr "Kon het VFS-bestand \"%s\" niet openen om te schrijven."
+msgid "Could not open vfs file \"%s\" for writing: %s."
+msgstr "Kon het VFS-bestand \"%s\" niet openen om te schrijven: %s."
-#: ext/gnomevfs/gstgnomevfssink.c:350
+#: ext/gnomevfs/gstgnomevfssink.c:351
msgid "No filename given"
msgstr "Geen bestandsnaam opgegeven"
-#: ext/gnomevfs/gstgnomevfssink.c:375
+#: ext/gnomevfs/gstgnomevfssink.c:377
#, c-format
msgid "Could not close vfs file \"%s\"."
msgstr "Kon het VFS-bestand \"%s\" niet sluiten."
-#: ext/sndfile/gstsf.c:579
+#: ext/sndfile/gstsf.c:582
msgid "No filename specified."
msgstr "Geen bestandsnaam opgegeven."
-#: ext/sndfile/gstsf.c:832
+#: ext/sndfile/gstsf.c:835
#, c-format
msgid "Could not write to file \"%s\"."
msgstr "Kon niet schrijven naar bestand \"%s\"."
@@ -66,198 +66,198 @@ msgstr "Kon niet schrijven naar bestand \"%s\"."
msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "Geen of ongeldig invoergeluid, AVI-stroom zal slecht zijn."
-#: sys/dxr3/dxr3audiosink.c:297
+#: sys/dxr3/dxr3audiosink.c:298
#, c-format
msgid "Could not open audio device \"%s\" for writing."
msgstr "Kon geluidsapparaat \"%s\" niet openen om te schrijven."
-#: sys/dxr3/dxr3audiosink.c:309 sys/dxr3/dxr3videosink.c:282
+#: sys/dxr3/dxr3audiosink.c:310 sys/dxr3/dxr3videosink.c:283
#, c-format
msgid "Could not open control device \"%s\" for writing."
msgstr "Kon instelapparaat \"%s\" niet openen om te schrijven."
-#: sys/dxr3/dxr3audiosink.c:342
+#: sys/dxr3/dxr3audiosink.c:343
#, c-format
msgid "Could not configure audio device \"%s\"."
msgstr "Kon geluidsapparaat \"%s\" niet configureren."
-#: sys/dxr3/dxr3audiosink.c:356 sys/dxr3/dxr3audiosink.c:393
+#: sys/dxr3/dxr3audiosink.c:357 sys/dxr3/dxr3audiosink.c:394
#, c-format
msgid "Could not set audio device \"%s\" to %d Hz."
msgstr "Kon geluidsapparaat \"%s\" niet instellen op %d Hz."
-#: sys/dxr3/dxr3audiosink.c:421
+#: sys/dxr3/dxr3audiosink.c:422
#, c-format
msgid "Could not close audio device \"%s\"."
msgstr "Kon geluidsapparaat \"%s\" niet sluiten."
-#: sys/dxr3/dxr3audiosink.c:428 sys/dxr3/dxr3videosink.c:307
+#: sys/dxr3/dxr3audiosink.c:429 sys/dxr3/dxr3videosink.c:308
#, c-format
msgid "Could not close control device \"%s\"."
msgstr "Kon instelapparaat \"%s\" niet sluiten."
-#: sys/dxr3/dxr3videosink.c:270
+#: sys/dxr3/dxr3videosink.c:271
#, c-format
msgid "Could not open video device \"%s\" for writing."
msgstr "Kon videoapparaat \"%s\" niet openen om te schrijven."
-#: sys/dxr3/dxr3videosink.c:300
+#: sys/dxr3/dxr3videosink.c:301
#, c-format
msgid "Could not close video device \"%s\"."
msgstr "Kon videoapparaat \"%s\" niet sluiten."
-#: sys/dxr3/dxr3videosink.c:452 sys/v4l2/v4l2src_calls.c:123
+#: sys/dxr3/dxr3videosink.c:453 sys/v4l2/v4l2src_calls.c:123
#, c-format
msgid "Could not write to device \"%s\"."
msgstr "Kon niet schrijven naar apparaat \"%s\"."
-#: sys/oss/gstosselement.c:700
+#: sys/oss/gstosselement.c:723
#, c-format
msgid "OSS device \"%s\" is already in use by another program."
msgstr "OSS-apparaat \"%s\" is al in gebruik door een ander programma."
-#: sys/oss/gstosselement.c:707 sys/oss/gstosselement.c:711
+#: sys/oss/gstosselement.c:730 sys/oss/gstosselement.c:734
#, c-format
msgid "Could not access device \"%s\", check its permissions."
msgstr "Kon geen toegang krijgen tot apparaat \"%s\", controleer de toegangsrechten."
-#: sys/oss/gstosselement.c:718
+#: sys/oss/gstosselement.c:741 sys/v4l/v4l_calls.c:167
#, c-format
msgid "Device \"%s\" does not exist."
msgstr "Apparaat \"%s\" bestaat niet."
-#: sys/oss/gstosselement.c:725
+#: sys/oss/gstosselement.c:748
#, c-format
msgid "Could not open device \"%s\" for writing."
msgstr "Kon apparaat \"%s\" niet openen om te schrijven."
-#: sys/oss/gstosselement.c:729
+#: sys/oss/gstosselement.c:752
#, c-format
msgid "Could not open device \"%s\" for reading."
msgstr "Kon apparaat \"%s\" niet openen om te lezen."
-#: sys/oss/gstosselement.c:1092
+#: sys/oss/gstosselement.c:1129
msgid "Your oss device could not be probed correctly"
msgstr "Uw OSS-apparaat kon niet correct worden gevonden"
-#: sys/oss/gstossmixer.c:83
+#: sys/oss/gstossmixer.c:98
msgid "Volume"
msgstr "Geluidssterkte"
-#: sys/oss/gstossmixer.c:84
+#: sys/oss/gstossmixer.c:100
msgid "Bass"
msgstr "Lage tonen"
-#: sys/oss/gstossmixer.c:85
+#: sys/oss/gstossmixer.c:102
msgid "Treble"
msgstr "Hoge tonen"
-#: sys/oss/gstossmixer.c:86
+#: sys/oss/gstossmixer.c:104
msgid "Synth"
msgstr "Synth"
-#: sys/oss/gstossmixer.c:87
+#: sys/oss/gstossmixer.c:106
msgid "PCM"
msgstr "PCM"
-#: sys/oss/gstossmixer.c:88
+#: sys/oss/gstossmixer.c:108
msgid "Speaker"
msgstr "Luidspreker"
-#: sys/oss/gstossmixer.c:89
+#: sys/oss/gstossmixer.c:110
msgid "Line-in"
msgstr "Lijn-in"
-#: sys/oss/gstossmixer.c:90
+#: sys/oss/gstossmixer.c:112
msgid "Microphone"
msgstr "Microfoon"
-#: sys/oss/gstossmixer.c:91
+#: sys/oss/gstossmixer.c:114
msgid "CD"
msgstr "CD"
-#: sys/oss/gstossmixer.c:92
+#: sys/oss/gstossmixer.c:116
msgid "Mixer"
msgstr "Mengpaneel"
-#: sys/oss/gstossmixer.c:93
+#: sys/oss/gstossmixer.c:118
msgid "PCM-2"
msgstr "PCM-2"
-#: sys/oss/gstossmixer.c:94
+#: sys/oss/gstossmixer.c:120
msgid "Record"
msgstr "Opname"
-#: sys/oss/gstossmixer.c:95
+#: sys/oss/gstossmixer.c:122
msgid "In-gain"
msgstr "Versterking-in"
-#: sys/oss/gstossmixer.c:96
+#: sys/oss/gstossmixer.c:124
msgid "Out-gain"
msgstr "Versterking-uit"
-#: sys/oss/gstossmixer.c:97
+#: sys/oss/gstossmixer.c:126
msgid "Line-1"
msgstr "Lijn-1"
-#: sys/oss/gstossmixer.c:98
+#: sys/oss/gstossmixer.c:128
msgid "Line-2"
msgstr "Lijn-2"
-#: sys/oss/gstossmixer.c:99
+#: sys/oss/gstossmixer.c:130
msgid "Line-3"
msgstr "Lijn-3"
-#: sys/oss/gstossmixer.c:100
+#: sys/oss/gstossmixer.c:132
msgid "Digital-1"
msgstr "Digitaal-1"
-#: sys/oss/gstossmixer.c:101
+#: sys/oss/gstossmixer.c:134
msgid "Digital-2"
msgstr "Digitaal-2"
-#: sys/oss/gstossmixer.c:102
+#: sys/oss/gstossmixer.c:136
msgid "Digital-3"
msgstr "Digitaal-3"
-#: sys/oss/gstossmixer.c:103
+#: sys/oss/gstossmixer.c:138
msgid "Phone-in"
msgstr "Telefoon-in"
-#: sys/oss/gstossmixer.c:104
+#: sys/oss/gstossmixer.c:140
msgid "Phone-out"
msgstr "Telefoon-uit"
-#: sys/oss/gstossmixer.c:105
+#: sys/oss/gstossmixer.c:142
msgid "Video"
msgstr "Video"
-#: sys/oss/gstossmixer.c:106
+#: sys/oss/gstossmixer.c:144
msgid "Radio"
msgstr "Radio"
-#: sys/oss/gstossmixer.c:107
+#: sys/oss/gstossmixer.c:146
msgid "Monitor"
msgstr "Bijhouden"
-#: sys/v4l/v4l_calls.c:114
+#: sys/v4l/v4l_calls.c:158
msgid "No device specified."
msgstr "Geen apparaat opgegeven."
-#: sys/v4l/v4l_calls.c:122 sys/v4l2/v4l2_calls.c:395
+#: sys/v4l/v4l_calls.c:171 sys/v4l2/v4l2_calls.c:397
#, c-format
msgid "Could not open device \"%s\" for reading and writing."
msgstr "Kon apparaat \"%s\" niet openen voor lezen en schrijven."
-#: sys/v4l/v4l_calls.h:47
+#: sys/v4l/v4l_calls.h:50
msgid "Device is not open."
msgstr "Apparaat is niet geopend."
-#: sys/v4l/v4l_calls.h:56
+#: sys/v4l/v4l_calls.h:59
msgid "Device is open."
msgstr "Apparaat is geopend."
-#: sys/v4l2/v4l2_calls.c:409
+#: sys/v4l2/v4l2_calls.c:411
#, c-format
msgid "Device \"%s\" is not a capture device."
msgstr "Apparaat \"%s\" is niet een opvangapparaat."
diff --git a/po/sv.po b/po/sv.po
index 61a47f57..e97d8d55 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,265 +2,273 @@
# Copyright (C) 2004 Free Software Foundation, Inc.
# Christian Rose <menthos@menthos.com>, 2004.
#
-# $Id: sv.po,v 1.8 2004/05/03 13:37:09 thomasvs Exp $
+# $Id: sv.po,v 1.9 2004/07/30 13:41:55 thomasvs Exp $
#
msgid ""
msgstr ""
-"Project-Id-Version: gst-plugins 0.7.6\n"
+"Project-Id-Version: gst-plugins 0.8.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-09 19:31+0100\n"
-"PO-Revision-Date: 2004-03-17 17:22+0100\n"
+"POT-Creation-Date: 2004-06-22 16:47+0200\n"
+"PO-Revision-Date: 2004-07-02 23:59+0200\n"
"Last-Translator: Christian Rose <menthos@menthos.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ext/audiofile/gstafsink.c:349 ext/sndfile/gstsf.c:601
+#: ext/audiofile/gstafsink.c:346 ext/sndfile/gstsf.c:621
#, c-format
msgid "Could not open file \"%s\" for writing."
msgstr "Kunde inte öppna filen \"%s\" för skrivning."
-#: ext/audiofile/gstafsink.c:372 ext/audiofile/gstafsrc.c:377
+#: ext/audiofile/gstafsink.c:368 ext/audiofile/gstafsrc.c:373
#, c-format
msgid "Error closing file \"%s\"."
msgstr "Fel vid stängning av filen \"%s\"."
-#: ext/audiofile/gstafsrc.c:319
+#: ext/audiofile/gstafsrc.c:320
#, c-format
msgid "Could not open file \"%s\" for reading."
msgstr "Kunde inte öppna filen \"%s\" för läsning."
-#: ext/cdparanoia/gstcdparanoia.c:638 ext/cdparanoia/gstcdparanoia.c:655
+#: ext/cdparanoia/gstcdparanoia.c:657 ext/cdparanoia/gstcdparanoia.c:673
msgid "Could not open CD device for reading."
msgstr "Kunde inte öppna cd-enheten för läsning."
-#: ext/gnomevfs/gstgnomevfssrc.c:1066 ext/gnomevfs/gstgnomevfssrc.c:1089
+#: ext/gnomevfs/gstgnomevfssrc.c:1067 ext/gnomevfs/gstgnomevfssrc.c:1090
#, c-format
msgid "Could not open vfs file \"%s\" for reading."
msgstr "Kunde inte öppna vfs-filen \"%s\" för läsning."
-#: ext/gnomevfs/gstgnomevfssink.c:286
+#: ext/gnomevfs/gstgnomevfssink.c:344
#, c-format
-msgid "Could not open vfs file \"%s\" for writing."
-msgstr "Kunde inte öppna vfs-filen \"%s\" för skrivning."
+msgid "Could not open vfs file \"%s\" for writing: %s."
+msgstr "Kunde inte öppna vfs-filen \"%s\" för skrivning: %s."
-#: ext/gnomevfs/gstgnomevfssink.c:311
+#: ext/gnomevfs/gstgnomevfssink.c:351
+msgid "No filename given"
+msgstr "Inget filnamn angivet"
+
+#: ext/gnomevfs/gstgnomevfssink.c:377
#, c-format
msgid "Could not close vfs file \"%s\"."
msgstr "Kunde inte stänga vfs-filen \"%s\"."
-#: ext/sndfile/gstsf.c:563
+#: ext/sndfile/gstsf.c:582
msgid "No filename specified."
msgstr "Inget filnamn angivet."
-#: ext/sndfile/gstsf.c:805
+#: ext/sndfile/gstsf.c:835
#, c-format
msgid "Could not write to file \"%s\"."
msgstr "Kunde inte skriva till filen \"%s\"."
-#: gst/avi/gstavimux.c:989
+#: gst/avi/gstavimux.c:1052
msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "Inget eller ogiltigt inljud. AVI-flödet kommer att skadas."
-#: sys/dxr3/dxr3audiosink.c:314
+#: sys/dxr3/dxr3audiosink.c:298
#, c-format
msgid "Could not open audio device \"%s\" for writing."
msgstr "Kunde inte öppna ljudenheten \"%s\" för skrivning."
-#: sys/dxr3/dxr3audiosink.c:326 sys/dxr3/dxr3videosink.c:293
+#: sys/dxr3/dxr3audiosink.c:310 sys/dxr3/dxr3videosink.c:283
#, c-format
msgid "Could not open control device \"%s\" for writing."
msgstr "Kunde inte öppna styrenheten \"%s\" för skrivning."
-#: sys/dxr3/dxr3audiosink.c:360
+#: sys/dxr3/dxr3audiosink.c:343
#, c-format
msgid "Could not configure audio device \"%s\"."
msgstr "Kunde inte konfigurera ljudenheten \"%s\"."
-#: sys/dxr3/dxr3audiosink.c:374 sys/dxr3/dxr3audiosink.c:411
+#: sys/dxr3/dxr3audiosink.c:357 sys/dxr3/dxr3audiosink.c:394
#, c-format
msgid "Could not set audio device \"%s\" to %d Hz."
msgstr "Kan inte ställa in ljudenheten \"%s\" till %d Hz."
-#: sys/dxr3/dxr3audiosink.c:439
+#: sys/dxr3/dxr3audiosink.c:422
#, c-format
msgid "Could not close audio device \"%s\"."
msgstr "Kunde inte stänga ljudenheten \"%s\"."
-#: sys/dxr3/dxr3audiosink.c:446 sys/dxr3/dxr3videosink.c:320
+#: sys/dxr3/dxr3audiosink.c:429 sys/dxr3/dxr3videosink.c:308
#, c-format
msgid "Could not close control device \"%s\"."
msgstr "Kunde inte stänga styrenheten \"%s\"."
-#: sys/dxr3/dxr3videosink.c:281
+#: sys/dxr3/dxr3videosink.c:271
#, c-format
msgid "Could not open video device \"%s\" for writing."
msgstr "Kunde inte öppna videoenheten \"%s\" för skrivning."
-#: sys/dxr3/dxr3videosink.c:312
+#: sys/dxr3/dxr3videosink.c:301
#, c-format
msgid "Could not close video device \"%s\"."
msgstr "Kunde inte stänga vidoeenheten \"%s\"."
-#: sys/dxr3/dxr3videosink.c:468 sys/v4l2/v4l2src_calls.c:121
+#: sys/dxr3/dxr3videosink.c:453 sys/v4l2/v4l2src_calls.c:123
#, c-format
msgid "Could not write to device \"%s\"."
msgstr "Kunde inte skriva till enheten \"%s\"."
-#: sys/oss/gstosselement.c:724
+#: sys/oss/gstosselement.c:723
#, c-format
msgid "OSS device \"%s\" is already in use by another program."
msgstr "OSS-enheten \"%s\" används redan av ett annat program."
-#: sys/oss/gstosselement.c:731 sys/oss/gstosselement.c:735
+#: sys/oss/gstosselement.c:730 sys/oss/gstosselement.c:734
#, c-format
msgid "Could not access device \"%s\", check its permissions."
msgstr "Kunde inte komma åt enheten \"%s\". Kontrollera dess rättigheter."
-#: sys/oss/gstosselement.c:742
+#: sys/oss/gstosselement.c:741 sys/v4l/v4l_calls.c:167
#, c-format
msgid "Device \"%s\" does not exist."
msgstr "Enheten \"%s\" finns inte."
-#: sys/oss/gstosselement.c:749
+#: sys/oss/gstosselement.c:748
#, c-format
msgid "Could not open device \"%s\" for writing."
msgstr "Kunde inte öppna enheten \"%s\" för skrivning."
-#: sys/oss/gstosselement.c:753
+#: sys/oss/gstosselement.c:752
#, c-format
msgid "Could not open device \"%s\" for reading."
msgstr "Kunde inte öppna enheten \"%s\" för läsning."
-#: sys/oss/gstossmixer.c:86
+#: sys/oss/gstosselement.c:1129
+msgid "Your oss device could not be probed correctly"
+msgstr "Din oss-enhet kunde inte undersökas korrekt"
+
+#: sys/oss/gstossmixer.c:98
msgid "Volume"
msgstr "Volym"
-#: sys/oss/gstossmixer.c:87
+#: sys/oss/gstossmixer.c:100
msgid "Bass"
msgstr "Bass"
-#: sys/oss/gstossmixer.c:88
+#: sys/oss/gstossmixer.c:102
msgid "Treble"
msgstr "Diskant"
-#: sys/oss/gstossmixer.c:89
+#: sys/oss/gstossmixer.c:104
msgid "Synth"
msgstr "Synt"
-#: sys/oss/gstossmixer.c:90
+#: sys/oss/gstossmixer.c:106
msgid "PCM"
msgstr "PCM"
-#: sys/oss/gstossmixer.c:91
+#: sys/oss/gstossmixer.c:108
msgid "Speaker"
msgstr "Högtalare"
-#: sys/oss/gstossmixer.c:92
+#: sys/oss/gstossmixer.c:110
msgid "Line-in"
msgstr "Linje-in"
-#: sys/oss/gstossmixer.c:93
+#: sys/oss/gstossmixer.c:112
msgid "Microphone"
msgstr "Mikrofon"
-#: sys/oss/gstossmixer.c:94
+#: sys/oss/gstossmixer.c:114
msgid "CD"
msgstr "Cd"
-#: sys/oss/gstossmixer.c:95
+#: sys/oss/gstossmixer.c:116
msgid "Mixer"
msgstr "Mixer"
-#: sys/oss/gstossmixer.c:96
+#: sys/oss/gstossmixer.c:118
msgid "PCM-2"
msgstr "PCM-2"
-#: sys/oss/gstossmixer.c:97
+#: sys/oss/gstossmixer.c:120
msgid "Record"
msgstr "Spela in"
-#: sys/oss/gstossmixer.c:98
+#: sys/oss/gstossmixer.c:122
msgid "In-gain"
msgstr "Införstärkning"
-#: sys/oss/gstossmixer.c:99
+#: sys/oss/gstossmixer.c:124
msgid "Out-gain"
msgstr "Utförstärkning"
-#: sys/oss/gstossmixer.c:100
+#: sys/oss/gstossmixer.c:126
msgid "Line-1"
msgstr "Linje-1"
-#: sys/oss/gstossmixer.c:101
+#: sys/oss/gstossmixer.c:128
msgid "Line-2"
msgstr "Linje-2"
-#: sys/oss/gstossmixer.c:102
+#: sys/oss/gstossmixer.c:130
msgid "Line-3"
msgstr "Linje-3"
-#: sys/oss/gstossmixer.c:103
+#: sys/oss/gstossmixer.c:132
msgid "Digital-1"
msgstr "Digital-1"
-#: sys/oss/gstossmixer.c:104
+#: sys/oss/gstossmixer.c:134
msgid "Digital-2"
msgstr "Digital-2"
-#: sys/oss/gstossmixer.c:105
+#: sys/oss/gstossmixer.c:136
msgid "Digital-3"
msgstr "Digital-3"
-#: sys/oss/gstossmixer.c:106
+#: sys/oss/gstossmixer.c:138
msgid "Phone-in"
msgstr "Tele-in"
-#: sys/oss/gstossmixer.c:107
+#: sys/oss/gstossmixer.c:140
msgid "Phone-out"
msgstr "Tele-ut"
-#: sys/oss/gstossmixer.c:108
+#: sys/oss/gstossmixer.c:142
msgid "Video"
msgstr "Video"
-#: sys/oss/gstossmixer.c:109
+#: sys/oss/gstossmixer.c:144
msgid "Radio"
msgstr "Radio"
-#: sys/oss/gstossmixer.c:110
+#: sys/oss/gstossmixer.c:146
msgid "Monitor"
msgstr "Monitor"
-#: sys/v4l/v4l_calls.c:115
+#: sys/v4l/v4l_calls.c:158
msgid "No device specified."
msgstr "Ingen enheten angiven."
-#: sys/v4l/v4l_calls.c:124 sys/v4l2/v4l2_calls.c:413
+#: sys/v4l/v4l_calls.c:171 sys/v4l2/v4l2_calls.c:397
#, c-format
msgid "Could not open device \"%s\" for reading and writing."
msgstr "Kunde inte öppna enheten \"%s\" för läsning och skrivning."
-#: sys/v4l/v4l_calls.h:47
+#: sys/v4l/v4l_calls.h:50
msgid "Device is not open."
msgstr "Enheten är inte öppen."
-#: sys/v4l/v4l_calls.h:56
+#: sys/v4l/v4l_calls.h:59
msgid "Device is open."
msgstr "Enheten är öppen."
-#: sys/v4l2/v4l2_calls.c:427
+#: sys/v4l2/v4l2_calls.c:411
#, c-format
msgid "Device \"%s\" is not a capture device."
msgstr "Enheten \"%s\" är ingen fångstenhet."
-#: sys/v4l2/v4l2src_calls.c:249
+#: sys/v4l2/v4l2src_calls.c:255
#, c-format
msgid "Could not get buffers from device \"%s\"."
msgstr "Kunde inte få tag i buffertar från enheten \"%s\"."
-#: sys/v4l2/v4l2src_calls.c:256
+#: sys/v4l2/v4l2src_calls.c:264
#, c-format
msgid "Could not get enough buffers from device \"%s\"."
msgstr "Kunde inte få tag i tillräckligt många buffertar från enheten \"%s\"."