String review

modules/video_output/caca.c

@@ -2,7 +2,7 @@
  * caca.c: Color ASCII Art video output plugin using libcaca
  *****************************************************************************
  * Copyright (C) 2003, 2004 VideoLAN
- * $Id: caca.c,v 1.8 2004/01/18 04:55:19 sam Exp $
+ * $Id: caca.c,v 1.9 2004/01/26 16:45:02 zorglub Exp $
  *
  * Authors: Sam Hocevar <sam@zoy.org>
  *
@@ -94,7 +94,7 @@ static int Create( vlc_object_t *p_this )
             return VLC_EGENERIC;
         }
 
-        if( !SetConsoleActiveScreenBuffer( hstdout) ) 
+        if( !SetConsoleActiveScreenBuffer( hstdout) )
         {
             msg_Err( p_vout, "cannot set active screen buffer" );
             FreeConsole();
@@ -102,7 +102,7 @@ static int Create( vlc_object_t *p_this )
         }
 
         coord = GetLargestConsoleWindowSize( hstdout );
-        msg_Dbg( p_vout, "SetConsoleWindowInfo: %ix%i", coord.X, coord.Y ); 
+        msg_Dbg( p_vout, "SetConsoleWindowInfo: %ix%i", coord.X, coord.Y );
 
         /* Force size for now */
         coord.X = 100;
@@ -110,7 +110,7 @@ static int Create( vlc_object_t *p_this )
 
         if( !SetConsoleScreenBufferSize( hstdout, coord ) )
             msg_Warn( p_vout, "SetConsoleScreenBufferSize %i %i",
-                      coord.X, coord.Y ); 
+                      coord.X, coord.Y );
 
         /* Get the current screen buffer size and window position. */
         if( GetConsoleScreenBufferInfo( hstdout, &csbiInfo ) )

modules/video_output/directx/directx.c

@@ -2,7 +2,7 @@
  * vout.c: Windows DirectX video output display method
  *****************************************************************************
  * Copyright (C) 2001-2004 VideoLAN
- * $Id: directx.c,v 1.33 2004/01/06 19:12:08 gbazin Exp $
+ * $Id: directx.c,v 1.34 2004/01/26 16:45:02 zorglub Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -106,16 +106,19 @@ static int FindDevicesCallback( vlc_object_t *, char const *,
 #define HW_YUV_LONGTEXT N_( \
     "Try to use hardware acceleration for YUV->RGB conversions. " \
     "This option doesn't have any effect when using overlays." )
+
 #define SYSMEM_TEXT N_("Use video buffers in system memory")
 #define SYSMEM_LONGTEXT N_( \
     "Create video buffers in system memory instead of video memory. This " \
     "isn't recommended as usually using video memory allows to benefit from " \
     "more hardware acceleration (like rescaling or YUV->RGB conversions). " \
     "This option doesn't have any effect when using overlays." )
+
 #define TRIPLEBUF_TEXT N_("Use triple buffering for overlays")
 #define TRIPLEBUF_LONGTEXT N_( \
     "Try to use triple bufferring when using YUV overlays. That results in " \
     "much better video quality (no flickering)." )
+
 #define DEVICE_TEXT N_("Name of desired display device")
 #define DEVICE_LONGTEXT N_("In a multimonitor configuration, you can specify "\
     "the Windows device name of the display that you want the video window " \
@@ -125,8 +128,6 @@ static char *ppsz_dev[] = { "" };
 static char *ppsz_dev_text[] = { N_("Default") };
 
 vlc_module_begin();
