String review, as promised :)

Found and fixed:
- some untranslated macros
- some acronyms which were not in capital letters
- a couple of VLC Media Player (_m_edia _p_layer, now)
- typos here and there
- dots missing in some of the long texts
- spaces before ? and :, which is correct in french but not in english :)
- NT services are now called Windows Services

diff --git a/modules/access/directory.c b/modules/access/directory.c
index aad29891c5c75bcf841d356c54ae05be2da4da32..b4d3068771a1fa14d44509735442313363697047 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -2,7 +2,7 @@
  * directory.c: expands a directory (directory: access plug-in)
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: directory.c,v 1.6 2004/02/17 13:13:31 gbazin Exp $
+ * $Id$
  *
  * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
  *
@@ -83,12 +83,12 @@ int ReadDir( input_thread_t *p_input, char *psz_name , int i_mode );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define RECURSIVE_TEXT N_("Includes subdirectories ?")
+#define RECURSIVE_TEXT N_("Includes subdirectories?")
 #define RECURSIVE_LONGTEXT N_( \
         "Select whether subdirectories must be expanded.\n" \
-        "none : subdirectories do not appear in the playlist.\n" \
-        "collapse : subdirectories appear but are expanded on first play.\n" \
-        "expand : all subdirectories are expanded.\n" )
+        "none: subdirectories do not appear in the playlist.\n" \
+        "collapse: subdirectories appear but are expanded on first play.\n" \
+        "expand: all subdirectories are expanded.\n" )
 
 static char *psz_recursive_list[] = { "none", "collapse", "expand" };
 static char *psz_recursive_list_text[] = { N_("none"), N_("collapse"),

diff --git a/modules/access/dvb/qpsk.c b/modules/access/dvb/qpsk.c
index 909f666448315eca2fb3d947aec8b88790f29451..5a31ae07aa3437e9adfb575d205009dc31cffd5f 100644 (file)
--- a/modules/access/dvb/qpsk.c
+++ b/modules/access/dvb/qpsk.c
@@ -71,8 +71,8 @@ void E_(Close)   ( vlc_object_t * );
 #define LNB_SLOF_TEXT N_("Antenna lnb_slof (kHz)")
 #define LNB_SLOF_LONGTEXT ""
 
-#define PROBE_TEXT N_("Probe dvb card for capabilities")
-#define PROBE_LONGTEXT N_("Some dvb cards do not like to be probed for their capabilities.")
+#define PROBE_TEXT N_("Probe DVB card for capabilities")
+#define PROBE_LONGTEXT N_("Some DVB cards do not like to be probed for their capabilities.")
 
 /* Cable */
 #define MODULATION_TEXT N_("Modulation type")

diff --git a/modules/codec/ffmpeg/ffmpeg.h b/modules/codec/ffmpeg/ffmpeg.h
index 6959647d97776791b5410b3f02f417b972ef9fbe..51653477023d050ca697d0f0b6e4bad08a19fcca 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.h
+++ b/modules/codec/ffmpeg/ffmpeg.h
@@ -2,7 +2,7 @@
  * ffmpeg.h: decoder using the ffmpeg library
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: ffmpeg.h,v 1.32 2004/01/25 18:20:12 bigben Exp $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -103,7 +103,8 @@ void E_(ClosePostproc)( decoder_t *, void * );
     "but it can produce distorted pictures.")
 
 #define TRUNC_TEXT N_("Truncated stream")
-#define TRUNC_LONGTEXT N_("Truncated stream -1:auto,0:disable,:1:enable")
+#define TRUNC_LONGTEXT N_("Truncated stream "\
+    "-1: auto, 0: disable, 1: enable")
 
 #define PP_Q_TEXT N_("Post processing quality")
 #define PP_Q_LONGTEXT N_( \

diff --git a/modules/control/ntservice.c b/modules/control/ntservice.c
index 6cb8d1da18ef37b3cab88b92580d751264e5e694..61dac6b1f1b9e49ec1a4af35c3738c1064d95c68 100755 (executable)
--- a/modules/control/ntservice.c
+++ b/modules/control/ntservice.c
@@ -2,7 +2,7 @@
  * ntservice.c: Windows NT/2K/XP service interface
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: ntservice.c,v 1.5 2004/01/25 16:17:03 anil Exp $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -36,24 +36,24 @@
 static int  Activate( vlc_object_t * );
 static void Close   ( vlc_object_t * );
 
