Index: Gui/bitmap.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/bitmap.c,v
retrieving revision 1.12
diff -u -r1.12 bitmap.c
--- Gui/bitmap.c	23 May 2003 17:23:35 -0000	1.12
+++ Gui/bitmap.c	13 Dec 2004 01:20:15 -0000
@@ -4,7 +4,8 @@
 
 #include <png.h>
 
-#include "../../mp_msg.h"
+#include "../mp_msg.h"
+#include "../help_mp.h"
 #include "bitmap.h"
 
 int pngRead( unsigned char * fname,txSample * bf )
@@ -21,7 +22,7 @@
  FILE *fp=fopen( fname,"rb" );
  if ( !fp ) 
   {
-   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png] file read error ( %s ).\n",fname );
+   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png] file read error ( %s )\n",fname );
    return 1;
   }
 
@@ -40,13 +41,13 @@
  row_p=(png_bytep *)malloc( sizeof( png_bytep ) * bf->Height );
  if ( !row_p )
   {
-   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png]  Not enough memory for row buffer.\n" );
+   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png]  not enough memory for row buffer\n" );
    return 2;
   }
  bf->Image=(png_bytep)malloc( png_get_rowbytes( png,info ) * bf->Height );
  if ( !bf->Image )
   {
-   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png]  Not enough memory for image buffer.\n" );
+   mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png]  not enough memory for image buffer\n" );
    return 2;
   }
  for ( i=0; i < bf->Height; i++ ) row_p[i]=&bf->Image[png_get_rowbytes( png,info ) * i];
@@ -102,7 +103,7 @@
    bf->BPP=32;
    if ( ( bf->Image=malloc( bf->ImageSize ) ) == NULL )
     {
-     mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bitmap] Not enough memory for image.\n" );
+     mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bitmap] not enough memory for image\n" );
      return 1;
     }
    memset( bf->Image,0,bf->ImageSize );
@@ -173,7 +174,7 @@
  if ( fname == NULL ) return -2;
  if ( pngRead( fname,bf ) ) 
   {
-   mp_dbg( MSGT_GPLAYER,MSGL_FATAL,"[bitmap] Unknown file type ( %s ).\n",fname );
+   mp_dbg( MSGT_GPLAYER,MSGL_FATAL,"[bitmap] unknown file type ( %s )\n",fname );
    return -5;
   }
  if ( bf->BPP < 24 )
@@ -198,7 +199,7 @@
  out->ImageSize=(out->Width * out->Height + 7) / 8;
  mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[c32to1] imagesize: %d\n",out->ImageSize );
  out->Image=(char *)calloc( 1,out->ImageSize );
- if ( out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[c32to1] Not enough memory for image.\n" );
+ if ( out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_NotEnoughMemoryC32To1 );
  {
   int i,b,c=0; unsigned int * buf = NULL; unsigned char tmp = 0; int nothaveshape = 1;
   buf=(unsigned int *)in->Image;
@@ -222,7 +223,7 @@
  out->ImageSize=out->Width * out->Height * 4;
  out->Image=(char *)calloc( 1,out->ImageSize );
  mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[c1to32] imagesize: %d\n",out->ImageSize );
- if ( out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[c1to32] Not enough memory for image.\n" );
+ if ( out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_NotEnoughMemoryC1To32 );
  {
   int i,b,c=0; unsigned int * buf = NULL; unsigned char tmp = 0;
   buf=(unsigned int *)out->Image;
Index: Gui/cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v
retrieving revision 1.41
diff -u -r1.41 cfg.c
--- Gui/cfg.c	30 Jul 2004 15:58:36 -0000	1.41
+++ Gui/cfg.c	13 Dec 2004 01:20:16 -0000
@@ -5,6 +5,7 @@
 
 #include "../config.h"
 #include "../mp_msg.h"
+#include "../help_mp.h"
 #include "../mplayer.h"
 #include "../m_config.h"
 #include "../m_option.h"
@@ -212,12 +213,12 @@
 #endif
 
 // -- read configuration
- mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[cfg] read config file: %s\n",cfg );
+ mp_msg( MSGT_GPLAYER,MSGL_V,"[cfg] reading config file: %s\n",cfg );
  gui_conf=m_config_new();
  m_config_register_options( gui_conf,gui_opts );
  if ( m_config_parse_config_file( gui_conf,cfg ) < 0 ) 
   {
-   mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[cfg] config file read error ...\n" );
+   mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_ConfigfileError );
 //   exit( 1 );
   }
  free( cfg );
@@ -298,7 +299,7 @@
 	fprintf( f,"%s = \"%s\"\n",gui_opts[i].name, v);
 	free(v);
       } else if((int)v == -1)
-	mp_msg(MSGT_GPLAYER,MSGL_WARN,"Unable to save the '%s' option\n", gui_opts[i].name);
+	mp_msg(MSGT_GPLAYER,MSGL_WARN,MSGTR_UnableToSaveOption, gui_opts[i].name);
     }
    fclose( f );
   }
