all: info strings are now localized, fixed some typos and inconsistant uses

of capital letters

diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index 1eb244b03ce3d177cf858e3df395ea63396aaf52..fbb139e686e22745c41e741bd6179f4dc126dad5 100644 (file)
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -2,7 +2,7 @@
  * vorbis.c: vorbis decoder module making use of libvorbis.
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: vorbis.c,v 1.14 2003/01/28 14:49:12 sigmunau Exp $
+ * $Id: vorbis.c,v 1.15 2003/03/14 00:24:08 sigmunau Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -182,11 +182,11 @@ static int RunDecoder( decoder_fifo_t * p_fifo )
         msg_Err( p_dec->p_fifo, "2nd Vorbis header is corrupted" );
         goto error;
     }
-    /* parse the vorbis comment */
+    /* parse the vorbis comment. FIXME should be done in demuxer*/
     {
         input_thread_t *p_input = (input_thread_t *)p_fifo->p_parent;
         input_info_category_t *p_cat = input_InfoCategory( p_input,
-                                                           "Vorbis Comment" );
+                                                           _("Vorbis Comment") );
         int i = 0;
         char *psz_name, *psz_value, *psz_comment;
         while ( i < p_dec->vc.comments )

diff --git a/modules/demux/aac/demux.c b/modules/demux/aac/demux.c
index 8c349bf5e592d32ae72f08b7905fc65d6d1948ec..37c5b7b34c65f5fe9bf2a4550d93253927a6ec16 100644 (file)
--- a/modules/demux/aac/demux.c
+++ b/modules/demux/aac/demux.c
@@ -2,7 +2,7 @@
  * demux.c : Raw aac Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: demux.c,v 1.5 2003/01/25 16:58:34 fenrir Exp $
+ * $Id: demux.c,v 1.6 2003/03/14 00:24:07 sigmunau Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -546,16 +546,16 @@ static int Activate( vlc_object_t * p_this )
                  p_aac->i_samplerate );
 
         vlc_mutex_lock( &p_input->stream.stream_lock );
-        p_category = input_InfoCategory( p_input, "aac" );
+        p_category = input_InfoCategory( p_input, _("Aac") );
 