-#define INSTALL_TEXT N_( "Install NT/2K/XP service" )
+#define INSTALL_TEXT N_( "Install Windows Service" )
 #define INSTALL_LONGTEXT N_( \
-    "If enabled the interface will install the service and exit." )
-#define UNINSTALL_TEXT N_( "Uninstall NT/2K/XP service" )
+    "If enabled the interface will install the Service and exit." )
+#define UNINSTALL_TEXT N_( "Uninstall Windows Service" )
 #define UNINSTALL_LONGTEXT N_( \
-    "If enabled the interface will uninstall the service and exit." )
-#define NAME_TEXT N_( "Display name of the service" )
+    "If enabled the interface will uninstall the Service and exit." )
+#define NAME_TEXT N_( "Display name of the Service" )
 #define NAME_LONGTEXT N_( \
-    "This allows you to change the display name of the service." )
+    "This allows you to change the display name of the Service." )
 #define EXTRAINTF_TEXT N_("Extra interface modules")
 #define EXTRAINTF_LONGTEXT N_( \
     "This option allows you to select additional interfaces spawned by the " \
-    "service. It should be specified at install time so the service is " \
+    "Service. It should be specified at install time so the Service is " \
     "properly configured. Use a comma separated list of interface modules. " \
     "(common values are: logger, sap, rc, http)")
 
 vlc_module_begin();
-    set_description( _("Windows NT/2K/XP service interface") );
+    set_description( _("Windows Service interface") );
     add_bool( "ntservice-install", 0, NULL,
               INSTALL_TEXT, INSTALL_LONGTEXT, VLC_TRUE );
     add_bool( "ntservice-uninstall", 0, NULL,

diff --git a/modules/demux/livedotcom.cpp b/modules/demux/livedotcom.cpp
index fff8ac750119cad66ee389ce0f9db5ca2a6611ff..5489349b7b3c6020ef2cce88a1be4aa2a55681e4 100644 (file)
--- a/modules/demux/livedotcom.cpp
+++ b/modules/demux/livedotcom.cpp
@@ -2,7 +2,7 @@
  * live.cpp : live.com support.
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: livedotcom.cpp,v 1.17 2004/02/23 20:45:52 fenrir Exp $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -53,7 +53,7 @@ static void AccessClose( vlc_object_t * );
 
 #define CACHING_TEXT N_("Caching value (ms)")
 #define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for rtsp streams. This " \
+    "Allows you to modify the default caching value for RTSP streams. This " \
     "value should be set in miliseconds units." )
 
 vlc_module_begin();