Index: Gui/interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.97
diff -u -r1.97 interface.c
--- Gui/interface.c	12 Dec 2004 22:24:32 -0000	1.97
+++ Gui/interface.c	13 Dec 2004 01:20:16 -0000
@@ -185,13 +185,13 @@
 // --- load skin
  skinDirInHome=get_path("Skin");
  skinMPlayerDir=MPLAYER_DATADIR "/Skin";
- printf("SKIN dir 1: '%s'\n",skinDirInHome);
- printf("SKIN dir 2: '%s'\n",skinMPlayerDir);
+ mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 1: '%s'\n",skinDirInHome);
+ mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 2: '%s'\n",skinMPlayerDir);
  if ( !skinName ) skinName=strdup( "default" );
  i = skinRead( skinName );
  if ((i == -1) && strcmp(skinName,"default"))
  {
-    mp_msg( MSGT_GPLAYER,MSGL_INFO,"Selected skin ( %s ) not found, trying 'default'...\n", skinName);
+    mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_SKIN_SKINCFG_SelectedSkinNotFound, skinName);
     skinName=strdup( "default" );
     i = skinRead( skinName );
  }
@@ -246,7 +246,7 @@
  wsXDNDMakeAwareness(&appMPlayer.mainWindow);
 
  #ifdef DEBUG
-  mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] Depth on screen: %d\n",wsDepthOnScreen );
+  mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] depth on screen: %d\n",wsDepthOnScreen );
   mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] parent: 0x%x\n",(int)appMPlayer.mainWindow.WindowID );
   mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] sub: 0x%x\n",(int)appMPlayer.subWindow.WindowID );
  #endif
@@ -340,7 +340,7 @@
 void guiDone( void )
 {
  mplMainRender=0;
- mp_msg( MSGT_GPLAYER,MSGL_V,"[gui] done.\n" );
+ mp_msg( MSGT_GPLAYER,MSGL_V,"[GUI] done.\n" );
 
  if ( gui_save_pos )
   {
@@ -430,7 +430,7 @@
   }
  if ( subdata )
   {
-   mp_msg( MSGT_GPLAYER,MSGL_INFO,"[gui] Delete subtitles.\n" );
+   mp_msg( MSGT_GPLAYER,MSGL_INFO,MSGTR_DeletingSubtitles );
    sub_free( subdata );
    subdata=NULL;
    vo_sub=NULL;
@@ -453,7 +453,7 @@
   }
  if ( name )
   {
-   mp_msg( MSGT_GPLAYER,MSGL_INFO,"[gui] Load subtitle: %s\n",name );
+   mp_msg( MSGT_GPLAYER,MSGL_INFO,MSGTR_LoadingSubtitles,name );
    subdata=sub_read_file( gstrdup( name ), guiIntfStruct.FPS );
    if ( !subdata ) mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_CantLoadSub,name );
    sub_name = (malloc(2 * sizeof(char*))); //when mplayer will be restarted 
@@ -467,7 +467,7 @@
 
 static void add_vop( char * str )
 {
- mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[gui] add video filter: %s\n",str );
+ mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_AddingVideoFilter,str );
  if ( vo_plugin_args )
   {
    int i = 0;
@@ -483,7 +483,7 @@
 
  if ( !vo_plugin_args ) return;
 
- mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[gui] remove video filter: %s\n",str );
+ mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_RemovingVideoFilter,str );
 
  while ( vo_plugin_args[n++].name ); n--;
  if ( n > -1 )
Index: Gui/mplayer/mw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v
retrieving revision 1.113
diff -u -r1.113 mw.c
--- Gui/mplayer/mw.c	21 Nov 2004 15:10:37 -0000	1.113
+++ Gui/mplayer/mw.c	13 Dec 2004 01:20:16 -0000
@@ -551,7 +551,7 @@
 
     if(stat(str,&buf) == 0 && S_ISDIR(buf.st_mode) == 0) {
       /* this is not a directory so try to play it */
-      printf("Received D&D %s\n",str);
+      mp_msg( MSGT_GPLAYER,MSGL_V,"Received D&D %s\n",str );
       
       /* check if it is a subtitle file */
       {
@@ -590,7 +590,7 @@
       }
       gtkSet(gtkAddPlItem,0,(void*)item);
     } else {
-      printf("Received not a file: %s !\n",str);
+      mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_NotAFile,str );
     }
     free( str );
   }
