- Updated French translation (still a lot of work to do...)

- Modified some strings in VLC source code
- ran ./toolbox --update-po

modules/access/dvb/qpsk.c

@@ -44,10 +44,10 @@ void E_(Close)   ( vlc_object_t * );
 #define ADAPTER_TEXT N_("adapter card to tune")
 #define ADAPTER_LONGTEXT N_("adapter cards have a device file in directory named /dev/dvb/adapter[n] with n>=0")
 
-#define DEVICE_TEXT N_("device nummer to use on adapter")
+#define DEVICE_TEXT N_("device number to use on adapter")
 #define DEVICE_LONGTEXT ""
 
-#define FREQ_TEXT N_("satellite default transponder frequency in KHz")
+#define FREQ_TEXT N_("satellite default transponder frequency in kHz")
 #define FREQ_LONGTEXT ""
 
 #define POL_TEXT N_("satellite default transponder polarization")
@@ -56,19 +56,19 @@ void E_(Close)   ( vlc_object_t * );
 #define FEC_TEXT N_("satellite default transponder FEC")
 #define FEC_LONGTEXT N_("FEC=Forward Error Correction mode")
 
-#define SRATE_TEXT N_("satellite default transponder symbol rate in KHz")
+#define SRATE_TEXT N_("satellite default transponder symbol rate in kHz")
 #define SRATE_LONGTEXT ""
 
 #define DISEQC_TEXT N_("use diseqc with antenna")
 #define DISEQC_LONGTEXT ""
 
-#define LNB_LOF1_TEXT N_("antenna lnb_lof1 (KHz)")
+#define LNB_LOF1_TEXT N_("antenna lnb_lof1 (kHz)")
 #define LNB_LOF1_LONGTEXT ""
 
-#define LNB_LOF2_TEXT N_("antenna lnb_lof2 (KHz)")
+#define LNB_LOF2_TEXT N_("antenna lnb_lof2 (kHz)")
 #define LNB_LOF2_LONGTEXT ""
 
-#define LNB_SLOF_TEXT N_("antenna lnb_slof (KHz)")
+#define LNB_SLOF_TEXT N_("antenna lnb_slof (kHz)")
 #define LNB_SLOF_LONGTEXT ""
 
 #define PROBE_TEXT	N_("probe the dvb card for capabilities (default disabled)")

modules/access/pvr/pvr.c

@@ -2,7 +2,7 @@
  * pvr.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: pvr.c,v 1.9 2003/10/24 09:32:32 bigben Exp $
+ * $Id: pvr.c,v 1.10 2003/11/23 18:31:54 alexis Exp $
  *
  * Authors: Eric Petit <titer@videolan.org>
  *
@@ -74,7 +74,7 @@ static ssize_t Read   ( input_thread_t *, byte_t *, size_t );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("Hauppauge PVR cards input") );
+    set_description( _("input for encoding cards supported by the ivtv drivers") );
     set_capability( "access", 0 );
     add_shortcut( "pvr" );
     set_callbacks( Open, Close );

modules/access/satellite/satellite.c

@@ -44,7 +44,7 @@ void E_(Close)   ( vlc_object_t * );
 #define TUNER_TEXT N_("Tuner number")
 #define TUNER_LONGTEXT ""
 
-#define FREQ_TEXT N_("Satellite default transponder frequency (KHz)")
+#define FREQ_TEXT N_("Satellite default transponder frequency (kHz)")
 #define FREQ_LONGTEXT ""
 
 #define POL_TEXT N_("Satellite default transponder polarization")
@@ -53,19 +53,19 @@ void E_(Close)   ( vlc_object_t * );
 #define FEC_TEXT N_("Satellite default transponder FEC")
 #define FEC_LONGTEXT ""
 
-#define SRATE_TEXT N_("Satellite default transponder symbol rate (KHz)")
+#define SRATE_TEXT N_("Satellite default transponder symbol rate (kHz)")
 #define SRATE_LONGTEXT ""
 
 #define DISEQC_TEXT N_("Use diseqc with antenna")
 #define DISEQC_LONGTEXT ""
 
-#define LNB_LOF1_TEXT N_("Antenna lnb_lof1 (KHz)")
+#define LNB_LOF1_TEXT N_("Antenna lnb_lof1 (kHz)")
 #define LNB_LOF1_LONGTEXT ""
 