@@ -69,8 +69,8 @@ vlc_module_begin();
         set_capability( "access", 0 );
         set_callbacks( AccessOpen, AccessClose );
         add_bool( "rtsp-tcp", 0, NULL,
-                  N_("Use rtp over rtsp (tcp)"),
-                  N_("Use rtp over rtsp (tcp)"), VLC_TRUE );
+                  N_("Use RTP over RTSP (TCP)"),
+                  N_("Use RTP over RTSP (TCP)"), VLC_TRUE );
         add_integer( "rtsp-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
             CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
 vlc_module_end();

diff --git a/modules/demux/mod.c b/modules/demux/mod.c
index 6479acfa0abf3af843e26b09041a771a9473b160..d84c79cbb4a7ba4c811dd1e45ca530c6e4205e66 100644 (file)
--- a/modules/demux/mod.c
+++ b/modules/demux/mod.c
@@ -2,7 +2,7 @@
  * mod.c: MOD file demuxer (using libmodplug)
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: mod.c,v 1.2 2004/01/25 20:05:28 hartman Exp $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -56,7 +56,7 @@ vlc_module_begin();
 
     add_bool( "mod-megabass", VLC_FALSE, NULL, N_("Mega bass"), N_("Mega bass"), VLC_FALSE );
     add_integer_with_range( "mod-megabass-level", 0, 0, 100, NULL, N_("Mega bass level (0-100)"), N_("Mega bass level (0-100 defaults to 0)"), VLC_FALSE );
-    add_integer_with_range( "mod-megabass-range", 10, 10, 100, NULL, N_("Mega bass cutt off (Hz)"), N_("Mega bass cutt off (10-100Hz)"), VLC_FALSE );
+    add_integer_with_range( "mod-megabass-range", 10, 10, 100, NULL, N_("Mega bass cut off (Hz)"), N_("Mega bass cut off (10-100Hz)"), VLC_FALSE );
 
     add_bool( "mod-surround", VLC_FALSE, NULL, N_("Surround"), N_("Surround"), VLC_FALSE );
     add_integer_with_range( "mod-surround-level", 0, 0, 100, NULL, N_("Surround level (0-100)"), N_("Surround level (0-100 defaults to 0)"), VLC_FALSE );

diff --git a/modules/gui/beos/InterfaceWindow.cpp b/modules/gui/beos/InterfaceWindow.cpp
index 18e27c15410e62006f8247d5bfa710273456a369..7963152fbeae0b6c6f72796493b2d1ed316cf43d 100644 (file)
--- a/modules/gui/beos/InterfaceWindow.cpp
+++ b/modules/gui/beos/InterfaceWindow.cpp
@@ -2,7 +2,7 @@
  * InterfaceWindow.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: InterfaceWindow.cpp,v 1.45 2004/01/26 16:52:31 zorglub Exp $
+ * $Id$
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -369,11 +369,11 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
             break;
 
         case OPEN_FILE:
-               _ShowFilePanel( B_REFS_RECEIVED, _("VLC Media Player: Open Media Files") );
+               _ShowFilePanel( B_REFS_RECEIVED, _("VLC media player: Open Media Files") );
             break;
 
         case LOAD_SUBFILE:
-               _ShowFilePanel( SUBFILE_RECEIVED, _("VLC Media Player: Open Subtitle File") );
+               _ShowFilePanel( SUBFILE_RECEIVED, _("VLC media player: Open Subtitle File") );
             break;
 
         case OPEN_PLAYLIST:

diff --git a/modules/gui/pda/pda_interface.c b/modules/gui/pda/pda_interface.c
index b00fdac3976bc1a602f6e3657265d09d131b22f6..701547f74dce7282c2b75e8edccbfe70aba6fe6c 100644 (file)
--- a/modules/gui/pda/pda_interface.c
+++ b/modules/gui/pda/pda_interface.c
@@ -1048,14 +1048,14 @@ create_pda (void)
   gtk_table_attach (GTK_TABLE (tableTranscode), comboStdMuxer, 1, 2, 8, 9,
                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ps"));
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ts"));
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("mpeg1"));
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("avi"));
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ogg"));
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("mp4"));
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("mov"));
-  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("asf"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("PS"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("TS"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("MPEG1"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("AVI"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("OGG"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("MP4"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("MOV"));
+  comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ASF"));
   gtk_combo_set_popdown_strings (GTK_COMBO (comboStdMuxer), comboStdMuxer_items);
   g_list_free (comboStdMuxer_items);
 
@@ -1331,7 +1331,7 @@ create_pda (void)
   gtk_fixed_put (GTK_FIXED (fixed2), aboutImage, 0, 0);
   gtk_widget_set_size_request (aboutImage, 48, 48);
 
-  labelDescription = gtk_label_new (_("VLC Media Player is an MPEG, MPEG 2, MP3 and DivX player that accepts input from local or network sources and is licensed under the GPL (http://www.gnu.org/copyleft/gpl.html)."));
+  labelDescription = gtk_label_new (_("VLC media player is an MPEG, MPEG 2, MP3 and DivX player that accepts input from local or network sources and is licensed under the GPL (http://www.gnu.org/copyleft/gpl.html)."));
   gtk_widget_set_name (labelDescription, "labelDescription");
   gtk_widget_show (labelDescription);
   gtk_fixed_put (GTK_FIXED (fixed2), labelDescription, 16, 112);

diff --git a/modules/gui/wxwindows/open.cpp b/modules/gui/wxwindows/open.cpp
index 01008e3a269a84595b1238bfe0675287e1b49bc2..59bbc7e27e58b2796533de7788ced6d722ce5cd8 100644 (file)
--- a/modules/gui/wxwindows/open.cpp
+++ b/modules/gui/wxwindows/open.cpp
@@ -2,7 +2,7 @@
  * open.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2004 VideoLAN
- * $Id: open.cpp,v 1.69 2004/02/14 12:36:16 gbazin Exp $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -243,7 +243,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
     wxStaticBoxSizer *mrl_sizer = new wxStaticBoxSizer( mrl_box,
                                                         wxHORIZONTAL );
     wxStaticText *mrl_label = new wxStaticText( panel, -1,
-                                                wxU(_("Open :")) );
+                                                wxU(_("Open:")) );
     mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
                                 wxPoint(20,25), wxSize(120, -1),
                                 0, NULL );
@@ -421,7 +421,7 @@ wxPanel *OpenDialog::FilePanel( wxWindow* parent )
     wxFlexGridSizer *subsfile_sizer = new wxFlexGridSizer( 2, 1, 20 );
     subsfile_checkbox = new wxCheckBox( panel, SubsFileEnable_Event,
                                         wxU(_("Subtitle options")) );
-    subsfile_checkbox->SetToolTip( wxU(_("Force options for seperate subtitle files.")) );
+    subsfile_checkbox->SetToolTip( wxU(_("Force options for separate subtitle files.")) );
     subsfile_sizer->Add( subsfile_checkbox, 0,
                          wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
     subsfile_button = new wxButton( panel, SubsFileSettings_Event,

diff --git a/modules/gui/wxwindows/v4l.cpp b/modules/gui/wxwindows/v4l.cpp
index a1422a8b39bbb31b2143b6a4b4f405a04ada5f80..b4389f4f716432dda398223972357dd28024e563 100644 (file)
--- a/modules/gui/wxwindows/v4l.cpp
+++ b/modules/gui/wxwindows/v4l.cpp
@@ -2,7 +2,7 @@
  * v4l.cpp : wxWindows plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2003 VideoLAN
- * $Id: v4l.cpp,v 1.7 2004/01/25 03:29:02 hartman Exp $
+ * $Id$
  *
  * Authors: Mohammed Adnène Trojette <adn@via.ecp.fr>
  *
@@ -120,7 +120,7 @@ V4LDialog::V4LDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
                                 wxPoint(20,25), wxSize(200, -1), 0, NULL );
     mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
         "the full MRL you want to open.\n Alternatively, the field will be "
-        "filled automatically when you use the controls below")) );
+        "filled automatically when you use the controls below.")) );
 
     mrl_sizer->Add( mrl_label, 0, wxALL | wxALIGN_CENTER, 5 );
     mrl_sizer->Add( mrl_combo, 1, wxALL | wxALIGN_CENTER, 5 );

