diff -urN main/help/help_mp-en.h main_new/help/help_mp-en.h --- main/help/help_mp-en.h 2005-10-17 02:10:17.741719168 +0200 +++ main_new/help/help_mp-en.h 2005-10-17 10:59:26.403760080 +0200 @@ -539,6 +539,10 @@ #define MSGTR_LeaveTelecineMode "\ndemux_mpg: 30000/1001fps NTSC content detected, switching framerate.\n" #define MSGTR_EnterTelecineMode "\ndemux_mpg: 24000/1001fps progressive NTSC content detected, switching framerate.\n" +#define MSGTR_CacheFill "\rCache fill: %5.2f%% (%d bytes) " +#define MSGTR_NoBindFound "No bind found for key '%s'" +#define MSGTR_FailedToOpen "Failed to open %s\n" + // dec_video.c & dec_audio.c: #define MSGTR_CantOpenCodec "Could not open codec.\n" #define MSGTR_CantCloseCodec "Could not close codec.\n" @@ -564,7 +568,10 @@ #define MSGTR_VideoCodecFamilyNotAvailableStr "Requested video codec family [%s] (vfm=%s) not available.\nEnable it at compilation.\n" #define MSGTR_AudioCodecFamilyNotAvailableStr "Requested audio codec family [%s] (afm=%s) not available.\nEnable it at compilation.\n" #define MSGTR_OpeningVideoDecoder "Opening video decoder: [%s] %s\n" +#define MSGTR_SelectedVideoCodec "Selected video codec: [%s] vfm:%s (%s)\n" #define MSGTR_OpeningAudioDecoder "Opening audio decoder: [%s] %s\n" +#define MSGTR_SelectedAudioCodec "Selected audio codec: [%s] afm:%s (%s)\n" +#define MSGTR_BuildingAudioFilterChain "Building audio filter chain for %dHz/%dch/%s -> %dHz/%dch/%s...\n" #define MSGTR_UninitVideoStr "uninit video: %s\n" #define MSGTR_UninitAudioStr "uninit audio: %s\n" #define MSGTR_VDecoderInitFailed "VDecoder init failed :(\n" diff -urN main/input/input.c main_new/input/input.c --- main/input/input.c 2005-09-21 09:59:18.612762944 +0200 +++ main_new/input/input.c 2005-10-17 10:59:58.247919032 +0200 @@ -1,4 +1,6 @@ #include "../config.h" +#include "mp_msg.h" +#include "help_mp.h" #include #include @@ -833,7 +835,7 @@ cmd = mp_input_find_bind_for_key(def_cmd_binds,n,keys); if(cmd == NULL) { - mp_msg(MSGT_INPUT,MSGL_WARN,"No bind found for key %s",mp_input_get_key_name(keys[0])); + mp_msg(MSGT_INPUT,MSGL_WARN,MSGTR_NoBindFound,mp_input_get_key_name(keys[0])); if(n > 1) { int s; for(s=1; s < n; s++) diff -urN main/libmpcodecs/dec_audio.c main_new/libmpcodecs/dec_audio.c --- main/libmpcodecs/dec_audio.c 2005-08-31 16:52:13.575840792 +0200 +++ main_new/libmpcodecs/dec_audio.c 2005-10-17 11:18:20.942284008 +0200 @@ -241,7 +241,7 @@ return 0; // failed } -mp_msg(MSGT_DECAUDIO,MSGL_INFO,"Selected audio codec: [%s] afm:%s (%s)\n", +mp_msg(MSGT_DECAUDIO,MSGL_INFO,MSGTR_SelectedAudioCodec, sh_audio->codec->name,sh_audio->codec->drv,sh_audio->codec->info); return 1; // success } @@ -306,7 +306,7 @@ // filter config: memcpy(&afs->cfg,&af_cfg,sizeof(af_cfg_t)); - mp_msg(MSGT_DECAUDIO, MSGL_INFO, "Building audio filter chain for %dHz/%dch/%s -> %dHz/%dch/%s...\n", + mp_msg(MSGT_DECAUDIO, MSGL_INFO, MSGTR_BuildingAudioFilterChain, afs->input.rate,afs->input.nch,af_fmt2str_short(afs->input.format), afs->output.rate,afs->output.nch,af_fmt2str_short(afs->output.format)); diff -urN main/libmpcodecs/dec_video.c main_new/libmpcodecs/dec_video.c --- main/libmpcodecs/dec_video.c 2005-08-31 16:52:13.649829544 +0200 +++ main_new/libmpcodecs/dec_video.c 2005-10-17 11:18:29.230024080 +0200 @@ -297,7 +297,7 @@ return 0; // failed } -mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Selected video codec: [%s] vfm:%s (%s)\n", +mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_SelectedVideoCodec, sh_video->codec->name,sh_video->codec->drv,sh_video->codec->info); return 1; // success } diff -urN main/libmpdemux/cache2.c main_new/libmpdemux/cache2.c --- main/libmpdemux/cache2.c 2005-10-14 11:07:43.398300152 +0200 +++ main_new/libmpdemux/cache2.c 2005-10-17 11:22:43.785325792 +0200 @@ -1,4 +1,6 @@ #include "config.h" +#include "mp_msg.h" +#include "help_mp.h" #ifdef USE_STREAM_CACHE @@ -290,7 +292,7 @@ mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %d [%d] %d pre:%d eof:%d \n", s->min_filepos,s->read_filepos,s->max_filepos,min,s->eof); while(s->read_fileposmin_filepos || s->max_filepos-s->read_fileposmax_filepos-s->read_filepos)/(float)(s->buffer_size), s->max_filepos-s->read_filepos ); diff -urN main/libmpdemux/stream.c main_new/libmpdemux/stream.c --- main/libmpdemux/stream.c 2005-10-17 01:06:44.140474680 +0200 +++ main_new/libmpdemux/stream.c 2005-10-17 11:22:55.419557120 +0200 @@ -14,6 +14,8 @@ #include #include "config.h" +#include "mp_msg.h" +#include "help_mp.h" #ifndef HAVE_WINSOCK2 #define closesocket close @@ -195,7 +197,7 @@ s = open_stream_plugin(sinfo,filename,mode,options,file_format,&r); if(s) return s; if(r != STREAM_UNSUPORTED) { - mp_msg(MSGT_OPEN,MSGL_ERR, "Failed to open %s\n",filename); + mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_FailedToOpen,filename); return NULL; } break;