From f7e307ee4d8600edf82a9a20d28d11453480641f Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 18 Oct 2005 11:11:25 +0000 Subject: Make a few more messages translatable by moving them into help_mp-en.h. patch by Paul TT < paultt == at == hackerjournal == dot == it > git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16794 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/cache2.c | 3 ++- libmpdemux/stream.c | 2 +- libmpdemux/stream_dvd.c | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 13 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/cache2.c b/libmpdemux/cache2.c index d0822b1205..6449ced6f8 100644 --- a/libmpdemux/cache2.c +++ b/libmpdemux/cache2.c @@ -27,6 +27,7 @@ static DWORD WINAPI ThreadProc(void* s); #endif #include "mp_msg.h" +#include "help_mp.h" #include "stream.h" @@ -290,7 +291,7 @@ int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){ 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 --git a/libmpdemux/stream.c b/libmpdemux/stream.c index 2f5921302c..05a4607d3b 100644 --- a/libmpdemux/stream.c +++ b/libmpdemux/stream.c @@ -195,7 +195,7 @@ stream_t* open_stream_full(char* filename,int mode, char** options, int* file_fo 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; diff --git a/libmpdemux/stream_dvd.c b/libmpdemux/stream_dvd.c index 8987f76464..0da08459bc 100644 --- a/libmpdemux/stream_dvd.c +++ b/libmpdemux/stream_dvd.c @@ -81,26 +81,26 @@ int dvd_parse_chapter_range(m_option_t *conf, const char *range) { if(*range && isdigit(*range)) { dvd_chapter = strtol(range, &s, 10); if(range == s) { - mp_msg(MSGT_OPEN, MSGL_ERR, "Invalid chapter range specification %s\n", range); + mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_DVDinvalidChapterRange, range); return M_OPT_INVALID; } } if(*s == 0) return 0; else if(*s != '-') { - mp_msg(MSGT_OPEN, MSGL_ERR, "Invalid chapter range specification %s\n", range); + mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_DVDinvalidChapterRange, range); return M_OPT_INVALID; } ++s; if(*s == 0) return 0; if(! isdigit(*s)) { - mp_msg(MSGT_OPEN, MSGL_ERR, "Invalid chapter range specification %s\n", range); + mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_DVDinvalidChapterRange, range); return M_OPT_INVALID; } dvd_last_chapter = strtol(s, &t, 10); if (s == t || *t) { - mp_msg(MSGT_OPEN, MSGL_ERR, "Invalid chapter range specification %s\n", range); + mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_DVDinvalidChapterRange, range); return M_OPT_INVALID; } return 0; @@ -144,7 +144,7 @@ int dvd_aid_from_lang(stream_t *stream, unsigned char* lang) { code=lang[1]|(lang[0]<<8); for(i=0;inr_of_channels;i++) { if(d->audio_streams[i].language==code) { - mp_msg(MSGT_OPEN,MSGL_INFO,"Selected DVD audio channel: %d language: %c%c\n", + mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_DVDaudioChannel, d->audio_streams[i].id, lang[0],lang[1]); return d->audio_streams[i].id; } @@ -152,7 +152,7 @@ int dvd_aid_from_lang(stream_t *stream, unsigned char* lang) { } lang+=2; while (lang[0]==',' || lang[0]==' ') ++lang; } - mp_msg(MSGT_OPEN,MSGL_WARN,"No matching DVD audio language found!\n"); + mp_msg(MSGT_OPEN,MSGL_WARN,MSGTR_DVDnoMatchingAudio); } return -1; } @@ -181,14 +181,14 @@ int dvd_sid_from_lang(stream_t *stream, unsigned char* lang) { code=lang[1]|(lang[0]<<8); for(i=0;inr_of_subtitles;i++) { if(d->subtitles[i].language==code) { - mp_msg(MSGT_OPEN,MSGL_INFO,"Selected DVD subtitle channel: %d language: %c%c\n", i, lang[0],lang[1]); + mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_DVDsubtitleChannel, i, lang[0],lang[1]); return i; } } lang+=2; while (lang[0]==',' || lang[0]==' ') ++lang; } - mp_msg(MSGT_OPEN,MSGL_WARN,"No matching DVD subtitle language found!\n"); + mp_msg(MSGT_OPEN,MSGL_WARN,MSGTR_DVDnoMatchingSubtitle); return -1; } @@ -490,7 +490,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { */ vmg_file = ifoOpen(dvd, 0); if(!vmg_file) { - mp_msg(MSGT_OPEN,MSGL_ERR, "Can't open VMG info!\n"); + mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_DVDnoVMG); DVDClose( dvd ); m_struct_free(&stream_opts,opts); return STREAM_UNSUPORTED; @@ -561,7 +561,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { } if(dvd_last_chapter>0) { if(dvd_last_chaptertt_srpt->title[dvd_title].nr_of_ptts) { - mp_msg(MSGT_OPEN,MSGL_ERR, "Invalid DVD last chapter number: %d\n", dvd_last_chapter); + mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_DVDinvalidLastChapter, dvd_last_chapter); ifoClose( vmg_file ); DVDClose( dvd ); m_struct_free(&stream_opts,opts); @@ -776,7 +776,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { return STREAM_OK; } #endif - mp_msg(MSGT_DVD,MSGL_ERR,"MPlayer was compiled without dvd support, exit\n"); + mp_msg(MSGT_DVD,MSGL_ERR,MSGTR_NoDVDSupport); m_struct_free(&stream_opts,opts); return STREAM_UNSUPORTED; } -- cgit v1.2.3