diff --git a/modules/misc/sap.c b/modules/misc/sap.c
index db8cbab14b2e82983fed2d46aa993ecaa677a2af..44ace58e6e62253dc8aae4ed8fff65c0f52214a0 100644 (file)
--- a/modules/misc/sap.c
+++ b/modules/misc/sap.c
@@ -2,7 +2,7 @@
  * sap.c :  SAP interface module
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: sap.c,v 1.54 2004/03/03 20:39:52 gbazin Exp $
+ * $Id$
  *
  * Authors: Arnaud Schauly <gitan@via.ecp.fr>
  *          Clément Stenac <zorglub@via.ecp.fr>
@@ -98,7 +98,7 @@
 #define SAP_TIMEOUT_TEXT N_("SAP timeout (seconds)")
 #define SAP_TIMEOUT_LONGTEXT N_( \
        "Sets the time before SAP items get deleted if no new announce" \
-       "is received")
+       "is received.")
 
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );

diff --git a/src/libvlc.h b/src/libvlc.h
index f6b19a3d13ab6b70ee855a149a7b733dd0a33d93..f03e819dff7fb9050b1ecf72f81c02daa20fbe7f 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -2,7 +2,7 @@
  * libvlc.h: main libvlc header
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.h,v 1.135 2004/03/02 13:53:14 kuehne Exp $
+ * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -326,23 +326,23 @@ static char *ppsz_align_descriptions[] = { N_("Center"),
 
 #define SUB_AUTO_TEXT N_("Autodetect subtitle files")
 #define SUB_AUTO_LONGTEXT \
-    "Automatically detect a subtitle file, if no subtitle filename is " \
-    "specified."
+    N_("Automatically detect a subtitle file, if no subtitle filename is " \
+    "specified.")
 
 #define SUB_FUZZY_TEXT N_("Subtitle autodection fuzziness")
 #define SUB_FUZZY_LONGTEXT \
-    "This determines how fuzzy subtitle and movie filenaming matching " \
+    N_("This determines how fuzzy subtitle and movie filenaming matching " \
     "will be. Options are:\n" \
     "0 = no subtitles autodetected\n" \
     "1 = any subtitle file\n" \
     "2 = any subtitle file containing the movie name\n" \
     "3 = subtitle file matching the movie name with additional chars\n" \
-    "4 = subtitle file matching the movie name exactly"
+    "4 = subtitle file matching the movie name exactly")
 
 #define SUB_FILE_TEXT N_("Use subtitle file")
 #define SUB_FILE_LONGTEXT \
-    "Load this subtitle file. To be used when autodetect cannot detect " \
-    "your subtitlefile."
+    N_("Load this subtitle file. To be used when autodetect cannot detect " \
+    "your subtitle file.")
 
 #define DVD_DEV_TEXT N_("DVD device")
 #ifdef WIN32
@@ -525,7 +525,7 @@ static char *ppsz_align_descriptions[] = { N_("Center"),
 
 #define RT_OFFSET_TEXT N_("Adjust VLC priority")
 #define RT_OFFSET_LONGTEXT N_( \
-    "This options adds an offset (positive or negative) to VLC default " \
+    "This option adds an offset (positive or negative) to VLC default " \
     "priorities. You can use it to tune VLC priority against other " \
     "programs, or against other VLC instances.")
 
@@ -609,17 +609,17 @@ static char *ppsz_align_descriptions[] = { N_("Center"),
 #define JF5MIN_KEY_LONGTEXT N_("Select the hotkey to jump 5 minutes forward.")
 
 #define QUIT_KEY_TEXT N_("Quit")
-#define QUIT_KEY_LONGTEXT N_("Select the hotkey to quit the applicatioN.")
+#define QUIT_KEY_LONGTEXT N_("Select the hotkey to quit the application.")
 #define NAV_UP_KEY_TEXT N_("Navigate up")
-#define NAV_UP_KEY_LONGTEXT N_("Select the key to move the selector up in dvd menus.")
+#define NAV_UP_KEY_LONGTEXT N_("Select the key to move the selector up in DVD menus.")
 #define NAV_DOWN_KEY_TEXT N_("Navigate down")
-#define NAV_DOWN_KEY_LONGTEXT N_("Select the key to move the selector down in dvd menus.")
+#define NAV_DOWN_KEY_LONGTEXT N_("Select the key to move the selector down in DVD menus.")
 #define NAV_LEFT_KEY_TEXT N_("Navigate left")
-#define NAV_LEFT_KEY_LONGTEXT N_("Select the key to move the selector left in dvd menus.")
+#define NAV_LEFT_KEY_LONGTEXT N_("Select the key to move the selector left in DVD menus.")
 #define NAV_RIGHT_KEY_TEXT N_("Navigate right")
 #define NAV_RIGHT_KEY_LONGTEXT N_("Select the key to move the selector right in dvd menus.")
 #define NAV_ACTIVATE_KEY_TEXT N_("Activate")
-#define NAV_ACTIVATE_KEY_LONGTEXT N_("Select the key to activate selected item in dvd menus.")
+#define NAV_ACTIVATE_KEY_LONGTEXT N_("Select the key to activate selected item in DVD menus.")
 #define VOL_UP_KEY_TEXT N_("Volume up")
 #define VOL_UP_KEY_LONGTEXT N_("Select the key to increase audio volume.")
 #define VOL_DOWN_KEY_TEXT N_("Volume down")