Index: Gui/mplayer/widgets.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.c,v
retrieving revision 1.43
diff -u -r1.43 widgets.c
--- Gui/mplayer/widgets.c	17 Jan 2003 22:39:39 -0000	1.43
+++ Gui/mplayer/widgets.c	13 Dec 2004 01:20:17 -0000
@@ -60,7 +60,7 @@
 
 void gtkInit( void )
 {
- mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[widget] init gtk ...\n" );
+ mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[widget] init GTK ...\n" );
  gtk_set_locale();
  gtk_init( 0,NULL );
 // gdk_set_use_xshm( TRUE );
Index: Gui/skin/skin.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/skin/skin.c,v
retrieving revision 1.25
diff -u -r1.25 skin.c
--- Gui/skin/skin.c	25 Jun 2004 16:49:52 -0000	1.25
+++ Gui/skin/skin.c	13 Dec 2004 01:20:17 -0000
@@ -121,7 +121,7 @@
   else if ( !strncmp( in,"sub",3 ) ) currSection=&skinAppMPlayer->sub;
    else if ( !strncmp( in,"playbar",7 ) ) { currSection=&skinAppMPlayer->bar; currSubItem=&skinAppMPlayer->NumberOfBarItems; currSubItems=skinAppMPlayer->barItems; }
     else if ( !strncmp( in,"menu",4 ) ) { currSection=&skinAppMPlayer->menuBase; currSubItem=&skinAppMPlayer->NumberOfMenuItems; currSubItems=skinAppMPlayer->MenuItems; }
-     else ERRORMESSAGE( "Unknown window type found ..." );
+     else ERRORMESSAGE( MSGTR_UNKNOWNWINDOWTYPE );
  mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"\n[skin] window: %s\n",window_name );
  return 0;
 }
@@ -676,7 +676,7 @@
    setname( skinMPlayerDir,dname );
    if ( ( skinFile = fopen( fn,"rt" ) ) == NULL )
     {
-     mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[skin] file ( %s ) not found.\n",fn );
+     mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_SKIN_SkinFileNotFound,fn );
      return -1;
     }
   }
Index: Gui/wm/ws.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v
retrieving revision 1.76
diff -u -r1.76 ws.c
--- Gui/wm/ws.c	11 Jul 2004 22:27:18 -0000	1.76
+++ Gui/wm/ws.c	13 Dec 2004 01:20:18 -0000
@@ -27,6 +27,7 @@
 #include "../../postproc/rgb2rgb.h"
 #include "../../libmpcodecs/vf_scale.h"
 #include "../../mp_msg.h"
+#include "../../help_mp.h"
 #include "../../mplayer.h"
 
 #include <X11/extensions/XShm.h>
@@ -168,7 +169,7 @@
 
 int wsIOErrorHandler( Display * dpy )
 {
- fprintf( stderr,"[ws] io error in display.\n" );
+ fprintf( stderr,"[ws] IO error in display.\n" );
  exit( 0 );
 }
 
@@ -197,7 +198,7 @@
  wsDisplay=XOpenDisplay( DisplayName );
  if ( !wsDisplay )
   {
-   mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] couldn't open the display !\n" );
+   mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_CouldNotOpenDisplay );
    exit( 0 );
   }
 }
@@ -212,19 +213,19 @@
     localdisp=0;
     wsUseXShm=0;
  }
- mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[ws] Display name: %s => %s display.\n",dispname,localdisp?"local":"REMOTE");
- if (!localdisp) mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[ws] Remote display, disabling XMITSHM\n");
+ mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[ws] display name: %s => %s display.\n",dispname,localdisp?"local":"REMOTE");
+ if (!localdisp) mp_msg( MSGT_GPLAYER,MSGL_V,MSGTR_WS_RemoteDisplay );
 }
 
  if ( !XShmQueryExtension( wsDisplay ) )
   {
-   mp_msg( MSGT_GPLAYER,MSGL_ERR,"[ws] sorry, your system is not supported X shared memory extension.\n" );
+   mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_WS_NoXshm );
    wsUseXShm=0;
   }
 #ifdef HAVE_XSHAPE
   if ( !XShapeQueryExtension( wsDisplay,&eventbase,&errorbase ) )
    {
-    mp_msg( MSGT_GPLAYER,MSGL_ERR,"[ws] sorry, your system is not supported XShape extension.\n" );
+    mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_WS_NoXshape );
     wsUseXShape=0;
    }
 #else
@@ -247,7 +248,7 @@
   wsOrgY = screens[xinerama_screen].y_org;
   wsMaxX=screens[xinerama_screen].width;
   wsMaxY=screens[xinerama_screen].height;
-  mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[ws] screens %d Max %d, %d Org %d,%d\n", 
+  mp_msg( MSGT_GPLAYER,MSGL_V,"[ws] screens %d Max %d, %d Org %d,%d\n",
     num_screens, wsMaxX, wsMaxY, wsOrgX, wsOrgY);
   XFree(screens);
   }
@@ -391,7 +392,7 @@
  depth = vo_find_depth_from_visuals( wsDisplay,wsScreen,NULL );
  if ( depth < 15 )
   {
-   mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] sorry, this color depth is not enough.\n" );
+   mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_ColorDepthTooLow );
    exit( 0 );
   }
  XMatchVisualInfo( wsDisplay,wsScreen,depth,TrueColor,&win->VisualInfo );
@@ -505,7 +506,7 @@
   for ( i=0;i < wsWLCount;i++ )
    if ( wsWindowList[i] == NULL ) break;
   if ( i == wsWLCount )
-   {  mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] there are too many open windows\n" ); exit( 0 ); }
+   {  mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_TooManyOpenWindows ); exit( 0 ); }
   wsWindowList[i]=win;
  }
 
@@ -578,7 +579,7 @@
           if ( (Atom)Event->xclient.data.l[0] == wsWindowList[l]->AtomTakeFocus )
            { i=wsWindowFocusIn;  wsWindowList[l]->Focused=wsFocused; goto expose; }
           if ( (Atom)Event->xclient.data.l[0] == wsWindowList[l]->AtomRolle )
-           { mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[ws] rolled.\n" ); }
+           { mp_msg( MSGT_GPLAYER,MSGL_V,"[ws] role set.\n" ); }
          } else {
 	   /* try to process DND events */
 	   wsXDNDProcessClientMessage(wsWindowList[l],&Event->xclient);
@@ -720,7 +721,7 @@
 void wsMainLoop( void )
 {
  int delay=20;
- mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[ws] init threads: %d\n",XInitThreads() );
+ mp_msg( MSGT_GPLAYER,MSGL_V,"[ws] init threads: %d\n",XInitThreads() );
  XSynchronize( wsDisplay,False );
  XLockDisplay( wsDisplay );
 // XIfEvent( wsDisplay,&wsEvent,wsEvents,NULL );
@@ -1115,14 +1116,14 @@
                    win->VisualInfo.depth,ZPixmap,NULL,&win->Shminfo,Width,Height );
    if ( win->xImage == NULL )
     {
-     mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] shared memory extension error.\n" );
+     mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_ShmError );
      exit( 0 );
     }
    win->Shminfo.shmid=shmget( IPC_PRIVATE,win->xImage->bytes_per_line * win->xImage->height,IPC_CREAT|0777 );
    if ( win->Shminfo.shmid < 0 )
     {
      XDestroyImage( win->xImage );
-     mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] shared memory extension error.\n" );
+     mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_ShmError );
      exit( 0 );
     }
    win->Shminfo.shmaddr=(char *)shmat( win->Shminfo.shmid,0,0 );