-#define LNB_LOF2_TEXT N_("Antenna lnb_lof2 (KHz)")
+#define LNB_LOF2_TEXT N_("Antenna lnb_lof2 (kHz)")
 #define LNB_LOF2_LONGTEXT ""
 
-#define LNB_SLOF_TEXT N_("Antenna lnb_slof (KHz)")
+#define LNB_SLOF_TEXT N_("Antenna lnb_slof (kHz)")
 #define LNB_SLOF_LONGTEXT ""
 
 vlc_module_begin();

modules/access/v4l/v4l.c

@@ -2,7 +2,7 @@
  * v4l.c : Video4Linux input module for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: v4l.c,v 1.30 2003/11/15 23:21:35 fenrir Exp $
+ * $Id: v4l.c,v 1.31 2003/11/23 18:31:54 alexis Exp $
  *
  * Author: Laurent Aimar <fenrir@via.ecp.fr>
  *         Paul Forgey <paulf at aphrodite dot com>
@@ -92,7 +92,7 @@ static int  Demux      ( input_thread_t * );
 #define ADEV_TEXT N_("Audio device name")
 #define ADEV_LONGTEXT N_( \
     "Specify the name of the audio device that will be used. " \
-    "If you don't specify anything, no video device will be used.")
+    "If you don't specify anything, no audio device will be used.")
 
 vlc_module_begin();
     set_description( _("Video4Linux input") );

modules/gui/wxwindows/v4l.cpp

@@ -2,7 +2,7 @@
  * v4l.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: v4l.cpp,v 1.2 2003/08/20 19:17:29 adn Exp $
+ * $Id: v4l.cpp,v 1.3 2003/11/23 18:31:54 alexis Exp $
  *
  * Authors: Mohammed Adnne Trojette <adn@via.ecp.fr>
  *
@@ -303,7 +303,7 @@ wxPanel *V4LDialog::CommonPanel( wxWindow* parent )
                                          Frequency_Event,
                                          wxU(_("Frequency")) );
     frequency = new wxSpinCtrl( common_subpanel, Frequency_Event );
-    frequency->SetToolTip( wxU(_("The frequency in KHz" )) );
+    frequency->SetToolTip( wxU(_("The frequency in kHz" )) );
 
     subpanel_sizer->Add( frequency_checkbox, 0, wxALIGN_LEFT |
                          wxALIGN_CENTER_VERTICAL );

modules/misc/sap.c

@@ -2,7 +2,7 @@
  * sap.c :  SAP interface module
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: sap.c,v 1.38 2003/11/22 12:33:04 sigmunau Exp $
+ * $Id: sap.c,v 1.39 2003/11/23 18:31:54 alexis Exp $
  *
  * Authors: Arnaud Schauly <gitan@via.ecp.fr>
  *          Clment Stenac <zorglub@via.ecp.fr>
@@ -87,9 +87,9 @@
 #define SAP_ADDR_TEXT N_("SAP multicast address")
 #define SAP_ADDR_LONGTEXT N_("SAP multicast address")
 #define SAP_IPV4_TEXT N_("IPv4-SAP listening")
-#define SAP_IPV4_LONGTEXT N_("Set this if you want SAP to listen for IPv4 announces")
+#define SAP_IPV4_LONGTEXT N_("Set this if you want the SAP module to listen to IPv4 announces")
 #define SAP_IPV6_TEXT N_("IPv6-SAP listening")
-#define SAP_IPV6_LONGTEXT N_("Set this if you want SAP to listen for IPv6 announces")
+#define SAP_IPV6_LONGTEXT N_("Set this if you want the SAP module to listen to IPv6 announces")
 #define SAP_SCOPE_TEXT N_("IPv6 SAP scope")
 #define SAP_SCOPE_LONGTEXT N_("Sets the scope for IPv6 announces (default is 8)")
 

modules/video_filter/logo.c

@@ -2,7 +2,7 @@
  * logo.c : logo video plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: logo.c,v 1.4 2003/10/15 22:49:48 gbazin Exp $
+ * $Id: logo.c,v 1.5 2003/11/23 18:31:54 alexis Exp $
  *
  * Authors: Simon Latapie <garf@videolan.org>
  *
