Remove no more needed XINE_LOGO.

Internationalize all config related stuff.
Fix not registered mrl ending in roq/film  demuxer.
Add bindtextdomain() calls in load_plugins (for audio/video out plugins).

CVS patchset: 2066
CVS date: 2002/06/12 12:22:25

13 files changed, 95 insertions, 86 deletions

diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 6ba986aa3..11b22bdb5 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_asf.c,v 1.44 2002/06/07 04:15:46 miguelfreitas Exp $
+ * $Id: demux_asf.c,v 1.45 2002/06/12 12:22:28 f1rmb Exp $
  *
  * demultiplexer for asf streams
  *
@@ -1366,7 +1366,7 @@ static int demux_asf_open(demux_plugin_t *this_gen,
 
     xine_strdupa(valid_ends, (this->config->register_string(this->config,
 							    "mrl.ends_asf", VALID_ENDS,
-							    "valid mrls ending for asf demuxer",
+							    _("valid mrls ending for asf demuxer"),
 							    NULL, NULL, NULL)));
     while((m = xine_strsep(&valid_ends, ",")) != NULL) { 
       
@@ -1405,9 +1405,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_asf_t     *this;
 
   if (iface != 9) {
-    printf ("demux_asf: plugin doesn't support plugin API version %d.\n"
-	    "           this means there's a version mismatch between xine and this "
-	    "           demuxer plugin.\nInstalling current demux plugins should help.\n",
+    printf (_("demux_asf: plugin doesn't support plugin API version %d.\n"
+	      "           this means there's a version mismatch between xine and this "
+	      "           demuxer plugin.\nInstalling current demux plugins should help.\n"),
 	    iface);
     return NULL;
   }
@@ -1418,7 +1418,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
 
   (void*) this->config->register_string(this->config,
 					"mrl.ends_asf", VALID_ENDS,
-					"valid mrls ending for asf demuxer",
+					_("valid mrls ending for asf demuxer"),
 					NULL, NULL, NULL);
   
   this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 7978bd3a4..9cca600b1 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_avi.c,v 1.94 2002/06/07 04:15:46 miguelfreitas Exp $
+ * $Id: demux_avi.c,v 1.95 2002/06/12 12:22:32 f1rmb Exp $
  *
  * demultiplexer for avi streams
  *
@@ -1494,7 +1494,7 @@ static int demux_avi_open(demux_plugin_t *this_gen,
       xine_strdupa(valid_ends,
                    this->config->register_string(this->config,
                                                  "mrl.ends_avi", VALID_ENDS,
-                                                 "valid mrls ending for avi demuxer",
+                                                 _("valid mrls ending for avi demuxer"),
                                                  NULL, NULL, NULL));
       while((m = xine_strsep(&valid_ends, ",")) != NULL) {
 
@@ -1553,15 +1553,15 @@ static int demux_avi_get_stream_length (demux_plugin_t *this_gen) {
 }
 
 demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
-
+  
   demux_avi_t     *this;
-
+  
   if (iface != 9) {
     xine_log (xine, XINE_LOG_PLUGIN,
               _("demux_avi: this plugin doesn't support plugin API version %d.\n"
                 "demux_avi: this means there's a version mismatch between xine and this "
                 "demux_avi: demuxer plugin.\nInstalling current demuxer plugins should help.\n"),
-                iface);
+	      iface);
     return NULL;
   }
 
@@ -1571,7 +1571,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
 
   (void*) this->config->register_string(this->config,
                                         "mrl.ends_avi", VALID_ENDS,
-                                        "valid mrls ending for avi demuxer",
+                                        _("valid mrls ending for avi demuxer"),
                                         NULL, NULL, NULL);
 
   this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
diff --git a/src/demuxers/demux_cda.c b/src/demuxers/demux_cda.c
index 8b0665a19..6dba3d75b 100644
--- a/src/demuxers/demux_cda.c
+++ b/src/demuxers/demux_cda.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_cda.c,v 1.19 2002/06/07 02:40:46 miguelfreitas Exp $
+ * $Id: demux_cda.c,v 1.20 2002/06/12 12:22:33 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -294,9 +294,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_cda_t *this;
   
   if (iface != 9) {
-    printf ("demux_cda: plugin doesn't support plugin API version %d.\n"
-	    "           this means there's a version mismatch between xine and this "
-	    "           demuxer plugin.\nInstalling current demux plugins should help.\n",
+    printf (_("demux_cda: plugin doesn't support plugin API version %d.\n"
+	      "           this means there's a version mismatch between xine and this "
+	      "           demuxer plugin.\nInstalling current demux plugins should help.\n"),
 	    iface);
     return NULL;
   }
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index ad37e2a85..52abe63c3 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_elem.c,v 1.46 2002/06/07 02:40:46 miguelfreitas Exp $
+ * $Id: demux_elem.c,v 1.47 2002/06/12 12:22:33 f1rmb Exp $
  *
  * demultiplexer for elementary mpeg streams
  * 
@@ -316,7 +316,7 @@ static int demux_mpeg_elem_open(demux_plugin_t *this_gen,
     if(suffix) {
       xine_strdupa(valid_ends, (this->config->register_string(this->config,
 							      "mrl.ends_elem", VALID_ENDS,
-							      "valid mrls ending for elementary demuxer",
+							      _("valid mrls ending for elementary demuxer"),
 							      NULL, NULL, NULL)));
       while((m = xine_strsep(&valid_ends, ",")) != NULL) { 
 	
@@ -367,9 +367,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_mpeg_elem_t *this;
 
   if (iface != 9) {
-    printf ("demux_elem: plugin doesn't support plugin API version %d.\n"
-	    "            this means there's a version mismatch between xine and this "
-	    "            demuxer plugin.\nInstalling current demux plugins should help.\n",
+    printf (_("demux_elem: plugin doesn't support plugin API version %d.\n"
+	      "            this means there's a version mismatch between xine and this "
+	      "            demuxer plugin.\nInstalling current demux plugins should help.\n"),
 	    iface);
     return NULL;
   }
@@ -380,7 +380,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
 
   (void*) this->config->register_string(this->config,
 					"mrl.ends_elem", VALID_ENDS,
-					"valid mrls ending for elementary demuxer",
+					_("valid mrls ending for elementary demuxer"),
 					NULL, NULL, NULL);    
 
   this->demux_plugin.interface_version = DEMUX_MPEG_ELEM_IFACE_VERSION;
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
index 47ee5a753..a8ac34c91 100644
--- a/src/demuxers/demux_film.c
+++ b/src/demuxers/demux_film.c
@@ -21,7 +21,7 @@
  * For more information on the FILM file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_film.c,v 1.10 2002/06/07 02:40:47 miguelfreitas Exp $
+ * $Id: demux_film.c,v 1.11 2002/06/12 12:22:33 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -497,10 +497,11 @@ static int demux_film_open(demux_plugin_t *this_gen, input_plugin_t *input,
     if(!suffix)
       return DEMUX_CANNOT_HANDLE;
 
-    xine_strdupa(valid_ends, (this->config->register_string(this->config,
-                 "mrl.ends_film", VALID_ENDS,
-                 "valid mrls ending for film demuxer",
-                 NULL, NULL, NULL)));
+    xine_strdupa(valid_ends,
+		 (this->config->register_string(this->config,
+						"mrl.ends_film", VALID_ENDS,
+						_("valid mrls ending for film demuxer"),
+						NULL, NULL, NULL)));
     while((m = xine_strsep(&valid_ends, ",")) != NULL) {
 
       while(*m == ' ' || *m == '\t') m++;
@@ -729,9 +730,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_film_t *this;
 
   if (iface != 9) {
-    printf ("demux_film: plugin doesn't support plugin API version %d.\n"
-            "            this means there's a version mismatch between xine and this "
-            "            demuxer plugin. Installing current demux plugins should help.\n",
+    printf (_("demux_film: plugin doesn't support plugin API version %d.\n"
+	      "            this means there's a version mismatch between xine and this "
+	      "            demuxer plugin. Installing current demux plugins should help.\n"),
             iface);
     return NULL;
   }
@@ -739,6 +740,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   this         = (demux_film_t *) xine_xmalloc(sizeof(demux_film_t));
   this->config = xine->config;
   this->xine   = xine;
+  
+  (void *) this->config->register_string(this->config,
+					 "mrl.ends_film", VALID_ENDS,
+					 _("valid mrls ending for film demuxer"),
+					 NULL, NULL, NULL);
 
   this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
   this->demux_plugin.open              = demux_film_open;
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 3e66def68..161e93b64 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpeg.c,v 1.64 2002/06/07 02:40:47 miguelfreitas Exp $
+ * $Id: demux_mpeg.c,v 1.65 2002/06/12 12:22:33 f1rmb Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  * reads streams of variable blocksizes
@@ -890,7 +890,7 @@ static int demux_mpeg_open(demux_plugin_t *this_gen,
     xine_strdupa(valid_mrls,
                  this->config->register_string(this->config,
                                                "mrl.mrls_mpeg", VALID_MRLS,
-                                               "valid mrls for mpeg demuxer",
+                                               _("valid mrls for mpeg demuxer"),
                                                NULL, NULL, NULL));
 
     media = strstr(MRL, "://");
@@ -923,7 +923,7 @@ static int demux_mpeg_open(demux_plugin_t *this_gen,
     xine_strdupa(valid_ends,
                  this->config->register_string(this->config,
                                                "mrl.ends_mpeg", VALID_ENDS,
-                                               "valid mrls ending for mpeg demuxer",
+                                               _("valid mrls ending for mpeg demuxer"),
                                                NULL, NULL, NULL));
     while((m = xine_strsep(&valid_ends, ",")) != NULL) {
 
@@ -974,9 +974,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_mpeg_t    *this;
 
   if (iface != 9) {
-    printf ("demux_mpeg: plugin doesn't support plugin API version %d.\n"
-            "            this means there's a version mismatch between xine and this "
-            "            demuxer plugin.\nInstalling current demux plugins should help.\n",
+    printf (_("demux_mpeg: plugin doesn't support plugin API version %d.\n"
+	      "            this means there's a version mismatch between xine and this "
+	      "            demuxer plugin.\nInstalling current demux plugins should help.\n"),
             iface);
     return NULL;
   }
@@ -987,11 +987,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
 
   /* Calling register_string() configure valid mrls in configfile */
   (void*) this->config->register_string(this->config, "mrl.mrls_mpeg", VALID_MRLS,
-                                        "valid mrls for mpeg demuxer",
+                                        _("valid mrls for mpeg demuxer"),
                                         NULL, NULL, NULL);
   (void*) this->config->register_string(this->config,
                                         "mrl.ends_mpeg", VALID_ENDS,
-                                        "valid mrls ending for mpeg demuxer",
+                                        _("valid mrls ending for mpeg demuxer"),
                                         NULL, NULL, NULL);
 
   this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index c21468950..1f07b61ea 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpeg_block.c,v 1.103 2002/06/07 02:40:47 miguelfreitas Exp $
+ * $Id: demux_mpeg_block.c,v 1.104 2002/06/12 12:22:33 f1rmb Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  *
@@ -1083,7 +1083,7 @@ static int demux_mpeg_block_open(demux_plugin_t *this_gen,
 
     xine_strdupa(valid_mrls, (this->config->register_string(this->config,
 							    "mrl.mrls_mpeg_block", VALID_MRLS,
-							    "valid mrls for mpeg block demuxer",
+							    _("valid mrls for mpeg block demuxer"),
 							    NULL, NULL, NULL)));
     
     MRL = input->get_mrl (input);
@@ -1124,7 +1124,7 @@ static int demux_mpeg_block_open(demux_plugin_t *this_gen,
     
     xine_strdupa(valid_ends, (this->config->register_string(this->config,
 							    "mrl.ends_mpeg_block", VALID_ENDS,
-							    "valid mrls ending for mpeg block demuxer",
+							    _("valid mrls ending for mpeg block demuxer"),
 							    NULL, NULL, NULL)));
     while((m = xine_strsep(&valid_ends, ",")) != NULL) { 
       
@@ -1174,9 +1174,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_mpeg_block_t *this;
 
   if (iface != 9) {
-    printf ("demux_mpeg_block: plugin doesn't support plugin API version %d.\n"
-	    "                  this means there's a version mismatch between xine and this "
-	    "                  demuxer plugin.\nInstalling current demux plugins should help.\n",
+    printf (_("demux_mpeg_block: plugin doesn't support plugin API version %d.\n"
+	      "                  this means there's a version mismatch between xine and this "
+	      "                  demuxer plugin.\nInstalling current demux plugins should help.\n"),
 	    iface);
     return NULL;
   }
@@ -1187,11 +1187,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
 
   /* Calling register_string() configure valid mrls in configfile */
   (void*) this->config->register_string(this->config, "mrl.mrls_mpeg_block", VALID_MRLS,
-					"valid mrls for mpeg block demuxer",
+					_("valid mrls for mpeg block demuxer"),
 					NULL, NULL, NULL);
   (void*) this->config->register_string(this->config,
 					"mrl.ends_mpeg_block", VALID_ENDS,
-					"valid mrls ending for mpeg block demuxer",
+					_("valid mrls ending for mpeg block demuxer"),
 					NULL, NULL, NULL);    
 
   this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 14cb93460..dd5c10ee5 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpgaudio.c,v 1.49 2002/06/07 02:40:47 miguelfreitas Exp $
+ * $Id: demux_mpgaudio.c,v 1.50 2002/06/12 12:22:33 f1rmb Exp $
  *
  * demultiplexer for mpeg audio (i.e. mp3) streams
  *
@@ -466,7 +466,7 @@ static int demux_mpgaudio_open(demux_plugin_t *this_gen,
     
     xine_strdupa(valid_ends, (this->config->register_string(this->config,
 							    "mrl.ends_mgaudio", VALID_ENDS,
-							    "valid mrls ending for mpeg audio demuxer",
+							    _("valid mrls ending for mpeg audio demuxer"),
 							    NULL, NULL, NULL)));
     while((m = xine_strsep(&valid_ends, ",")) != NULL) { 
       
@@ -522,9 +522,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_mpgaudio_t *this;
 
   if (iface != 9) {
-    printf ("demux_mpeg: plugin doesn't support plugin API version %d.\n"
-	    "            this means there's a version mismatch between xine and this "
-	    "            demuxer plugin.\nInstalling current demux plugins should help.\n",
+    printf (_("demux_mpeg: plugin doesn't support plugin API version %d.\n"
+	      "            this means there's a version mismatch between xine and this "
+	      "            demuxer plugin.\nInstalling current demux plugins should help.\n"),
 	    iface);
     return NULL;
   }
@@ -535,7 +535,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
 
   (void*) this->config->register_string(this->config,
 					"mrl.ends_mgaudio", VALID_ENDS,
-					"valid mrls ending for mpeg audio demuxer",
+					_("valid mrls ending for mpeg audio demuxer"),
 					NULL, NULL, NULL);
 
   this->demux_plugin.interface_version = DEMUX_MPGAUDIO_IFACE_VERSION;
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 1177a0ebd..ca9f77ec0 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_ogg.c,v 1.28 2002/06/07 02:40:47 miguelfreitas Exp $
+ * $Id: demux_ogg.c,v 1.29 2002/06/12 12:22:33 f1rmb Exp $
  *
  * demultiplexer for ogg streams
  *
@@ -608,7 +608,7 @@ static int demux_ogg_open(demux_plugin_t *this_gen,
     
     xine_strdupa(valid_ends, (this->config->register_string(this->config,
 							    "mrl.ends_ogg", VALID_ENDS,
-							    "valid mrls ending for ogg demuxer",
+							    _("valid mrls ending for ogg demuxer"),
 							    NULL, NULL, NULL)));
     while((m = xine_strsep(&valid_ends, ",")) != NULL) { 
       
@@ -659,7 +659,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
 
   (void*) this->config->register_string(this->config,
 					"mrl.ends_ogg", VALID_ENDS,
-					"valid mrls ending for ogg demuxer",
+					_("valid mrls ending for ogg demuxer"),
 					NULL, NULL, NULL);
 
   this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c
index 7cb96fe49..6b6372958 100644
--- a/src/demuxers/demux_pes.c
+++ b/src/demuxers/demux_pes.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_pes.c,v 1.31 2002/06/07 02:40:47 miguelfreitas Exp $
+ * $Id: demux_pes.c,v 1.32 2002/06/12 12:22:33 f1rmb Exp $
  *
  * demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
  * reads streams of variable blocksizes
@@ -529,7 +529,7 @@ static int demux_pes_open(demux_plugin_t *this_gen,
     
     xine_strdupa(valid_mrls, (this->config->register_string(this->config,
 							    "mrl.mrls_pes", VALID_MRLS,
-							    "valid mrls for pes demuxer",
+							    _("valid mrls for pes demuxer"),
 							    NULL, NULL, NULL)));
     
     media = strstr(MRL, "://");
@@ -559,7 +559,7 @@ static int demux_pes_open(demux_plugin_t *this_gen,
     
     xine_strdupa(valid_ends, (this->config->register_string(this->config,
 							    "mrl.ends_pes", VALID_ENDS,
-							    "valid mrls ending for pes demuxer",
+							    _("valid mrls ending for pes demuxer"),
 							    NULL, NULL, NULL)));
     while((m = xine_strsep(&valid_ends, ",")) != NULL) { 
       
@@ -605,9 +605,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_pes_t     *this;
 
   if (iface != 9) {
-    printf ("demux_pes: plugin doesn't support plugin API version %d.\n"
-	    "           this means there's a version mismatch between xine and this "
-	    "           demuxer plugin.\nInstalling current demux plugins should help.\n",
+    printf (_("demux_pes: plugin doesn't support plugin API version %d.\n"
+	      "           this means there's a version mismatch between xine and this "
+	      "           demuxer plugin.\nInstalling current demux plugins should help.\n"),
 	    iface);
     return NULL;
   }
@@ -617,11 +617,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   this->xine   = xine;
 
   (void*) this->config->register_string(this->config, "mrl.mrls_pes", VALID_MRLS,
-					"valid mrls for pes demuxer",
+					_("valid mrls for pes demuxer"),
 					NULL, NULL, NULL);
   (void*) this->config->register_string(this->config,
 					"mrl.ends_pes", VALID_ENDS,
-					"valid mrls ending for pes demuxer",
+					_("valid mrls ending for pes demuxer"),
 					NULL, NULL, NULL);    
   
   this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 7ffcecbc8..4b6eeaf40 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -30,7 +30,7 @@
  *    build_frame_table
  *  free_qt_info
  *
- * $Id: demux_qt.c,v 1.51 2002/06/09 11:12:22 miguelfreitas Exp $
+ * $Id: demux_qt.c,v 1.52 2002/06/12 12:22:33 f1rmb Exp $
  *
  */
 
@@ -1204,9 +1204,9 @@ static int demux_qt_open(demux_plugin_t *this_gen,
       return DEMUX_CANNOT_HANDLE;
 
     xine_strdupa(valid_ends, (this->config->register_string(this->config,
-                 "mrl.ends_qt", VALID_ENDS,
-                 "valid mrls ending for qt demuxer",
-                 NULL, NULL, NULL)));
+							    "mrl.ends_qt", VALID_ENDS,
+							    _("valid mrls ending for qt demuxer"),
+							    NULL, NULL, NULL)));
     while((m = xine_strsep(&valid_ends, ",")) != NULL) {
 
       while(*m == ' ' || *m == '\t') m++;
@@ -1437,10 +1437,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_qt_t      *this;
 
   if (iface != 9) {
-    printf ("demux_qt: plugin doesn't support plugin API version %d.\n"
-            "          this means there's a version mismatch between xine and this "
-            "          demuxer plugin.\nInstalling current demux plugins should
-help.\n",
+    printf (_("demux_qt: plugin doesn't support plugin API version %d.\n"
+	      "          this means there's a version mismatch between xine and this "
+	      "          demuxer plugin.\nInstalling current demux plugins should help.\n"),
             iface);
     return NULL;
   }
@@ -1451,7 +1450,7 @@ help.\n",
 
   (void*) this->config->register_string(this->config,
                                         "mrl.ends_qt", VALID_ENDS,
-                                        "valid mrls ending for qt demuxer",
+                                        _("valid mrls ending for qt demuxer"),
                                         NULL, NULL, NULL);
 
   this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c
index 668f5ad44..5ddc91684 100644
--- a/src/demuxers/demux_roq.c
+++ b/src/demuxers/demux_roq.c
@@ -21,7 +21,7 @@
  * For more information regarding the RoQ file format, visit:
  *   http://www.csse.monash.edu.au/~timf/
  *
- * $Id: demux_roq.c,v 1.4 2002/06/07 02:40:47 miguelfreitas Exp $
+ * $Id: demux_roq.c,v 1.5 2002/06/12 12:22:33 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -294,9 +294,9 @@ static int demux_roq_open(demux_plugin_t *this_gen, input_plugin_t *input,
       return DEMUX_CANNOT_HANDLE;
 
     xine_strdupa(valid_ends, (this->config->register_string(this->config,
-                 "mrl.ends_roq", VALID_ENDS,
-                 "valid mrls ending for roq demuxer",
-                 NULL, NULL, NULL)));
+							    "mrl.ends_roq", VALID_ENDS,
+							    _("valid mrls ending for roq demuxer"),
+							    NULL, NULL, NULL)));
     while((m = xine_strsep(&valid_ends, ",")) != NULL) {
 
       while(*m == ' ' || *m == '\t') m++;
@@ -533,9 +533,9 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_roq_t *this;
 
   if (iface != 9) {
-    printf ("demux_roq: plugin doesn't support plugin API version %d.\n"
-            "           this means there's a version mismatch between xine and this "
-            "           demuxer plugin.\nInstalling current demux plugins should help.\n",
+    printf (_("demux_roq: plugin doesn't support plugin API version %d.\n"
+	      "           this means there's a version mismatch between xine and this "
+	      "           demuxer plugin.\nInstalling current demux plugins should help.\n"),
             iface);
     return NULL;
   }
@@ -544,6 +544,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   this->config = xine->config;
   this->xine   = xine;
 
+  (void *) this->config->register_string(this->config,
+					 "mrl.ends_roq", VALID_ENDS,
+					 _("valid mrls ending for roq demuxer"),
+					 NULL, NULL, NULL);
+
   this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;
   this->demux_plugin.open              = demux_roq_open;
   this->demux_plugin.start             = demux_roq_start;
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index b775d3d4e..c08d9c1b6 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_ts.c,v 1.49 2002/06/07 02:40:47 miguelfreitas Exp $
+ * $Id: demux_ts.c,v 1.50 2002/06/12 12:22:33 f1rmb Exp $
  *
  * Demultiplexer for MPEG2 Transport Streams.
  *
@@ -1443,9 +1443,9 @@ static int demux_ts_open(demux_plugin_t *this_gen, input_plugin_t *input,
     xine_strdupa(valid_mrls, 
 		 (this->config->register_string(this->config,
 						"mrl.mrls_ts", VALID_MRLS,
-						"valid mrls for ts demuxer",
+						_("valid mrls for ts demuxer"),
 						NULL, NULL, NULL)));
-
+    
     mrl = input->get_mrl(input);
     media = strstr(mrl, "://");
 
@@ -1478,8 +1478,7 @@ static int demux_ts_open(demux_plugin_t *this_gen, input_plugin_t *input,
       xine_strdupa(valid_ends, 
 		   (this->config->register_string(this->config,
 						  "mrl.ends_ts", VALID_ENDS,
-						  "valid mrls ending for ts " 
-						  "demuxer",
+						  _("valid mrls ending for ts demuxer"),
 						  NULL, NULL, NULL)));
       while((m = xine_strsep(&valid_ends, ",")) != NULL) {
 
@@ -1658,11 +1657,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
 
   (void*) this->config->register_string(this->config, "mrl.mrls_ts", 
 					VALID_MRLS,
-                                        "valid mrls for ts demuxer",
+                                        _("valid mrls for ts demuxer"),
                                         NULL, NULL, NULL);
   (void*) this->config->register_string(this->config,
                                         "mrl.ends_ts", VALID_ENDS,
-                                        "valid mrls ending for ts demuxer",
+                                        _("valid mrls ending for ts demuxer"),
                                         NULL, NULL, NULL);
 
   this->plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;