-        input_AddInfo( p_category, "input type", "MPEG-%d AAC",
+        input_AddInfo( p_category, _("Input Type"), "MPEG-%d AAC",
                        p_aac->adts_header.i_id == 1 ? 2 : 4 );
 
-        input_AddInfo( p_category, "layer", "%d", 
+        input_AddInfo( p_category, _("Layer"), "%d", 
                        4 - p_aac->adts_header.i_layer );
-        input_AddInfo( p_category, "channels", "%d", 
+        input_AddInfo( p_category, _("Channels"), "%d", 
                        p_aac->i_channels );
-        input_AddInfo( p_category, "sample rate", "%dHz", 
+        input_AddInfo( p_category, _("Sample Rate"), "%dHz", 
                        p_aac->i_samplerate );
 
         vlc_mutex_unlock( &p_input->stream.stream_lock );

diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index 92b5329252ce9f776b48fd4e4a88d0bca1853c1a..9a319412a62e91edb723e870c45cb7ddae636f03 100644 (file)
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@ -2,7 +2,7 @@
  * asf.c : ASFv01 file input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: asf.c,v 1.22 2003/03/02 17:13:33 fenrir Exp $
+ * $Id: asf.c,v 1.23 2003/03/14 00:24:08 sigmunau Exp $
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -152,7 +152,7 @@ static int Activate( vlc_object_t * p_this )
     {
         input_info_category_t *p_cat = input_InfoCategory( p_input, "Asf" );
         msg_Dbg( p_input, "found %d streams", p_demux->i_streams );
-        input_AddInfo( p_cat, "Number of streams", "%d" , p_demux->i_streams );
+        input_AddInfo( p_cat, _("Number of streams"), "%d" , p_demux->i_streams );
     }
 
     /*  create one program */
@@ -215,7 +215,7 @@ static int Activate( vlc_object_t * p_this )
             }
 
             p_stream->i_cat = AUDIO_ES;
-            input_AddInfo( p_cat, "Type", "Audio" );
+            input_AddInfo( p_cat, _("Type"), _("Audio") );
             msg_Dbg( p_input,
                     "adding new audio stream(codec:0x%x,ID:%d)",
                     i_codec,
@@ -247,7 +247,7 @@ static int Activate( vlc_object_t * p_this )
                     p_stream->p_es->i_fourcc =
                         VLC_FOURCC( 'm','s',(i_codec >> 8)&0xff,i_codec&0xff );
             }
-            input_AddInfo( p_cat, "Codec", "%.4s", (char*)&p_stream->p_es->i_fourcc );
+            input_AddInfo( p_cat, _("Codec"), "%.4s", (char*)&p_stream->p_es->i_fourcc );
             if( p_sp->i_type_specific_data_length > 0 )
             {
                 WAVEFORMATEX    *p_wf;
@@ -262,14 +262,14 @@ static int Activate( vlc_object_t * p_this )
 
                 p_wf->wFormatTag        = GetWLE( p_data );
                 p_wf->nChannels         = GetWLE( p_data + 2 );
-                input_AddInfo( p_cat, "Channels", "%d", p_wf->nChannels );
+                input_AddInfo( p_cat, _("Channels"), "%d", p_wf->nChannels );
                 p_wf->nSamplesPerSec    = GetDWLE( p_data + 4 );
-                input_AddInfo( p_cat, "Sample rate", "%d", p_wf->nSamplesPerSec );
+                input_AddInfo( p_cat, _("Sample rate"), "%d", p_wf->nSamplesPerSec );
                 p_wf->nAvgBytesPerSec   = GetDWLE( p_data + 8 );
-                input_AddInfo( p_cat, "Avg. byterate", "%d", p_wf->nAvgBytesPerSec );
+                input_AddInfo( p_cat, _("Avg. byterate"), "%d", p_wf->nAvgBytesPerSec );
                 p_wf->nBlockAlign       = GetWLE( p_data + 12 );
                 p_wf->wBitsPerSample    = GetWLE( p_data + 14 );
-                input_AddInfo( p_cat, "Bits Per Sample", "%d", p_wf->wBitsPerSample );
+                input_AddInfo( p_cat, _("Bits Per Sample"), "%d", p_wf->wBitsPerSample );
                 p_wf->cbSize            = __MAX( 0,
                                               i_size - sizeof( WAVEFORMATEX ));
                 if( i_size > sizeof( WAVEFORMATEX ) )
@@ -285,7 +285,7 @@ static int Activate( vlc_object_t * p_this )
         if( CmpGUID( &p_sp->i_stream_type, &asf_object_stream_type_video ) )
         {
             p_stream->i_cat = VIDEO_ES;
-            input_AddInfo( p_cat, "Type", "Video" );
+            input_AddInfo( p_cat, _("Type"), _("Video") );
             msg_Dbg( p_input,
                     "adding new video stream(ID:%d)",
                     p_sp->i_stream_number );
@@ -302,7 +302,7 @@ static int Activate( vlc_object_t * p_this )
                 p_stream->p_es->i_fourcc =
                     VLC_FOURCC( 'u','n','d','f' );
             }
-            input_AddInfo( p_cat, "Codec", "%.4s", (char*)&p_stream->p_es->i_fourcc );
+            input_AddInfo( p_cat, _("Codec"), "%.4s", (char*)&p_stream->p_es->i_fourcc );
             if( p_sp->i_type_specific_data_length > 11 )
             {
                 BITMAPINFOHEADER *p_bih;
@@ -316,22 +316,22 @@ static int Activate( vlc_object_t * p_this )
                 p_data = p_sp->p_type_specific_data + 11;
 
                 p_bih->biSize       = GetDWLE( p_data );
-                input_AddInfo( p_cat, "Size", "%d", p_bih->biSize );
+                input_AddInfo( p_cat, _("Size"), "%d", p_bih->biSize );
                 p_bih->biWidth      = GetDWLE( p_data + 4 );
                 p_bih->biHeight     = GetDWLE( p_data + 8 );
-                input_AddInfo( p_cat, "Resolution", "%dx%d", p_bih->biWidth, p_bih->biHeight );
+                input_AddInfo( p_cat, _("Resolution"), "%dx%d", p_bih->biWidth, p_bih->biHeight );
                 p_bih->biPlanes     = GetDWLE( p_data + 12 );
-                input_AddInfo( p_cat, "Planes", "%d", p_bih->biPlanes );
+                input_AddInfo( p_cat, _("Planes"), "%d", p_bih->biPlanes );
                 p_bih->biBitCount   = GetDWLE( p_data + 14 );
-                input_AddInfo( p_cat, "Bits per pixel", "%d", p_bih->biBitCount );
+                input_AddInfo( p_cat, _("Bits per pixel"), "%d", p_bih->biBitCount );
                 p_bih->biCompression= GetDWLE( p_data + 16 );
-                input_AddInfo( p_cat, "Compression Rate", "%d", p_bih->biCompression );
+                input_AddInfo( p_cat, _("Compression Rate"), "%d", p_bih->biCompression );
                 p_bih->biSizeImage  = GetDWLE( p_data + 20 );
-                input_AddInfo( p_cat, "Image Size", "%d", p_bih->biSizeImage );
+                input_AddInfo( p_cat, _("Image Size"), "%d", p_bih->biSizeImage );
                 p_bih->biXPelsPerMeter = GetDWLE( p_data + 24 );
-                input_AddInfo( p_cat, "X pixels per meter", "%d", p_bih->biXPelsPerMeter );
+                input_AddInfo( p_cat, _("X pixels per meter"), "%d", p_bih->biXPelsPerMeter );
                 p_bih->biYPelsPerMeter = GetDWLE( p_data + 28 );
-                input_AddInfo( p_cat, "Y pixels per meter", "%d", p_bih->biYPelsPerMeter );
+                input_AddInfo( p_cat, _("Y pixels per meter"), "%d", p_bih->biYPelsPerMeter );
                 p_bih->biClrUsed       = GetDWLE( p_data + 32 );
                 p_bih->biClrImportant  = GetDWLE( p_data + 36 );
 

diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c
index 6ac050fd9c969aedae4a7ede0eb30c9d226038eb..84b0de16e42d06a2cba5753634b2e024dfc03b59 100644 (file)
--- a/modules/demux/asf/libasf.c
+++ b/modules/demux/asf/libasf.c
@@ -2,7 +2,7 @@
  * libasf.c :
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: libasf.c,v 1.11 2003/02/24 09:26:26 fenrir Exp $
+ * $Id: libasf.c,v 1.12 2003/03/14 00:24:08 sigmunau Exp $
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -611,8 +611,8 @@ int  ASF_ReadObject_codec_list( input_thread_t *p_input,
         p_cat = input_InfoCategory( p_input, psz_cat);
 
 #define codec p_cl->codec[i_codec]
-        input_AddInfo( p_cat, "Codec name", codec.psz_name );
-        input_AddInfo( p_cat, "Codec description", codec.psz_description );
+        input_AddInfo( p_cat, _("Codec name"), codec.psz_name );
+        input_AddInfo( p_cat, _("Codec description"), codec.psz_description );
         msg_Dbg( p_input,
                  "Read \"Codec List Object\" codec[%d] %s name:\"%s\" description:\"%s\" information_length:%d",
                  i_codec,
@@ -692,12 +692,12 @@ int  ASF_ReadObject_content_description( input_thread_t *p_input,
 
 #ifdef ASF_DEBUG
     {
-        input_info_category_t *p_cat = input_InfoCategory( p_input, "Asf" );
-        input_AddInfo( p_cat, "Title", p_cd->psz_title );
-        input_AddInfo( p_cat, "Author", p_cd->psz_author );
-        input_AddInfo( p_cat, "Copyright", p_cd->psz_copyright );
-        input_AddInfo( p_cat, "Description", p_cd->psz_description );
-        input_AddInfo( p_cat, "Rating", p_cd->psz_rating );
+        input_info_category_t *p_cat = input_InfoCategory( p_input, _("Asf") );
+        input_AddInfo( p_cat, _("Title"), p_cd->psz_title );
+        input_AddInfo( p_cat, _("Author"), p_cd->psz_author );
+        input_AddInfo( p_cat, _("Copyright"), p_cd->psz_copyright );
+        input_AddInfo( p_cat, _("Description"), p_cd->psz_description );
+        input_AddInfo( p_cat, _("Rating"), p_cd->psz_rating );
     }
     msg_Dbg( p_input,
              "Read \"Content Description Object\" title:\"%s\" author:\"%s\" copyright:\"%s\" description:\"%s\" rating:\"%s\"",

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 0f8bdcdd6a306ce7022a2350f7d830c52798aa35..d2b36c0a8ae7e50bc794b3c071ceffbee4bee72e 100644 (file)
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -2,7 +2,7 @@
  * avi.c : AVI file Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: avi.c,v 1.40 2003/03/13 16:09:20 hartman Exp $
+ * $Id: avi.c,v 1.41 2003/03/14 00:24:07 sigmunau Exp $
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -930,9 +930,9 @@ static int AVIInit( vlc_object_t * p_this )
              p_avih->i_flags&AVIF_ISINTERLEAVED?" IS_INTERLEAVED":"",
              p_avih->i_flags&AVIF_TRUSTCKTYPE?" TRUST_CKTYPE":"" );
     {
-        input_info_category_t *p_cat = input_InfoCategory( p_input, "Avi" );
-        input_AddInfo( p_cat, "Number of streams", "%d", p_avi->i_streams );
-        input_AddInfo( p_cat, "Flags", "%s%s%s%s",
+        input_info_category_t *p_cat = input_InfoCategory( p_input, _("Avi") );
+        input_AddInfo( p_cat, _("Number of Streams"), "%d", p_avi->i_streams );
+        input_AddInfo( p_cat, _("Flags"), "%s%s%s%s",
                        p_avih->i_flags&AVIF_HASINDEX?" HAS_INDEX":"",
                        p_avih->i_flags&AVIF_MUSTUSEINDEX?" MUST_USE_INDEX":"",
                        p_avih->i_flags&AVIF_ISINTERLEAVED?" IS_INTERLEAVED":"",
@@ -1001,15 +1001,15 @@ static int AVIInit( vlc_object_t * p_this )
                     input_info_category_t *p_cat;
                     sprintf(hepp, "Stream %d", i);
                     p_cat = input_InfoCategory( p_input, hepp);
-                    input_AddInfo( p_cat, "Type", "audio(0x%x)",
+                    input_AddInfo( p_cat, _("Type"), "Audio(0x%x)",
                                    p_avi_strf_auds->p_wf->wFormatTag );
-                    input_AddInfo( p_cat, "Codec", "%4.4s",
+                    input_AddInfo( p_cat, _("Codec"), "%4.4s",
                                    (const char*)&(p_info->i_codec) );
-                    input_AddInfo( p_cat, "Channels", "%d",
+                    input_AddInfo( p_cat, _("Channels"), "%d",
                                    p_avi_strf_auds->p_wf->nChannels );
-                    input_AddInfo( p_cat, "Samplerate", "%d",
+                    input_AddInfo( p_cat, _("Sample Rate"), "%d",
                                    p_avi_strf_auds->p_wf->nSamplesPerSec );
-                    input_AddInfo( p_cat, "Bits Per Sample", "%d",
+                    input_AddInfo( p_cat, _("Bits Per Sample"), "%d",
                                    p_avi_strf_auds->p_wf->wBitsPerSample );
                 }
                 break;
@@ -1035,18 +1035,18 @@ static int AVIInit( vlc_object_t * p_this )
                 {
                     char hepp[sizeof("Stream") + 10];
                     input_info_category_t *p_cat;
-                    sprintf(hepp, "stream %d", i);
+                    sprintf(hepp, "Stream %d", i);
                     p_cat = input_InfoCategory( p_input, hepp);
-                    input_AddInfo( p_cat, "Type", "video" );
-                    input_AddInfo( p_cat, "Codec", "%4.4s",
+                    input_AddInfo( p_cat, _("Type"), _("Video") );
+                    input_AddInfo( p_cat, _("Codec"), "%4.4s",
                                    (const char*)&(p_info->i_codec) );
-                    input_AddInfo( p_cat, "Resolution", "%dx%d",
+                    input_AddInfo( p_cat, _("Resolution"), "%dx%d",
                                    p_avi_strf_vids->p_bih->biWidth,
                                    p_avi_strf_vids->p_bih->biHeight );
-                    input_AddInfo( p_cat, "Frame Rate", "%f",
+                    input_AddInfo( p_cat, _("Frame Rate"), "%f",
                                    (float)p_info->i_rate /
                                        (float)p_info->i_scale );
-                    input_AddInfo( p_cat, "Bits Per Pixel", "%d",
+                    input_AddInfo( p_cat, _("Bits Per Pixel"), "%d",
                                    p_avi_strf_vids->p_bih->biBitCount );
                 }
 #ifdef __AVI_SUBTITLE__
@@ -1066,9 +1066,9 @@ static int AVIInit( vlc_object_t * p_this )
                 {
                     char psz_cat[32]; /* We'll clip i just in case */
                     input_info_category_t *p_cat;
-                    sprintf( psz_cat, "stream %d", __MIN( i, 100000 ) );
+                    sprintf( psz_cat, "Stream %d", __MIN( i, 100000 ) );
                     p_cat = input_InfoCategory( p_input, psz_cat );
-                    input_AddInfo( p_cat, "Type", "unknown" );
+                    input_AddInfo( p_cat, _("Type"), _("Unknown") );
                 }
                 break;
         }

diff --git a/modules/demux/mpeg/audio.c b/modules/demux/mpeg/audio.c
index 5cd160cab4198b4f1cfe1726ee50a7eacf07081c..081a37a6a1195f0a9eb1c824f83722a38dce07a2 100644 (file)
--- a/modules/demux/mpeg/audio.c
+++ b/modules/demux/mpeg/audio.c
@@ -2,7 +2,7 @@
  * audio.c : mpeg audio Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: audio.c,v 1.13 2003/02/18 00:51:40 fenrir Exp $
+ * $Id: audio.c,v 1.14 2003/03/14 00:24:08 sigmunau Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -611,15 +611,15 @@ static int Activate( vlc_object_t * p_this )
                     );
 
         vlc_mutex_lock( &p_input->stream.stream_lock );
-        p_category = input_InfoCategory( p_input, "mpeg" );
-        input_AddInfo( p_category, "input type", "audio MPEG-%d",
+        p_category = input_InfoCategory( p_input, _("mpeg") );
+        input_AddInfo( p_category, _("Input Type"), "Audio MPEG-%d",
                        p_demux->mpeg.i_version +1 );
-        input_AddInfo( p_category, "layer", "%d", p_demux->mpeg.i_layer + 1 );
-        input_AddInfo( p_category, "mode",
+        input_AddInfo( p_category, _("Layer"), "%d", p_demux->mpeg.i_layer + 1 );
+        input_AddInfo( p_category, _("Mode"),
                        mpegaudio_mode[p_demux->mpeg.i_mode] );
-        input_AddInfo( p_category, "sample rate", "%dHz",
+        input_AddInfo( p_category, _("Sample Rate"), "%dHz",
                        p_demux->mpeg.i_samplerate );
-        input_AddInfo( p_category, "average bitrate", "%dKb/s",
+        input_AddInfo( p_category, _("Average Bitrate"), "%dKb/s",
                        p_demux->xingheader.i_avgbitrate / 1000 );
         vlc_mutex_unlock( &p_input->stream.stream_lock );
     }
@@ -628,8 +628,8 @@ static int Activate( vlc_object_t * p_this )
         msg_Dbg( p_input,
                  "assuming audio MPEG, but not frame header yet found" );
         vlc_mutex_lock( &p_input->stream.stream_lock );
-        p_category = input_InfoCategory( p_input, "mpeg" );
-        input_AddInfo( p_category, "input type", "audio MPEG-?" );
+        p_category = input_InfoCategory( p_input, _("mpeg") );
+        input_AddInfo( p_category, _("Input Type"), "Audio MPEG-?" );
         vlc_mutex_unlock( &p_input->stream.stream_lock );
 
     }

diff --git a/modules/demux/mpeg/m4v.c b/modules/demux/mpeg/m4v.c
index 8814752cbfdf5b63732d38d6c7de19d7999bb361..26465df3f688d8a0f586b9f16c7cbba489fe8104 100644 (file)
--- a/modules/demux/mpeg/m4v.c
+++ b/modules/demux/mpeg/m4v.c
@@ -2,7 +2,7 @@
  * m4v.c : MPEG-4 video Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: m4v.c,v 1.2 2003/01/20 13:06:34 fenrir Exp $
+ * $Id: m4v.c,v 1.3 2003/03/14 00:24:08 sigmunau Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -148,8 +148,8 @@ static int Activate( vlc_object_t * p_this )
     vlc_mutex_unlock( &p_input->stream.stream_lock );
 
     vlc_mutex_lock( &p_input->stream.stream_lock );
-    p_category = input_InfoCategory( p_input, "mpeg" );
-    input_AddInfo( p_category, "input type", "video MPEG-4 (raw ES)" );
+    p_category = input_InfoCategory( p_input, _("mpeg") );
+    input_AddInfo( p_category, _("Input Type"), _("Video MPEG-4 (raw ES)") );
     vlc_mutex_unlock( &p_input->stream.stream_lock );
 
     return( 0 );

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index c762fa8964e7d9c35ac0c23c4283f4a34b4e2a3a..455d01d5f8d3ccbbf6b4b49d1ccbd11715bcfcaa 100644 (file)
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -2,7 +2,7 @@
  * ogg.c : ogg stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: ogg.c,v 1.19 2003/01/29 12:59:23 gbazin Exp $
+ * $Id: ogg.c,v 1.20 2003/03/14 00:24:08 sigmunau Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  * 
@@ -550,11 +550,11 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg)
                         input_info_category_t *p_cat;
                         sprintf( title, "Stream %d", p_ogg->i_streams );
                         p_cat = input_InfoCategory( p_input, title );
-                        input_AddInfo( p_cat, "Type", "Audio" );
-                        input_AddInfo( p_cat, "Codec", "vorbis" );
-                        input_AddInfo( p_cat, "Sample Rate", "%f",
+                        input_AddInfo( p_cat, _("Type"), _("Audio") );
+                        input_AddInfo( p_cat, _("Codec"), _("Vorbis") );
+                        input_AddInfo( p_cat, _("Sample Rate"), "%f",
                                        p_stream->f_rate );
-                        input_AddInfo( p_cat, "Bit Rate", "%d",
+                        input_AddInfo( p_cat, _("Bit Rate"), "%d",
                                        p_stream->i_bitrate );
                     }
                 }
@@ -609,11 +609,11 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg)
                         input_info_category_t *p_cat;
                         sprintf( title, "Stream %d", p_ogg->i_streams );
                         p_cat = input_InfoCategory( p_input, title );
-                        input_AddInfo( p_cat, "Type", "Video" );
-                        input_AddInfo( p_cat, "Codec", "theora" );
-                        input_AddInfo( p_cat, "Frame Rate", "%f",
+                        input_AddInfo( p_cat, _("Type"), _("Video") );
+                        input_AddInfo( p_cat, _("Codec"), _("Theora") );
+                        input_AddInfo( p_cat, _("Frame Rate"), "%f",
                                        p_stream->f_rate );
-                        input_AddInfo( p_cat, "Bit Rate", "%d",
+                        input_AddInfo( p_cat, _("Bit Rate"), "%d",
                                        p_stream->i_bitrate );
                     }
 #else /* HAVE_OGGPACKB */
@@ -649,11 +649,11 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg)
                         input_info_category_t *p_cat;
                         sprintf( title, "Stream %d", p_ogg->i_streams );
                         p_cat = input_InfoCategory( p_input, title );
-                        input_AddInfo( p_cat, "Type", "Video" );
-                        input_AddInfo( p_cat, "Codec", "tarkin" );
-                        input_AddInfo( p_cat, "Sample Rate", "%f",
+                        input_AddInfo( p_cat, _("Type"), _("Video") );
+                        input_AddInfo( p_cat, _("Codec"), _("tarkin") );
+                        input_AddInfo( p_cat, _("Sample Rate"), "%f",
                                        p_stream->f_rate );
-                        input_AddInfo( p_cat, "Bit Rate", "%d",
+                        input_AddInfo( p_cat, _("Bit Rate"), "%d",
                                        p_stream->i_bitrate );
                     }
 
@@ -714,16 +714,16 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg)
                             input_info_category_t *p_cat;
                             sprintf( title, "Stream %d", p_ogg->i_streams );
                             p_cat = input_InfoCategory( p_input, title );
-                            input_AddInfo( p_cat, "Type", "Video" );
-                            input_AddInfo( p_cat, "Codec", "%.4s",
+                            input_AddInfo( p_cat, _("Type"), _("Video") );
+                            input_AddInfo( p_cat, _("Codec"), "%.4s",
                                            (char *)&p_stream->i_fourcc );
-                            input_AddInfo( p_cat, "Frame Rate", "%f",
+                            input_AddInfo( p_cat, _("Frame Rate"), "%f",
                                            p_stream->f_rate );
-                            input_AddInfo( p_cat, "Bit Count", "%d",
+                            input_AddInfo( p_cat, _("Bit Count"), "%d",
                                            p_stream->p_bih->biBitCount );
-                            input_AddInfo( p_cat, "Width", "%d",
+                            input_AddInfo( p_cat, _("Width"), "%d",
                                            p_stream->p_bih->biWidth );
-                            input_AddInfo( p_cat, "Height", "%d",
+                            input_AddInfo( p_cat, _("Height"), "%d",
                                            p_stream->p_bih->biHeight );
                         }
                         p_stream->i_bitrate = 0;
@@ -809,17 +809,17 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg)
                             input_info_category_t *p_cat;
                             sprintf( title, "Stream %d", p_ogg->i_streams );
                             p_cat = input_InfoCategory( p_input, title );
-                            input_AddInfo( p_cat, "Type", "Audio" );
-                            input_AddInfo( p_cat, "Codec", "%.4s", 
+                            input_AddInfo( p_cat, _("Type"), _("Audio") );
+                            input_AddInfo( p_cat, _("Codec"), _("%.4s"), 
                                            (char *)&p_stream->i_fourcc );
-                            input_AddInfo( p_cat, "Sample Rate", "%d",
+                            input_AddInfo( p_cat, _("Sample Rate"), "%d",
                                            p_stream->p_wf->nSamplesPerSec );
-                            input_AddInfo( p_cat, "Bit Rate", "%d",
+                            input_AddInfo( p_cat, _("Bit Rate"), "%d",
                                            p_stream->p_wf->nAvgBytesPerSec * 8
                                               / 1024 );
-                            input_AddInfo( p_cat, "Channels", "%d",
+                            input_AddInfo( p_cat, _("Channels"), "%d",
                                            p_stream->p_wf->nChannels );
-                            input_AddInfo( p_cat, "Bits per Sample", "%d",
+                            input_AddInfo( p_cat, _("Bits per Sample"), "%d",
                                            p_stream->p_wf->wBitsPerSample );
                         }
 
@@ -889,16 +889,16 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg)
                             input_info_category_t *p_cat;
                             sprintf( title, "Stream %d", p_ogg->i_streams );
                             p_cat = input_InfoCategory( p_input, title );
-                            input_AddInfo( p_cat, "Type", "Video" );
-                            input_AddInfo( p_cat, "Codec", "%.4s",
+                            input_AddInfo( p_cat, _("Type"), _("Video") );
+                            input_AddInfo( p_cat, _("Codec"), "%.4s",
                                            (char *)&p_stream->i_fourcc );
-                            input_AddInfo( p_cat, "Frame Rate", "%f",
+                            input_AddInfo( p_cat, _("Frame Rate"), "%f",
                                            p_stream->f_rate );
-                            input_AddInfo( p_cat, "Bit Count", "%d",
+                            input_AddInfo( p_cat, _("Bit Count"), "%d",
                                            p_stream->p_bih->biBitCount );
-                            input_AddInfo( p_cat, "Width", "%d",
+                            input_AddInfo( p_cat, _("Width"), "%d",
                                            p_stream->p_bih->biWidth );
-                            input_AddInfo( p_cat, "Height", "%d",
+                            input_AddInfo( p_cat, _("Height"), "%d",
                                            p_stream->p_bih->biHeight );
                         }
                         p_stream->i_bitrate = 0;
@@ -982,17 +982,17 @@ static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg)
                             input_info_category_t *p_cat;
                             sprintf( title, "Stream %d", p_ogg->i_streams );
                             p_cat = input_InfoCategory( p_input, title );
-                            input_AddInfo( p_cat, "Type", "Audio" );
-                            input_AddInfo( p_cat, "Codec", "%.4s", 
+                            input_AddInfo( p_cat, _("Type"), _("Audio") );
+                            input_AddInfo( p_cat, _("Codec"), "%.4s", 
                                            (char *)&p_stream->i_fourcc );
-                            input_AddInfo( p_cat, "Sample Rate", "%d",
+                            input_AddInfo( p_cat, _("Sample Rate"), "%d",
                                            p_stream->p_wf->nSamplesPerSec );
-                            input_AddInfo( p_cat, "Bit Rate", "%d",
+                            input_AddInfo( p_cat, _("Bit Rate"), "%d",
                                            p_stream->p_wf->nAvgBytesPerSec * 8
                                               / 1024 );
-                            input_AddInfo( p_cat, "Channels", "%d",
+                            input_AddInfo( p_cat, _("Channels"), "%d",
                                            p_stream->p_wf->nChannels );
-                            input_AddInfo( p_cat, "Bits per Sample", "%d",
+                            input_AddInfo( p_cat, _("Bits per Sample"), "%d",
                                            p_stream->p_wf->wBitsPerSample );
                         }
                     }

diff --git a/src/input/input.c b/src/input/input.c
index dfbf04cfa2d7b3949fa8f95d13380ab5b1a2d353..8060c5928eb72e81ab173503e0674cbf92bdbcae 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -4,7 +4,7 @@
  * decoders.
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: input.c,v 1.224 2003/03/11 23:56:54 gbazin Exp $
+ * $Id: input.c,v 1.225 2003/03/14 00:24:08 sigmunau Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -148,8 +148,8 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
 
     msg_Info( p_input, "playlist item `%s'", p_input->psz_source );
 
-    p_info = input_InfoCategory( p_input, "General" );
-    input_AddInfo( p_info, "playlist item", p_input->psz_source );
+    p_info = input_InfoCategory( p_input, _("General") );
+    input_AddInfo( p_info, _("Playlist Item"), p_input->psz_source );
     vlc_object_attach( p_input, p_parent );
 
     /* Create thread and wait for its readiness. */