-    add_category_hint( N_("Video"), NULL, VLC_FALSE );
-
     add_bool( "directx-hw-yuv", 1, NULL, HW_YUV_TEXT, HW_YUV_LONGTEXT,
               VLC_TRUE );
     add_bool( "directx-use-sysmem", 0, NULL, SYSMEM_TEXT, SYSMEM_LONGTEXT,
@@ -261,7 +262,7 @@ static int OpenVideo( vlc_object_t *p_this )
     text.psz_string = _("Always on top");
     var_Change( p_vout, "video-on-top", VLC_VAR_SETTEXT, &text, NULL );
     var_Get( p_vout, "video-on-top", &val );
-    p_vout->p_sys->b_on_top_change = val.b_bool; 
+    p_vout->p_sys->b_on_top_change = val.b_bool;
     var_AddCallback( p_vout, "video-on-top", OnTopCallback, NULL );
 
     return VLC_SUCCESS;
@@ -537,7 +538,7 @@ static int Manage( vout_thread_t *p_vout )
         HMENU hMenu = GetSystemMenu( p_vout->p_sys->hwnd, FALSE );
 
         var_Get( p_vout, "video-on-top", &val );
- 
+
         /* Set the window on top if necessary */
         if( val.b_bool && !( GetWindowLong( p_vout->p_sys->hwnd, GWL_EXSTYLE )
                            & WS_EX_TOPMOST ) )
@@ -582,7 +583,7 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic )
 
     if( (p_vout->p_sys->p_display == NULL) )
     {
-        msg_Warn( p_vout, "no display!!" );
+        msg_Warn( p_vout, "no display!" );
         return;
     }
 
@@ -652,7 +653,7 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic )
 /*****************************************************************************
  * DirectXEnumCallback: Device enumeration
  *****************************************************************************
- * This callback function is called by DirectDraw once for each 
+ * This callback function is called by DirectDraw once for each
  * available DirectDraw device.
  *****************************************************************************/
 BOOL WINAPI DirectXEnumCallback( GUID* p_guid, LPTSTR psz_desc,
@@ -675,8 +676,8 @@ BOOL WINAPI DirectXEnumCallback( GUID* p_guid, LPTSTR psz_desc,
         }
         else if( strcmp( psz_drivername, device.psz_string ) == 0 )
         {
-	    MONITORINFO monitor_info;
-	    monitor_info.cbSize = sizeof( MONITORINFO );
+            MONITORINFO monitor_info;
+            monitor_info.cbSize = sizeof( MONITORINFO );
 
             if( p_vout->p_sys->GetMonitorInfo( hmon, &monitor_info ) )
             {
@@ -756,7 +757,7 @@ static int DirectXInitDDraw( vout_thread_t *p_vout )
                                               MONITOR_DEFAULTTONEAREST );
 
         /* Enumerate displays */
-        OurDirectDrawEnumerateEx( DirectXEnumCallback, p_vout, 
+        OurDirectDrawEnumerateEx( DirectXEnumCallback, p_vout,
                                   DDENUM_ATTACHEDSECONDARYDEVICES );
     }
 
@@ -1614,7 +1615,7 @@ static void DirectXGetDDrawCaps( vout_thread_t *p_vout )
                          bHasColorKey, bCanStretch, bCanBltFourcc );
 
         /* Don't ask for troubles */
-        if( !bCanBltFourcc ) p_vout->p_sys->b_hw_yuv = FALSE; 
+        if( !bCanBltFourcc ) p_vout->p_sys->b_hw_yuv = FALSE;
     }
 }
 
@@ -1678,7 +1679,7 @@ static int DirectXLockSurface( vout_thread_t *p_vout, picture_t *p_pic )
         return VLC_EGENERIC;
     }
     else
-        return VLC_SUCCESS;      
+        return VLC_SUCCESS;
 }
 
 /*****************************************************************************

modules/video_output/fb.c

@@ -2,7 +2,7 @@
  * fb.c : framebuffer plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: fb.c,v 1.7 2003/10/25 00:49:14 sam Exp $
+ * $Id: fb.c,v 1.8 2004/01/26 16:45:02 zorglub Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -64,10 +64,15 @@ static void GfxMode        ( int i_tty );
  *****************************************************************************/
 #define FB_DEV_VAR "fbdev"
 
+#define DEVICE_TEXT N_("Framebuffer device")
+#define DEVICE_LONGTEXT N_( \
+    "You can select here the framebuffer device that will be used " \
+    "for rendering (ususally /dev/fb0).")
+
 vlc_module_begin();