@@ -1131,7 +1132,7 @@
     {
      XDestroyImage( win->xImage );
      if ( win->Shminfo.shmaddr != ((char *) -1) ) shmdt( win->Shminfo.shmaddr );
-     mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] shared memory extension error.\n" );
+     mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_ShmError );
      exit( 0 );
     }
    win->xImage->data=win->Shminfo.shmaddr;
@@ -1147,7 +1148,7 @@
                               0 );
     if ( ( win->xImage->data=malloc( win->xImage->bytes_per_line * win->xImage->height ) ) == NULL )
      {
-      mp_msg( MSGT_GPLAYER,MSGL_FATAL,"[ws] sorry, not enough memory for draw buffer.\n" );
+      mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_NotEnoughMemoryDrawBuffer );
       exit( 0 );
      }
    }
@@ -1190,15 +1191,15 @@
   {
    if ( DPMSQueryExtension( mDisplay,&nothing,&nothing ) )
     {
-     if ( !DPMSEnable( mDisplay ) ) mp_msg( MSGT_GPLAYER,MSGL_ERR,"DPMS not available ?\n" ); // restoring power saving settings
+     if ( !DPMSEnable( mDisplay ) ) mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_WS_DpmsUnavailable ); // restoring power saving settings
       else
        {
         // DPMS does not seem to be enabled unless we call DPMSInfo
         BOOL onoff;
         CARD16 state;
         DPMSInfo( mDisplay,&state,&onoff );
-        if ( onoff ) mp_msg( MSGT_GPLAYER,MSGL_STATUS,"Successfully enabled DPMS.\n" );
-         else mp_msg( MSGT_GPLAYER,MSGL_STATUS,"Could not enable DPMS.\n" );
+        if ( onoff ) mp_msg( MSGT_GPLAYER,MSGL_V,"Successfully enabled DPMS.\n" );
+         else mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_WS_DpmsNotEnabled );
        }
     }
   }
Index: Gui/wm/wsxdnd.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/wsxdnd.c,v
retrieving revision 1.6
diff -u -r1.6 wsxdnd.c
--- Gui/wm/wsxdnd.c	25 Mar 2004 21:49:48 -0000	1.6
+++ Gui/wm/wsxdnd.c	13 Dec 2004 01:20:18 -0000
@@ -11,6 +11,8 @@
 
 #include <X11/Xatom.h>
 
+#include "../../mp_msg.h"
+#include "../../help_mp.h"
 
 #define XDND_VERSION 3L
 
@@ -81,7 +83,7 @@
     XSendEvent(wsDisplay, selowner, 0, 0, &xevent);
 
     if (!delme){
-      printf("D&D: Nothing returned!\n");
+      mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_WS_DDNothing );
       return False;
     }
 