@@ -56,7 +56,7 @@ static int MouseEvent( vlc_object_t *, char const *,
  *****************************************************************************/
 
 #define FILE_TEXT N_("Logo File")
-#define FILE_LONGTEXT N_("It must be a PNG in RGBA 8bits (for now)")
+#define FILE_LONGTEXT N_("The file must in PNG RGBA 8bits format (for now)")
 #define POSX_TEXT N_("x postion of the logo")
 #define POSX_LONGTEXT N_("You can move the logo by left-clicking on it" )
 #define POSY_TEXT N_("y position of the logo")

po/POTFILES.in

@@ -34,6 +34,7 @@ include/vlc/intf.h
 include/vlc/sout.h
 include/vlc/vlc.h
 include/vlc/vout.h
+include/vlc_bits.h
 include/vlc_block.h
 include/vlc_block_helper.h
 include/vlc_codec.h
@@ -41,6 +42,7 @@ include/vlc_common.h
 include/vlc_config.h
 include/vlc_cpu.h
 include/vlc_error.h
+include/vlc_es.h
 include/vlc_help.h
 include/vlc_interface.h
 include/vlc_keys.h
@@ -96,11 +98,14 @@ src/misc/objects.c
 src/misc/threads.c
 src/misc/variables.c
 src/misc/win32_specific.c
+src/playlist/group.c
+src/playlist/item.c
+src/playlist/loadsave.c
 src/playlist/playlist.c
+src/playlist/sort.c
 src/stream_output/stream_output.c
 src/video_output/video_output.c
 src/video_output/video_text.c
-src/video_output/video_text.h
 src/video_output/vout_pictures.c
 src/video_output/vout_pictures.h
 src/video_output/vout_subpictures.c
@@ -231,13 +236,14 @@ modules/codec/araw.c
 modules/codec/cinepak.c
 modules/codec/dts.c
 modules/codec/dv.c
-modules/codec/faad/decoder.c
-modules/codec/faad/decoder.h
+modules/codec/dvbsub.c
+modules/codec/faad.c
 modules/codec/ffmpeg/audio.c
-modules/codec/ffmpeg/audio.h
 modules/codec/ffmpeg/chroma.c
+modules/codec/ffmpeg/encoder.c
 modules/codec/ffmpeg/ffmpeg.c
 modules/codec/ffmpeg/ffmpeg.h
+modules/codec/ffmpeg/postprocess.c
 modules/codec/ffmpeg/postprocessing/postprocessing.c
 modules/codec/ffmpeg/postprocessing/postprocessing.h
 modules/codec/ffmpeg/postprocessing/postprocessing_c.c
@@ -245,13 +251,13 @@ modules/codec/ffmpeg/postprocessing/postprocessing_common.h
 modules/codec/ffmpeg/postprocessing/postprocessing_mmx.c
 modules/codec/ffmpeg/postprocessing/postprocessing_mmxext.c
 modules/codec/ffmpeg/video.c
-modules/codec/ffmpeg/video.h
-modules/codec/flacdec.c
+modules/codec/flac.c
 modules/codec/libmpeg2.c
 modules/codec/lpcm.c
 modules/codec/mpeg_audio.c
 modules/codec/quicktime.c
 modules/codec/rawvideo.c
+modules/codec/speex.c
 modules/codec/spudec/parse.c
 modules/codec/spudec/render.c
 modules/codec/spudec/spudec.c
@@ -263,6 +269,7 @@ modules/codec/vorbis.c
 modules/codec/xvid.c
 modules/control/corba/corba.c
 modules/control/gestures.c
+modules/control/hotkeys.c
 modules/control/http.c
 modules/control/joystick.c
 modules/control/lirc/lirc.c
@@ -279,23 +286,24 @@ modules/demux/avi/avi.h
 modules/demux/avi/libavi.c
 modules/demux/avi/libavi.h
 modules/demux/demuxdump.c
+modules/demux/demuxstream.c
 modules/demux/flac.c
+modules/demux/livedotcom.cpp
 modules/demux/m3u.c
 modules/demux/mkv.cpp
 modules/demux/mp4/libmp4.c
 modules/demux/mp4/libmp4.h
 modules/demux/mp4/mp4.c
 modules/demux/mp4/mp4.h
-modules/demux/mpeg/es.c
 modules/demux/mpeg/m4v.c
 modules/demux/mpeg/mpga.c
+modules/demux/mpeg/mpgv.c
 modules/demux/mpeg/ps.c
 modules/demux/mpeg/system.c
 modules/demux/mpeg/system.h
 modules/demux/mpeg/ts.c
 modules/demux/ogg.c
 modules/demux/rawdv.c
-modules/demux/sdp.c
 modules/demux/util/id3.c
 modules/demux/util/id3genres.h
 modules/demux/util/id3tag.c
@@ -416,6 +424,8 @@ modules/gui/macosx/playlist.h
 modules/gui/macosx/playlist.m
 modules/gui/macosx/prefs.h
 modules/gui/macosx/prefs.m
+modules/gui/macosx/prefs_widgets.h
+modules/gui/macosx/prefs_widgets.m
 modules/gui/macosx/vout.h
 modules/gui/macosx/vout.m
 modules/gui/ncurses/ncurses.c
@@ -541,7 +551,10 @@ modules/gui/wxwindows/messages.cpp
 modules/gui/wxwindows/open.cpp
 modules/gui/wxwindows/playlist.cpp
 modules/gui/wxwindows/preferences.cpp
+modules/gui/wxwindows/preferences_widgets.cpp
+modules/gui/wxwindows/preferences_widgets.h
 modules/gui/wxwindows/streamout.cpp
+modules/gui/wxwindows/streamwizard.cpp
 modules/gui/wxwindows/subtitles.cpp
 modules/gui/wxwindows/timer.cpp
 modules/gui/wxwindows/v4l.cpp
@@ -551,6 +564,7 @@ modules/misc/dummy/aout.c
 modules/misc/dummy/decoder.c
 modules/misc/dummy/dummy.c
 modules/misc/dummy/dummy.h
+modules/misc/dummy/encoder.c
 modules/misc/dummy/input.c
 modules/misc/dummy/interface.c
 modules/misc/dummy/renderer.c
@@ -562,6 +576,7 @@ modules/misc/logger/logger.c
 modules/misc/memcpy/fastmemcpy.h
 modules/misc/memcpy/memcpy.c
 modules/misc/memcpy/memcpyaltivec.c
+modules/misc/network/ipv4-work.c
 modules/misc/network/ipv4.c
 modules/misc/network/ipv6.c
 modules/misc/qte_main.cpp
@@ -592,8 +607,12 @@ modules/stream_out/dummy.c
 modules/stream_out/duplicate.c
 modules/stream_out/es.c
 modules/stream_out/gather.c
+modules/stream_out/rtp.c
 modules/stream_out/standard.c
 modules/stream_out/transcode.c
+modules/stream_out/transrate/getvlc.h
+modules/stream_out/transrate/putvlc.h
+modules/stream_out/transrate/transrate.c
 modules/video_chroma/i420_rgb.c
 modules/video_chroma/i420_rgb.h
 modules/video_chroma/i420_rgb16.c
@@ -617,6 +636,7 @@ modules/video_filter/motionblur.c
 modules/video_filter/transform.c
 modules/video_filter/wall.c
 modules/video_output/aa.c
+modules/video_output/caca.c
 modules/video_output/directx/directx.c
 modules/video_output/directx/events.c
 modules/video_output/directx/vout.h

src/libvlc.c

@@ -2,7 +2,7 @@
  * libvlc.c: main libvlc source
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.101 2003/10/29 01:33:27 gbazin Exp $
+ * $Id: libvlc.c,v 1.102 2003/11/23 18:31:55 alexis Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -1475,7 +1475,7 @@ static void Version( void )
       _("This program comes with NO WARRANTY, to the extent permitted by "
         "law.\nYou may redistribute it under the terms of the GNU General "
         "Public License;\nsee the file named COPYING for details.\n"
-        "Written by the VideoLAN team at Ecole Centrale, Paris.\n") );
+        "Written by the VideoLAN team; see AUTHORS file.\n") );
 
 #ifdef WIN32        /* Pause the console because it's destroyed when we exit */
     fprintf( stdout, _("\nPress the RETURN key to continue...\n") );