-    add_category_hint( N_("Frame Buffer"), NULL, VLC_FALSE );
-    add_file( FB_DEV_VAR, "/dev/fb0", NULL, N_("framebuffer device"), NULL, VLC_FALSE );
-    set_description( _("Linux console framebuffer video output") );
+    add_file( FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
+              VLC_FALSE );
+    set_description( _("GNU/Linux console framebuffer video output") );
     set_capability( "video output", 30 );
     set_callbacks( Create, Destroy );
 vlc_module_end();

modules/video_output/ggi.c

@@ -2,7 +2,7 @@
  * ggi.c : GGI plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: ggi.c,v 1.5 2003/10/25 00:49:14 sam Exp $
+ * $Id: ggi.c,v 1.6 2004/01/26 16:45:02 zorglub Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -54,12 +54,12 @@ static void SetPalette     ( vout_thread_t *, uint16_t *, uint16_t *, uint16_t *
  * Module descriptor
  *****************************************************************************/
 #define DISPLAY_TEXT N_("X11 display name")
-#define DISPLAY_LONGTEXT N_("Specify the X11 hardware display you want to use."\
-                           "\nBy default VLC will use the value of the DISPLAY"\
-                           " environment variable.")
+#define DISPLAY_LONGTEXT N_( \
+            "Specify the X11 hardware display you want to use.\n" \
+            "By default, VLC will use the value of the DISPLAY " \
+            "environment variable.")
 
 vlc_module_begin();
-    add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE );
     add_string( "ggi-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE );
     set_description( "General Graphics Interface video output" );
     set_capability( "video output", 30 );

modules/video_output/qte/qte.cpp

@@ -2,7 +2,7 @@
  * qte.cpp : QT Embedded plugin for vlc
  *****************************************************************************
  * Copyright (C) 1998-2003 VideoLAN
- * $Id: qte.cpp,v 1.20 2003/12/22 14:32:56 sam Exp $
+ * $Id: qte.cpp,v 1.21 2004/01/26 16:45:02 zorglub Exp $
  *
  * Authors: Gerald Hansink <gerald.hansink@ordain.nl>
  *          Jean-Paul Saman <jpsaman@wxs.nl>
@@ -78,8 +78,8 @@ extern "C"
  *****************************************************************************/
 #define DISPLAY_TEXT N_("QT Embedded display name")
 #define DISPLAY_LONGTEXT N_( \
-    "Specify the Qt Embedded hardware display you want to use. By default VLC will " \
-    "use the value of the DISPLAY environment variable.")
+    "Specify the Qt Embedded hardware display you want to use. " \
+    "By default VLC will use the value of the DISPLAY environment variable.")
 
 /*****************************************************************************
  * Local prototypes
@@ -176,7 +176,7 @@ static void Close ( vlc_object_t *p_this )
 {
     vout_thread_t * p_vout = (vout_thread_t *)p_this;
 
-    msg_Dbg( p_vout, "Close" );
+    msg_Dbg( p_vout, "close" );
     if( p_vout->p_sys->p_event )
     {
         vlc_object_detach( p_vout->p_sys->p_event );
@@ -190,7 +190,7 @@ static void Close ( vlc_object_t *p_this )
     }
 
 #ifdef NEED_QTE_MAIN
-    msg_Dbg( p_vout, "Releasing gui-helper" );
+    msg_Dbg( p_vout, "releasing gui-helper" );
     module_Unneed( p_vout, p_vout->p_sys->p_qte_main );
 #endif
 
@@ -297,7 +297,7 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic )
     {
 // shameless borrowed from opie mediaplayer....
 #ifndef USE_DIRECT_PAINTER
-        msg_Dbg(p_vout, "Not using direct painter");
+        msg_Dbg(p_vout, "not using direct painter");
         QPainter p(p_vout->p_sys->p_VideoWidget);
 
         /* rotate frame */