@@ -151,7 +153,7 @@
 	}
       }
       if (atom_support == None) {
-	printf("This doesn't seem as a file...\n");
+	mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_WS_NotAFile );
       }
     } else {
       /* need to check the whole list here */
Index: help/help_mp-en.h
===================================================================
RCS file: /cvsroot/mplayer/main/help/help_mp-en.h,v
retrieving revision 1.153
diff -u -r1.153 help_mp-en.h
--- help/help_mp-en.h	3 Dec 2004 21:02:13 -0000	1.153
+++ help/help_mp-en.h	13 Dec 2004 01:20:19 -0000
@@ -624,12 +624,14 @@
 #define MSGTR_NEMFMR "Sorry, not enough memory for menu rendering."
 #define MSGTR_IDFGCVD "Sorry, I did not find a GUI compatible video output driver."
 #define MSGTR_NEEDLAVCFAME "Sorry, you cannot play non-MPEG files with your DXR3/H+ device without reencoding.\nPlease enable lavc or fame in the DXR3/H+ configbox."
+#define MSGTR_UNKNOWNWINDOWTYPE "Unknown window type found ..."
 
 // --- skin loader error messages
 #define MSGTR_SKIN_ERRORMESSAGE "[skin] error in skin config file on line %d: %s"
 #define MSGTR_SKIN_WARNING1 "[skin] warning in config file line %d:\nwidget (%s) found but no \"section\" found before"
 #define MSGTR_SKIN_WARNING2 "[skin] warning in config file line %d:\nwidget (%s) found but no \"subsection\" found before"
 #define MSGTR_SKIN_WARNING3 "[skin] warning in config file line %d:\nthis subsection is not supported by widget (%s)"
+#define MSGTR_SKIN_SkinFileNotFound "[skin] file ( %s ) not found.\n"
 #define MSGTR_SKIN_BITMAP_16bit  "16 bits or less depth bitmap not supported (%s).\n"
 #define MSGTR_SKIN_BITMAP_FileNotFound  "file not found (%s)\n"
 #define MSGTR_SKIN_BITMAP_BMPReadError "BMP read error (%s)\n"
@@ -646,6 +648,7 @@
 #define MSGTR_SKIN_FONT_NonExistentFontID "non-existent font identifier (%s)\n"
 #define MSGTR_SKIN_UnknownParameter "unknown parameter (%s)\n"
 #define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin not found (%s).\n"
+#define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Selected skin ( %s ) not found, trying 'default'...\n"
 #define MSGTR_SKIN_SKINCFG_SkinCfgReadError "skin configfile read error (%s)\n"
 #define MSGTR_SKIN_LABEL "Skins:"
 
@@ -828,6 +831,45 @@
 #define MSGTR_MSGBOX_LABEL_Error "Error!"
 #define MSGTR_MSGBOX_LABEL_Warning "Warning!"
 
+// bitmap.c
+
+#define MSGTR_NotEnoughMemoryC32To1 "[c32to1] Not enough memory for image.\n"
+#define MSGTR_NotEnoughMemoryC1To32 "[c1to32] Not enough memory for image.\n"
+
+// cfg.c
+
+#define MSGTR_ConfigFileReadError "[cfg] config file read error ...\n"
+#define MSGTR_UnableToSaveOption "Unable to save the '%s' option.\n"
+
+// interface.c
+
+#define MSGTR_DeletingSubtitles "[GUI] deleting subtitles.\n"
+#define MSGTR_LoadingSubtitles "[GUI] loading subtitles: %s\n"
+#define MSGTR_AddingVideoFilter "[GUI] adding video filter: %s\n"
+#define MSGTR_RemovingVideoFilter "[GUI] removing video filter: %s\n"
+
+// mw.c
+
+#define MSGTR_NotAFile "This does not seem to be a file: %s !\n"
+
+// ws.c
+
+#define MSGTR_WS_CouldNotOpenDisplay "[ws] could not open the display.\n"
+#define MSGTR_WS_RemoteDisplay "[ws] remote display, disabling XMITSHM.\n"
+#define MSGTR_WS_NoXshm "[ws] sorry, your system does not support the X shared memory extension.\n"
+#define MSGTR_WS_NoXshape "[ws] sorry, your system does not support the XShape extension.\n"
+#define MSGTR_WS_ColorDepthTooLow "[ws] sorry, the color depth is too low.\n"
+#define MSGTR_WS_TooManyOpenWindows "[ws] there are too many open windows\n"
+#define MSGTR_WS_ShmError "[ws] shared memory extension error.\n"
+#define MSGTR_WS_NotEnoughMemoryDrawBuffer "[ws] sorry, not enough memory for draw buffer.\n"
+#define MSGTR_WS_DpmsUnavailable "DPMS not available?\n"
+#define MSGTR_WS_DpmsNotEnabled "Could not enable DPMS.\n"
+
+// wsxdnd.c
+
+#define MSGTR_WS_NotAFile "This does not seem to be a file...\n"
+#define MSGTR_WS_DDNothing "D&D: Nothing returned!\n"
+
 #endif
 
 // ======================= VO Video Output drivers ========================
@@ -910,7 +952,7 @@
 // ao_esd.c
 #define MSGTR_AO_ESD_CantOpenSound "[AO ESD] esd_open_sound failed: %s\n"
 #define MSGTR_AO_ESD_LatencyInfo "[AO ESD] latency: [server: %0.2fs, net: %0.2fs] (adjust %0.2fs)\n"
-#define MSGTR_AO_ESD_CantOpenPBStream "[AO ESD] failed to open esd playback stream: %s\n"
+#define MSGTR_AO_ESD_CantOpenPBStream "[AO ESD] failed to open ESD playback stream: %s\n"
 
 // ao_mpegpes.c
 #define MSGTR_AO_MPEGPES_CantSetMixer "[AO MPEGPES] DVB audio set mixer failed: %s\n"