@@ -564,7 +564,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
 static void CloseDisplay( vout_thread_t *p_vout )
 {
     // quit qt application loop
-    msg_Dbg( p_vout, "Destroying Qt Window" );
+    msg_Dbg( p_vout, "destroying Qt Window" );
 #ifdef NEED_QTE_MAIN
     if(p_vout->p_sys->p_QApplication)
     {

modules/video_output/x11/x11.c

@@ -2,17 +2,17 @@
  * x11.c : X11 plugin for vlc
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: x11.c,v 1.8 2003/05/25 19:24:53 gbazin Exp $
+ * $Id: x11.c,v 1.9 2004/01/26 16:45:03 zorglub Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
  *          David Kennedy <dkennedy@tinytoad.com>
- *      
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -44,7 +44,7 @@ extern void E_(Deactivate) ( vlc_object_t * );
 #define ALT_FS_LONGTEXT N_( \
     "There are two ways to make a fullscreen window, unfortunately each one " \
     "has its drawbacks.\n" \
-    "1) Let the window manager handle your fullscreen window (default). But " \
+    "1) Let the window manager handle your fullscreen window (default), but " \
     "things like taskbars will likely show on top of the video.\n" \
     "2) Completly bypass the window manager, but then nothing will be able " \
     "to show on top of the video.")
@@ -64,7 +64,6 @@ extern void E_(Deactivate) ( vlc_object_t * );
     "set it to 0 for first screen, 1 for the second.")
 
 vlc_module_begin();
-    add_category_hint( N_("X11"), NULL, VLC_TRUE );
     add_string( "x11-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE );
     add_bool( "x11-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, VLC_TRUE );
 #ifdef HAVE_SYS_SHM_H

modules/video_output/x11/xcommon.c

@@ -2,7 +2,7 @@
  * xcommon.c: Functions common to the X11 and XVideo plugins
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: xcommon.c,v 1.41 2003/12/22 14:32:56 sam Exp $
+ * $Id: xcommon.c,v 1.42 2004/01/26 16:45:03 zorglub Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Sam Hocevar <sam@zoy.org>
@@ -1357,7 +1357,7 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
             XineramaScreenInfo *screens;   /* infos for xinerama */
             int i_num_screens;
 
-            msg_Dbg( p_vout, "Using XFree Xinerama extension");
+            msg_Dbg( p_vout, "using XFree Xinerama extension");
 
 #define SCREEN p_vout->p_sys->p_win->i_screen
 

modules/video_output/x11/xvideo.c

@@ -2,18 +2,18 @@
  * xvideo.c : Xvideo plugin for vlc
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: xvideo.c,v 1.8 2003/05/25 19:24:53 gbazin Exp $
+ * $Id: xvideo.c,v 1.9 2004/01/26 16:45:03 zorglub Exp $
  *
  * Authors: Shane Harper <shanegh@optusnet.com.au>
  *          Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
  *          David Kennedy <dkennedy@tinytoad.com>
- *      
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -50,7 +50,7 @@ extern void E_(Deactivate) ( vlc_object_t * );
 #define ALT_FS_LONGTEXT N_( \
     "There are two ways to make a fullscreen window, unfortunately each one " \
     "has its drawbacks.\n" \
-    "1) Let the window manager handle your fullscreen window (default). But " \
+    "1) Let the window manager handle your fullscreen window (default), but " \
     "things like taskbars will likely show on top of the video.\n" \
     "2) Completly bypass the window manager, but then nothing will be able " \
     "to show on top of the video.")
@@ -69,13 +69,12 @@ extern void E_(Deactivate) ( vlc_object_t * );
 #define SHM_LONGTEXT N_( \
     "Use shared memory to communicate between VLC and the X server.")
 
-#define SCREEN_TEXT N_("choose the screen to be used for fullscreen mode.")
+#define SCREEN_TEXT N_("Screen to be used for fullscreen mode.")
 #define SCREEN_LONGTEXT N_( \
     "Choose the screen you want to use in fullscreen mode. For instance " \
     "set it to 0 for first screen, 1 for the second.")
 
 vlc_module_begin();
-    add_category_hint( N_("XVideo"), NULL, VLC_TRUE );
     add_string( "xvideo-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE );
     add_integer( "xvideo-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, VLC_TRUE );
     add_bool( "xvideo-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, VLC_TRUE );