[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[581] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[581] mplayerxp
|
From: <nic...@us...> - 2012-12-20 09:58:00
|
Revision: 581
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=581&view=rev
Author: nickols_k
Date: 2012-12-20 09:57:50 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
remove many NLS translations because they are incompatible with new stream-based output methods. Furthermore, project should distinguish RTL and LTR probably with using of std::pair or std::tuple classes
Modified Paths:
--------------
mplayerxp/dump.cpp
mplayerxp/libmpdemux/demuxer.cpp
mplayerxp/libmpdemux/demuxer.h
mplayerxp/libmpstream2/stream.cpp
mplayerxp/mplayerxp.cpp
mplayerxp/nls/mpxp_help-cz.h
mplayerxp/nls/mpxp_help-de.h
mplayerxp/nls/mpxp_help-dk.h
mplayerxp/nls/mpxp_help-en.h
mplayerxp/nls/mpxp_help-es.h
mplayerxp/nls/mpxp_help-fr.h
mplayerxp/nls/mpxp_help-hu.h
mplayerxp/nls/mpxp_help-it.h
mplayerxp/nls/mpxp_help-ko.h
mplayerxp/nls/mpxp_help-nl.h
mplayerxp/nls/mpxp_help-no.h
mplayerxp/nls/mpxp_help-pl.h
mplayerxp/nls/mpxp_help-ro.h
mplayerxp/nls/mpxp_help-ru.h
mplayerxp/nls/mpxp_help-sk.h
Modified: mplayerxp/dump.cpp
===================================================================
--- mplayerxp/dump.cpp 2012-12-20 08:10:31 UTC (rev 580)
+++ mplayerxp/dump.cpp 2012-12-20 09:57:50 UTC (rev 581)
@@ -59,7 +59,7 @@
f=fopen(name,"wb");
if(!f){
MSG_FATAL(MSGTR_CantOpenDumpfile);
- exit_player(MSGTR_Exit_error);
+ exit_player(MSGTR_Fatal_error);
}
MSG_INFO("Dumping stream to %s\n",name);
while(!stream->eof()){
@@ -137,17 +137,17 @@
else if(strcmp(media,"raw") == 0) strcat(stream_dump_name,"dump.raw");
else {
MSG_FATAL("Unsupported muxer format %s found\n",media);
- exit_player(MSGTR_Exit_error);
+ exit_player(MSGTR_Fatal_error);
}
priv->mux_file=fopen(stream_dump_name,"wb");
MSG_DBG2("Preparing stream dumping: %s\n",stream_dump_name);
if(!priv->mux_file){
MSG_FATAL(MSGTR_CantOpenDumpfile);
- exit_player(MSGTR_Exit_error);
+ exit_player(MSGTR_Fatal_error);
}
if(!(priv->muxer=muxer_new_muxer(media,port,priv->mux_file))) {
MSG_FATAL("Can't initialize muxer\n");
- exit_player(MSGTR_Exit_error);
+ exit_player(MSGTR_Fatal_error);
}
if(sha && (priv->mux_type&MUX_HAVE_AUDIO)) {
priv->m_audio=muxer_new_stream(priv->muxer,MUXER_TYPE_AUDIO);
Modified: mplayerxp/libmpdemux/demuxer.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer.cpp 2012-12-20 08:10:31 UTC (rev 580)
+++ mplayerxp/libmpdemux/demuxer.cpp 2012-12-20 09:57:50 UTC (rev 581)
@@ -2,6 +2,8 @@
#include "osdep/mplib.h"
using namespace mpxp;
//=================== DEMUXER v2.5 =========================
+#include <iomanip>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -163,7 +165,7 @@
Demuxer::~Demuxer() {
demuxer_priv_t& dpriv = static_cast<demuxer_priv_t&>(*demuxer_priv);
unsigned i;
- MSG_V("DEMUXER: freeing demuxer at %p \n",this);
+ mpxp_v<<"[Demuxer]: "<<"freeing demuxer at 0x"<<std::hex<<reinterpret_cast<long>(this)<<std::endl;
if(dpriv.driver) dpriv.driver->close(this);
@@ -180,8 +182,7 @@
{
demuxer_priv_t& dpriv = static_cast<demuxer_priv_t&>(*demuxer_priv);
if(id > MAX_A_STREAMS-1 || id < 0) {
- MSG_WARN("Requested audio stream id overflow (%d > %d)\n",
- id, MAX_A_STREAMS);
+ mpxp_warn<<"[Demuxer]: "<<"Requested audio stream id overflow ("<<id<<" > "<<MAX_A_STREAMS<<")"<<std::endl;
return NULL;
}
check_pin("demuxer",pin,DEMUX_PIN);
@@ -191,21 +192,20 @@
sh_audio_t* Demuxer::new_sh_audio_aid(int id,int aid) {
demuxer_priv_t& dpriv = static_cast<demuxer_priv_t&>(*demuxer_priv);
if(id > MAX_A_STREAMS-1 || id < 0) {
- MSG_WARN("Requested audio stream id overflow (%d > %d)\n",
- id, MAX_A_STREAMS);
+ mpxp_warn<<"[Demuxer]: "<<"Requested audio stream id overflow ("<<id<<" > "<<MAX_A_STREAMS<<")"<<std::endl;
return NULL;
}
if(dpriv.a_streams[id]) {
- MSG_WARN(MSGTR_AudioStreamRedefined,id);
+ mpxp_warn<<MSGTR_AudioStreamRedefined<<": "<<id<<std::endl;
} else {
sh_audio_t *sh;
- MSG_V("==> Found audio stream: %d\n",id);
+ mpxp_v<<"Demuxer: "<<"==> Found audio stream: "<<id<<std::endl;
dpriv.a_streams[id]=new(zeromem) sh_audio_t;
sh = dpriv.a_streams[id];
// set some defaults
sh->afmt=bps2afmt(2); /* PCM */
sh->audio_out_minsize=8192;/* default size, maybe not enough for Win32/ACM*/
- MSG_V("ID_AUDIO_ID=%d\n", aid);
+ mpxp_v<<"Demuxer: "<<"ID_AUDIO_ID="<<aid<<std::endl;
}
dpriv.a_streams[id]->id = aid;
check_pin("demuxer",pin,DEMUX_PIN);
@@ -216,8 +216,7 @@
{
demuxer_priv_t& dpriv = static_cast<demuxer_priv_t&>(*demuxer_priv);
if(id > MAX_V_STREAMS-1 || id < 0) {
- MSG_WARN("Requested video stream id overflow (%d > %d)\n",
- id, MAX_V_STREAMS);
+ mpxp_warn<<"[Demuxer]: "<<"Requested video stream id overflow ("<<id<<" > "<<MAX_V_STREAMS<<")"<<std::endl;
return NULL;
}
check_pin("demuxer",pin,DEMUX_PIN);
@@ -227,16 +226,15 @@
sh_video_t* Demuxer::new_sh_video_vid(int id,int vid) {
demuxer_priv_t& dpriv = static_cast<demuxer_priv_t&>(*demuxer_priv);
if(id > MAX_V_STREAMS-1 || id < 0) {
- MSG_WARN("Requested video stream id overflow (%d > %d)\n",
- id, MAX_V_STREAMS);
+ mpxp_warn<<"[Demuxer]: "<<"Requested video stream id overflow ("<<id<<" > "<<MAX_V_STREAMS<<")"<<std::endl;
return NULL;
}
if(dpriv.v_streams[id]) {
- MSG_WARN(MSGTR_VideoStreamRedefined,id);
+ mpxp_warn<<"[Demuxer]: "<<MSGTR_VideoStreamRedefined<<": "<<id<<std::endl;
} else {
- MSG_V("==> Found video stream: %d\n",id);
+ mpxp_v<<"[Demuxer]: "<<"==> Found video stream: "<<id<<std::endl;
dpriv.v_streams[id]=new(zeromem) sh_video_t;
- MSG_V("ID_VIDEO_ID=%d\n", vid);
+ mpxp_v<<"[Demuxer]: "<<"ID_VIDEO_ID="<<vid<<std::endl;
}
dpriv.v_streams[id]->id = vid;
check_pin("demuxer",pin,DEMUX_PIN);
@@ -247,8 +245,7 @@
{
demuxer_priv_t& dpriv = static_cast<demuxer_priv_t&>(*demuxer_priv);
if(id > MAX_A_STREAMS-1 || id < 0) {
- MSG_WARN("Requested sub stream id overflow (%d > %d)\n",
- id, MAX_A_STREAMS);
+ mpxp_warn<<"[Demuxer]: "<<"Requested sub stream id overflow ("<<id<<" > "<<MAX_S_STREAMS<<")"<<std::endl;
return NULL;
}
check_pin("demuxer",pin,DEMUX_PIN);
@@ -258,14 +255,13 @@
char Demuxer::new_sh_sub(int id) {
demuxer_priv_t& dpriv = static_cast<demuxer_priv_t&>(*demuxer_priv);
if(id > MAX_V_STREAMS-1 || id < 0) {
- MSG_WARN("Requested video stream id overflow (%d > %d)\n",
- id, MAX_V_STREAMS);
+ mpxp_warn<<"[Demuxer]: "<<"Requested sub stream id overflow ("<<id<<" > "<<MAX_S_STREAMS<<")"<<std::endl;
return NULL;
}
if(dpriv.s_streams[id]) {
- MSG_WARN(MSGTR_SubStreamRedefined,id);
+ mpxp_warn<<"[Demuxer]: "<<MSGTR_SubStreamRedefined<<": "<<id<<std::endl;
} else {
- MSG_V("==> Found video stream: %d\n",id);
+ mpxp_v<<"[Demuxer]: "<<"==> Found video stream: "<<id<<std::endl;
dpriv.s_streams[id]=1;
}
check_pin("demuxer",pin,DEMUX_PIN);
@@ -379,15 +375,15 @@
const demuxer_driver_t* drv;
drv=demux_find_driver(demux_conf.type);
if(!drv) {
- MSG_ERR("Can't find demuxer driver: '%s'\n",demux_conf.type);
+ mpxp_err<<"[Demuxer]: "<<"Can't find demuxer driver: '"<<demux_conf.type<<"'"<<std::endl;
goto err_exit;
}
- MSG_V("Forcing %s ... ",drv->name);
+ mpxp_v<<"[Demuxer]: "<<"Forcing "<<drv->name<<" ..."<<std::endl;
/* don't remove it from loop!!! (for initializing) */
stream->reset();
stream->seek(stream->start_pos());
if(drv->probe(this)!=MPXP_Ok) {
- MSG_ERR("Can't probe stream with driver: '%s'\n",demux_conf.type);
+ mpxp_err<<"[Demuxer]: "<<"Can't probe stream with driver: '"<<demux_conf.type<<"'"<<std::endl;
goto err_exit;
}
dpriv.driver = drv;
@@ -395,34 +391,34 @@
}
again:
for(;ddrivers[i]!=&demux_null;i++) {
- MSG_V("Probing %s ... ",ddrivers[i]->name);
+ mpxp_v<<"[Demuxer]: "<<"Probing "<<ddrivers[i]->name<<" ...:";
/* don't remove it from loop!!! (for initializing) */
stream->reset();
stream->seek(stream->start_pos());
if(ddrivers[i]->probe(this)==MPXP_Ok) {
- MSG_V("OK\n");
+ mpxp_v<<"Ok"<<std::endl;
dpriv.driver = ddrivers[i];
break;
}
- MSG_V("False\n");
+ mpxp_v<<"False"<<std::endl;
}
if(!dpriv.driver) {
dpriv.driver=demuxer_driver_by_name(stream->mime_type());
if(dpriv.driver!=&demux_null) goto force_driver;
dpriv.driver=NULL;
err_exit:
- MSG_ERR(MSGTR_FormatNotRecognized);
+ mpxp_err<<"[Demuxer]: "<<MSGTR_FormatNotRecognized<<std::endl;
return MPXP_False;
}
force_driver:
if(!(priv=dpriv.driver->open(this))) {
- MSG_ERR("Can't open stream with '%s'\n", dpriv.driver->name);
+ mpxp_err<<"[Demuxer]: "<<"Can't open stream with '"<<dpriv.driver->name<<"'"<<std::endl;
dpriv.driver=NULL;
i++;
if(demux_conf.type) goto err_exit;
else goto again;
}
- MSG_OK("Using: %s\n",dpriv.driver->name);
+ mpxp_ok<<"[Demuxer]: "<<"Using: "<<dpriv.driver->name<<std::endl;
for(i=0;i<sizeof(stream_txt_ids)/sizeof(struct s_stream_txt_ids);i++)
if(!info().get(stream_txt_ids[i].demuxer_id)) {
char stream_name[256];
@@ -441,7 +437,7 @@
if(demux_conf.audio_stream) {
as = new(zeromem) Stream();
if(as->open(libinput,demux_conf.audio_stream,&afmt)!=MPXP_Ok) {
- MSG_ERR("Can't open audio stream: %s\n",demux_conf.audio_stream);
+ mpxp_err<<"[Demuxer]: "<<"Can't open audio stream: "<<demux_conf.audio_stream<<std::endl;
delete as;
return NULL;
}
@@ -449,7 +445,7 @@
if(demux_conf.sub_stream) {
ss = new(zeromem) Stream();
if(ss->open(libinput,demux_conf.sub_stream,&sfmt)!=MPXP_Ok) {
- MSG_ERR("Can't open subtitles stream: %s\n",demux_conf.sub_stream);
+ mpxp_err<<"[Demuxer]: "<<"Can't open subtitles stream: "<<demux_conf.sub_stream<<std::endl;
delete ss;
return NULL;
}
@@ -463,7 +459,7 @@
if(as) {
ad = new(zeromem) Demuxer(as,audio_id,-2,-2);
if(ad->open()!=MPXP_Ok) {
- MSG_WARN("Failed to open audio demuxer: %s\n",demux_conf.audio_stream);
+ mpxp_warn<<"[Demuxer]: "<<"Failed to open audio demuxer: "<<demux_conf.audio_stream<<std::endl;
delete ad; ad = NULL;
}
else if(ad->audio->sh && ((sh_audio_t*)ad->audio->sh)->wtag == 0x55) // MP3
@@ -472,7 +468,7 @@
if(ss) {
sd = new(zeromem) Demuxer(ss,-2,-2,dvdsub_id);
if(sd->open()!=MPXP_Ok) {
- MSG_WARN("Failed to open subtitles demuxer: %s\n",demux_conf.sub_stream);
+ mpxp_warn<<"[Demuxer]: "<<"Failed to open subtitles demuxer: "<<demux_conf.sub_stream<<std::endl;
delete sd; sd = NULL;
}
}
@@ -492,12 +488,12 @@
if(!(stream->type()&Stream::Type_Seekable))
{
- MSG_WARN("Stream is not seekable\n");
+ mpxp_warn<<"[Demuxer]: "<<"Stream is not seekable"<<std::endl;
return 0;
}
if(!(flags&Seekable))
{
- MSG_WARN("Demuxer is not seekable\n");
+ mpxp_warn<<"[Demuxer]: "<<"Demuxer is not seekable"<<std::endl;
return 0;
}
@@ -513,7 +509,7 @@
if(sh_audio) sh_audio->timer=0;
if(dpriv.driver->seek) dpriv.driver->seek(this,seeka);
- else MSG_WARN("Demuxer seek error\n");
+ else mpxp_warn<<"[Demuxer]: "<<"seek error"<<std::endl;
check_pin("demuxer",pin,DEMUX_PIN);
return 1;
}
Modified: mplayerxp/libmpdemux/demuxer.h
===================================================================
--- mplayerxp/libmpdemux/demuxer.h 2012-12-20 08:10:31 UTC (rev 580)
+++ mplayerxp/libmpdemux/demuxer.h 2012-12-20 09:57:50 UTC (rev 581)
@@ -13,7 +13,6 @@
struct demuxer_driver_t;
extern int index_mode; /**< -1=untouched 0=don't use index 1=use (geneate) index */
namespace mpxp {
-#define MAX_PACK_BYTES (0x1024*0x1024*4)
/** Describes interface to stream associated with this demuxer */
enum {
DS_PIN=RND_NUMBER1+RND_CHAR1
@@ -22,7 +21,8 @@
enum {
MAX_A_STREAMS =256,
MAX_V_STREAMS =256,
- MAX_S_STREAMS =256
+ MAX_S_STREAMS =256,
+ MAX_PACK_BYTES =(0x1024*0x1024*4)
};
/** Describes demuxer (demultiplexer) of movie */
Modified: mplayerxp/libmpstream2/stream.cpp
===================================================================
--- mplayerxp/libmpstream2/stream.cpp 2012-12-20 08:10:31 UTC (rev 580)
+++ mplayerxp/libmpstream2/stream.cpp 2012-12-20 09:57:50 UTC (rev 581)
@@ -2,6 +2,7 @@
#include "osdep/mplib.h"
using namespace mpxp;
#include <algorithm>
+#include <iomanip>
#include <ctype.h>
#include <errno.h>
@@ -101,7 +102,7 @@
}
Stream::~Stream(){
- MSG_INFO("\n*** free_stream(drv:%s) called [errno: %s]***\n",driver_info->mrl,strerror(errno));
+ mpxp_info<<std::endl<<"*** free_stream(drv:"<<driver_info->mrl<<") called [errno: "<<strerror(errno)<<"]***"<<std::endl;
if(driver) close();
delete driver;
}
@@ -131,18 +132,18 @@
for(i=0;sdrivers[i]!=&null_stream;i++) {
mrl_len=strlen(sdrivers[i]->mrl);
if(filename.substr(0,mrl_len)==sdrivers[i]->mrl||sdrivers[i]->mrl[0]=='*') {
- MSG_V("Opening %s ... ",sdrivers[i]->mrl);
+ mpxp_v<<"[Stream]: "<<"Opening "<<sdrivers[i]->mrl<<" ... ";
Stream_Interface* drv = sdrivers[i]->query_interface(libinput);
if(sdrivers[i]->mrl[0]=='*') mrl_len=0;
if(drv->open(&filename[mrl_len],0)==MPXP_Ok) {
- MSG_V("OK\n");
+ mpxp_v<<"Ok"<<std::endl;
*ff = file_format;
driver_info=sdrivers[i];
driver=drv;
return MPXP_Ok;
}
delete drv;
- MSG_V("False\n");
+ mpxp_v<<"False"<<std::endl;
}
}
Stream_Interface* file_drv = file_stream.query_interface(libinput);
@@ -171,10 +172,12 @@
/* ------------ print packet ---------- */
unsigned j,_lim=std::min(sp.len,20);
int printable=1;
- MSG_DBG4("%i=[stream.read(%p,%i)] [%016X]",rc,sp.buf,sp.len,_off);
+ mpxp_dbg4<<rc<<"=[stream.read("<<sp.buf<<","<<sp.len<<")] ["<<std::hex<<std::setfill('0')<<std::setw(16)<<_off<<"] ";
for(j=0;j<_lim;j++) { if(!isprint(sp.buf[j])) { printable=0; break; } }
- if(printable) MSG_DBG4("%20s",sp.buf);
- else for(j=0;j<_lim;j++) MSG_DBG4("%02X ",(unsigned char)sp.buf[j]);
+ if(printable) mpxp_dbg4<<std::string(sp.buf).substr(0,20);
+ else for(j=0;j<_lim;j++)
+ mpxp_dbg4<<std::hex<<std::setfill('0')<<std::setw(2)<<(unsigned)sp.buf[j];
+ mpxp_dbg4<<std::endl;
/* ------------ print packet ---------- */
return rc;
}
@@ -243,9 +246,9 @@
void Stream::print_drivers()
{
unsigned i;
- MSG_INFO("Available stream drivers:\n");
+ mpxp_info<<"[Stream]: "<<"Available stream drivers:"<<std::endl;
for(i=0;sdrivers[i];i++) {
- MSG_INFO(" %-10s %s\n",sdrivers[i]->mrl,sdrivers[i]->descr);
+ mpxp_info<<std::left<<std::setw(10)<<sdrivers[i]->mrl<<" "<<sdrivers[i]->descr<<std::endl;
}
}
Modified: mplayerxp/mplayerxp.cpp
===================================================================
--- mplayerxp/mplayerxp.cpp 2012-12-20 08:10:31 UTC (rev 580)
+++ mplayerxp/mplayerxp.cpp 2012-12-20 09:57:50 UTC (rev 581)
@@ -874,7 +874,7 @@
if(!vo_inited){
mpxp_fatal<<MSGTR_InvalidVOdriver<<": "<<(mp_conf.video_driver?mp_conf.video_driver:"?")<<std::endl;
- exit_player(MSGTR_Exit_error);
+ exit_player(MSGTR_Fatal_error);
}
// check audio_out driver name:
@@ -995,7 +995,7 @@
if(isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3]))
mpxp_info<<std::setw(4)<<c;
else
- mpxp_info<<std::hex<<std::setw(8)<<fmt;
+ mpxp_info<<std::hex<<std::setfill('0')<<std::setw(8)<<fmt;
}
if(sh_audio) {
mpxp_info<<" Audio=";
@@ -1004,7 +1004,7 @@
if(isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3]))
mpxp_info<<std::setw(4)<<c;
else
- mpxp_info<<std::hex<<std::setw(8)<<fmt;
+ mpxp_info<<std::hex<<std::setfill('0')<<std::setw(8)<<fmt;
}
mpxp_info<<std::endl;
}
@@ -1131,8 +1131,8 @@
if(isprint(fmt[0]) && isprint(fmt[1]) && isprint(fmt[2]) && isprint(fmt[3]))
mpxp_err<<std::setw(4)<<" '"<<fmt<<"'!"<<std::endl;
else
- mpxp_err<<" 0x"<<std::hex<<std::setprecision(8)<<sh_audio->wtag<<"!"<<std::endl;
- MSG_HINT( MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("win32codecs.conf"));
+ mpxp_err<<" 0x"<<std::hex<<std::setfill('0')<<std::setw(8)<<sh_audio->wtag<<"!"<<std::endl;
+ mpxp_hint<<get_path("win32codecs.conf")<<":"<<MSGTR_TryUpgradeCodecsConfOrRTFM<<std::endl;
d_audio->sh=NULL;
sh_audio=reinterpret_cast<sh_audio_t*>(d_audio->sh);
} else {
@@ -1145,7 +1145,7 @@
ao_inited=mpxp_context().audio().output->_register(mp_conf.audio_driver?mp_conf.audio_driver:"",0);
if (ao_inited!=MPXP_Ok){
mpxp_fatal<<MSGTR_InvalidAOdriver<<": "<<mp_conf.audio_driver<<std::endl;
- exit_player(MSGTR_Exit_error);
+ exit_player(MSGTR_Fatal_error);
}
}
}
@@ -1193,8 +1193,8 @@
if(isprint(fmt[0]) && isprint(fmt[1]) && isprint(fmt[2]) && isprint(fmt[3]))
mpxp_err<<std::setw(4)<<" '"<<fmt<<"'!"<<std::endl;
else
- mpxp_err<<" 0x"<<std::hex<<std::setw(8)<<sh_video->fourcc<<std::endl;
- MSG_HINT( MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("win32codecs.conf"));
+ mpxp_err<<" 0x"<<std::hex<<std::setfill('0')<<std::setw(8)<<sh_video->fourcc<<std::endl;
+ mpxp_hint<<get_path("win32codecs.conf")<<":"<<MSGTR_TryUpgradeCodecsConfOrRTFM<<std::endl;
d_video->sh = NULL;
sh_video = reinterpret_cast<sh_video_t*>(d_video->sh);
rc=MPXP_False;
@@ -1245,7 +1245,7 @@
} else {
mpxp_v<<"AF_pre: "<<samplerate<<"Hz "<<channels<<"ch ("
<<ao_format_name(format)<<
- ") afmt="<<std::hex<<std::setw(8)<<format
+ ") afmt="<<std::hex<<std::setfill('0')<<std::setw(8)<<format
<<" sh_audio_min="<<sh_audio->audio_out_minsize<<std::endl;
}
@@ -1301,8 +1301,8 @@
sh_audio_t* sh_audio=reinterpret_cast<sh_audio_t*>(_demuxer->audio->sh);
/* PAINT audio OSD */
unsigned ipts,rpts;
- unsigned char h,m,s,rh,rm,rs;
- static char ph=0,pm=0,ps=0;
+ unsigned h,m,s,rh,rm,rs;
+ static unsigned ph=0,pm=0,ps=0;
ipts=(unsigned)(sh_audio->timer-mpxp_context().audio().output->get_delay());
rpts=_demuxer->movi_length-ipts;
h = ipts/3600;
@@ -1314,8 +1314,12 @@
rs = rpts%60;
} else rh=rm=rs=0;
if(h != ph || m != pm || s != ps) {
- mpxp_status<<std::setw(2)<<">"<<h<<":"<<m<<":"<<s
- <<"("<<rh<<":"<<rm<<":"<<rs<<")\r";
+ mpxp_status<<">"<<std::setfill('0')<<std::setw(2)<<h<<":"
+ <<std::setfill('0')<<std::setw(2)<<m<<":"
+ <<std::setfill('0')<<std::setw(2)<<s<<"("
+ <<std::setfill('0')<<std::setw(2)<<rh<<":"
+ <<std::setfill('0')<<std::setw(2)<<rm<<":"
+ <<std::setfill('0')<<std::setw(2)<<rs<<")\r";
mpxp_status.flush();
ph = h;
pm = m;
@@ -1775,7 +1779,7 @@
if(mp_conf.stream_dump)
if((stream_dump_type=dump_parse(mp_conf.stream_dump))==0) {
mpxp_err<<"Wrong dump parameters! Unable to continue"<<std::endl;
- exit_player(MSGTR_Exit_error);
+ exit_player(MSGTR_Fatal_error);
}
if(stream_dump_type) mp_conf.s_cache_size=0;
@@ -1812,7 +1816,7 @@
MP_UNIT("demux_open");
if(!input_state.after_dvdmenu) MPXPSys.assign_demuxer(Demuxer::open(stream,MPXPSys.libinput(),mp_conf.audio_id,mp_conf.video_id,mp_conf.dvdsub_id));
- if(!MPXPSys.demuxer()) goto goto_next_file; // exit_player(MSGTR_Exit_error); // ERROR
+ if(!MPXPSys.demuxer()) goto goto_next_file;
input_state.after_dvdmenu=0;
Demuxer_Stream *d_video;
@@ -1841,7 +1845,7 @@
if(!sh_video && !sh_audio) {
mpxp_fatal<<"No stream found"<<std::endl;
- goto goto_next_file; // exit_player(MSGTR_Exit_error);
+ goto goto_next_file;
}
//================== Read SUBTITLES (DVD & TEXT) ==========================
@@ -1959,7 +1963,7 @@
if(mp_conf.force_fps && sh_video) {
sh_video->fps=mp_conf.force_fps;
- MSG_INFO(MSGTR_FPSforced,sh_video->fps,1.0f/sh_video->fps);
+ mpxp_info<<MSGTR_FPSforced<<sh_video->fps<<"(fitme: "<<1.0f/sh_video->fps<<")"<<std::endl;
}
/* Init timers and benchmarking */
@@ -2003,7 +2007,7 @@
<<")"<<std::endl;
//==================== START PLAYING =======================
- mpxp_ok<<MSGTR_StartPlaying<<std::endl;
+ mpxp_ok<<MSGTR_Playing<<"..."<<std::endl;
mpxp_print_flush();
while(!eof){
Modified: mplayerxp/nls/mpxp_help-cz.h
===================================================================
--- mplayerxp/nls/mpxp_help-cz.h 2012-12-20 08:10:31 UTC (rev 580)
+++ mplayerxp/nls/mpxp_help-cz.h 2012-12-20 09:57:50 UTC (rev 581)
@@ -40,144 +40,10 @@
// ========================= MPlayer messages ===========================
-// mplayer.c:
-
#define MSGTR_Exiting "Končím"
#define MSGTR_Exit_frames "Požadovaný počet snímků přehrán"
#define MSGTR_Exit_quit "Konec"
#define MSGTR_Exit_eof "Konec souboru"
-#define MSGTR_Exit_error "Závažná chyba"
-#define MSGTR_IntBySignal "\nMPlayerXP přerušen signálem %d v modulu: %s \n"
-#define MSGTR_NoHomeDir "Nemohu nalézt domácí (HOME) adresář\n"
-#define MSGTR_GetpathProblem "get_path(\"config\") problém\n"
-#define MSGTR_CreatingCfgFile "Vytvářím konfigurační soubor"
-#define MSGTR_InvalidVOdriver "Neplané jméno výstupního videoovladače"
-#define MSGTR_InvalidAOdriver "Neplané jméno výstupního audioovladače"
-#define MSGTR_CopyCodecsConf "(copy/ln etc/codecs.conf (ze zdrojových kódů MPlayerXPu) do ~/.mplayerxp/codecs.conf)\n"
-#define MSGTR_CantLoadFont "Nemohu načíst font"
-#define MSGTR_CantLoadSub "Nemohu načíst titulky"
-#define MSGTR_ErrorDVDkey "Chyba při zpracování klíče DVD.\n"
-#define MSGTR_CmdlineDVDkey "DVD klíč požadovaný na příkazové řádce je uschován pro rozkódování.\n"
-#define MSGTR_DVDauthOk "DVD autentikační sekvence vypadá vpořádku.\n"
-#define MSGTR_DumpSelectedSteramMissing "dump: FATAL: požadovaný proud chybí!\n"
-#define MSGTR_CantOpenDumpfile "Nelze otevřít soubor pro dump!!!\n"
-#define MSGTR_CoreDumped "jádro vypsáno :)\n"
-#define MSGTR_FPSnotspecified "V hlavičce souboru není udáno (nebo je špatné) FPS! Použijte volbu -fps !\n"
-#define MSGTR_NoVideoStream "Bohužel, žádný videoproud... to se zatím nedá přehrát.\n"
-#define MSGTR_TryForceAudioFmt "Pokouším se vynutit rodinu audiokodeku"
-#define MSGTR_CantFindAfmtFallback "Nemohu nalézt audio kodek pro požadovanou rodinu, použiji ostatní.\n"
-#define MSGTR_CantFindAudioCodec "Nemohu nalézt kodek pro audio formát"
-#define MSGTR_TryUpgradeCodecsConfOrRTFM "*** Pokuste se upgradovat %s z etc/codecs.conf\n*** Pokud problém přetrvá, pak si přečtěte DOCS/CODECS!\n"
-#define MSGTR_CouldntInitAudioCodec "Nelze inicializovat audio kodek! -> beze zvuku\n"
-#define MSGTR_TryForceVideoFmt "Pokuším se vynutit rodinu videokodeku"
-#define MSGTR_CantFindVfmtFallback "Nemohu nalézt video kodek pro požadovanou rodinu, použiji ostatní.\n"
-#define MSGTR_CantFindVideoCodec "Nemohu nalézt kodek pro video formát"
-#define MSGTR_VOincompCodec "Bohužel, vybrané video_out zařízení je nekompatibilní s tímto kodekem.\n"
-#define MSGTR_CouldntInitVideoCodec "FATAL: Nemohu inicializovat videokodek :(\n"
-#define MSGTR_EncodeFileExists "Soubor již existuje: %s (nepřepište si svůj oblíbený AVI soubor!)\n"
-#define MSGTR_CantCreateEncodeFile "Nemohu vytvořit soubor\n" // toto doopravit - need to be corrected
-#define MSGTR_CannotInitVO "FATAL: Nemohu inicializovat video driver!\n"
-#define MSGTR_CannotInitAO "nemohu otevřít/inicializovat audio driver -> TICHO\n"
-#define MSGTR_StartPlaying "Začínám přehrávat...\n"
-
+#define MSGTR_Fatal_error "Závažná chyba"
+#define MSGTR_NoHomeDir "Nemohu nalézt domácí (HOME) adresář"
#define MSGTR_Playing "Přehrávám"
-#define MSGTR_NoSound "Audio: beze zvuku!!!\n"
-#define MSGTR_FPSforced "FPS vynuceno na hodnotu %5.3f (ftime: %5.3f)\n"
-
-// open.c, stream.c:
-#define MSGTR_CdDevNotfound "CD-ROM zařízení '%s' nenalezeno!\n"
-#define MSGTR_ErrTrackSelect "Chyba při výběru VCD stopy!"
-#define MSGTR_ReadSTDIN "Čtu ze stdin...\n"
-#define MSGTR_UnableOpenURL "Nelze otevřít URL: %s\n"
-#define MSGTR_ConnToServer "Připojen k serveru: %s\n"
-#define MSGTR_FileNotFound "Soubor nenalezen: '%s'\n"
-
-#define MSGTR_CantOpenDVD "Nelze otevřít DVD zařízení: %s\n"
-#define MSGTR_DVDwait "Čtu strukturu disku, prosím čekejte...\n"
-#define MSGTR_DVDnumTitles "Na tomto DVD je %d titulů.\n"
-#define MSGTR_DVDinvalidTitle "Neplatné číslo DVD titulu: %d\n"
-#define MSGTR_DVDinvalidChapter "Neplatné číslo kapitoly DVD: %d\n"
-#define MSGTR_DVDnumAngles "Na tomto DVD je %d úhlů pohledu.\n"
-#define MSGTR_DVDinvalidAngle "Neplatné číslo úhlu pohledu DVD: %d\n"
-#define MSGTR_DVDnoIFO "Nemohu otevřít soubor IFO pro DVD titul %d.\n"
-#define MSGTR_DVDnoVOBs "Nemohu otevřít VOB soubor (VTS_%02d_1.VOB).\n"
-#define MSGTR_DVDopenOk "DVD úspěšně otevřeno!\n"
-
-// demuxer.c, demux_*.c:
-#define MSGTR_AudioStreamRedefined "Upozornění! Hlavička audio proudu %d předefinována!\n"
-#define MSGTR_VideoStreamRedefined "Upozornění! Hlavička video proudu %d předefinována!\n"
-#define MSGTR_TooManyAudioInBuffer "\nDEMUXER: Příliš mnoho (%d v %d bajtech) audio paketů v bufferu!\n"
-#define MSGTR_TooManyVideoInBuffer "\nDEMUXER: Příliš mnoho (%d v %d bajtech) video paketů v bufferu!\n"
-#define MSGTR_MaybeNI "(možná přehráváte neprokládaný proud/soubor nebo kodek selhal)\n"
-#define MSGTR_DetectedFILMfile "Detekován FILM formát souboru!\n"
-#define MSGTR_DetectedFLIfile "Detekován FLI formát souboru!\n"
-#define MSGTR_DetectedROQfile "Detekován RoQ formát souboru!\n"
-#define MSGTR_DetectedREALfile "Detekován REAL formát souboru!\n"
-#define MSGTR_DetectedAVIfile "Detekován AVI formát souboru!\n"
-#define MSGTR_DetectedASFfile "Detekován ASF formát souboru!\n"
-#define MSGTR_DetectedMPEGPESfile "Detekován MPEG-PES formát souboru!\n"
-#define MSGTR_DetectedMPEGPSfile "Detekován MPEG-PS formát souboru!\n"
-#define MSGTR_DetectedMPEGESfile "Detekován MPEG-ES formát souboru!\n"
-#define MSGTR_DetectedQTMOVfile "Detekován QuickTime/MOV formát souboru!\n"
-#define MSGTR_MissingMpegVideo "Chybějící MPEG video proud!? Kontaktujte autora, možná to je chyba (bug) :(\n"
-#define MSGTR_InvalidMPEGES "Neplatný MPEG-ES proud!? Kontaktuje autora, možná to je chyba (bug) :(\n"
-#define MSGTR_FormatNotRecognized "========== Bohužel, tento formát souboru není rozpoznán/podporován =========\n"\
- "==== Pokud je tento soubor AVI, ASF nebo MPEG proud, kontaktuje autora! ====\n"
-#define MSGTR_MissingVideoStream "Žádný video proud nenalezen!\n"
-#define MSGTR_MissingAudioStream "Žádný audio proud nenalezen... ->beze zvuku\n"
-#define MSGTR_MissingVideoStreamBug "Chybějící video proud!? Kontaktuje autora, možná to je chyba (bug) :(\n"
-
-#define MSGTR_DoesntContainSelectedStream "demux: soubor neobsahuje vybraný audio nebo video proud\n"
-
-#define MSGTR_NI_Forced "Vynucen"
-#define MSGTR_NI_Detected "Detekován"
-#define MSGTR_NI_Message "%s NEPROKLÁDANÝ formát souboru AVI!\n"
-
-#define MSGTR_UsingNINI "Používám NEPROKLÁDANÝ poškozený formát souboru AVI!\n" //tohle taky nějak opravit
-#define MSGTR_CouldntDetFNo "Nemohu určit počet snímků (pro SOFní posun) \n"
-#define MSGTR_CantSeekRawAVI "Nelze se posouvat v surových (raw) .AVI proudech! (Potřebuji index, zkuste použít volbu -idx !) \n"
-#define MSGTR_CantSeekFile "Nemohu posouvat v tomto souboru! \n"
-
-#define MSGTR_MOVcomprhdr "MOV: Komprimované hlavičky nejsou (ještě) podporovány!\n"
-#define MSGTR_MOVvariableFourCC "MOV: Upozornění! proměnná FOURCC detekována!?\n"
-#define MSGTR_MOVtooManyTrk "MOV: Upozornění! Příliš mnoho stop!"
-#define MSGTR_MOVnotyetsupp "\n****** Quicktime MOV formát není ještě podporován !!! *******\n"
-
-// dec_video.c & dec_audio.c:
-#define MSGTR_CantOpenCodec "nemohu otevřít kodek\n"
-#define MSGTR_CantCloseCodec "nemohu uzavřít kodek\n"
-
-#define MSGTR_MissingDLLcodec "CHYBA: Nemohu otevřít potřebný DirectShow kodek: %s\n"
-#define MSGTR_ACMiniterror "Nemohu načíst/inicializovat Win32/ACM AUDIO kodek (chybějící soubor DLL?)\n"
-#define MSGTR_MissingLAVCcodec "Nemohu najít kodek '%s' v libavcodec...\n"
-
-#define MSGTR_NoDShowSupport "MPlayerXP byl přeložen BEZ podpory directshow!\n"
-#define MSGTR_NoWfvSupport "Podpora pro kodeky win32 neaktivní nebo nedostupná mimo platformy x86!\n"
-#define MSGTR_NoDivx4Support "MPlayerXP byl přeložen BEZ podpory DivX4Linux (libdivxdecore.so)!\n"
-#define MSGTR_NoLAVCsupport "MPlayerXP byl přeložen BEZ podpory lavc/libavcodec!\n"
-#define MSGTR_NoACMSupport "Win32/ACM audio kodek neaktivní nebo nedostupný mimo platformy x86 -> vynuceno beze zvuku :(\n"
-#define MSGTR_NoDShowAudio "Přeloženo BEZ podpory DirectShow -> vynuceno beze zvuku :(\n"
-#define MSGTR_NoOggVorbis "OggVorbis audio kodek neaktivní -> vynuceno beze zvuku :(\n"
-#define MSGTR_NoXAnimSupport "MPlayerXP byl přeložen BEZ podpory XAnim!\n"
-
-#define MSGTR_MpegNoSequHdr "MPEG: FATAL: EOF - konec souboru v průběhu vyhledávání hlavičky sekvence\n"
-#define MSGTR_CannotReadMpegSequHdr "FATAL: Nelze přečíst hlavičku sekvence!\n"
-#define MSGTR_CannotReadMpegSequHdrEx "FATAL: Nelze přečíst rozšíření hlavičky sekvence!\n"
-#define MSGTR_BadMpegSequHdr "MPEG: Špatná hlavička sekvence!\n"
-#define MSGTR_BadMpegSequHdrEx "MPEG: Špatné rozšíření hlavičky sekvence!\n"
-
-#define MSGTR_ShMemAllocFail "Nemohu alokovat sdílenou paměť\n"
-#define MSGTR_OutOfMemory "nedostatek paměti\n"
-#define MSGTR_CantAllocAudioBuf "Nemohu alokovat paměť pro výstupní audio buffer\n"
-#define MSGTR_NoMemForDecodedImage "nedostatek paměti pro buffer pro dekódování obrazu (%ld bytes)\n"
-
-#define MSGTR_AC3notvalid "Neplatný AC3 proud.\n"
-#define MSGTR_AC3only48k "Pouze proudy o frekvenci 48000 Hz podporovány.\n"
-#define MSGTR_UnknownAudio "Neznámý/chybějící audio formát -> beze zvuku\n"
-
-// LIRC:
-#define MSGTR_SettingUpLIRC "Nastavuji podporu lirc ...\n"
-#define MSGTR_LIRCdisabled "Nebudete moci používat dálkový ovladač.\n"
-#define MSGTR_LIRCopenfailed "Selhal pokus o otevření podpory LIRC!\n"
-#define MSGTR_LIRCsocketerr "Nějaká chyba se soketem lirc: %s\n"
-#define MSGTR_LIRCcfgerr "Selhalo čtení konfiguračního souboru LIRC %s !\n"
Modified: mplayerxp/nls/mpxp_help-de.h
===================================================================
--- mplayerxp/nls/mpxp_help-de.h 2012-12-20 08:10:31 UTC (rev 580)
+++ mplayerxp/nls/mpxp_help-de.h 2012-12-20 09:57:50 UTC (rev 581)
@@ -42,138 +42,6 @@
#define MSGTR_Exit_frames "Angeforderte Anzahl an Frames gespielt"
#define MSGTR_Exit_quit "Ende"
#define MSGTR_Exit_eof "Ende der Datei"
-#define MSGTR_Exit_error "Schwerer Fehler"
-#define MSGTR_IntBySignal "\nMPlayerXP wurde durch Signal %d von Modul %s beendet\n"
-#define MSGTR_NoHomeDir "Kann Homeverzeichnis nicht finden\n"
-#define MSGTR_GetpathProblem "get_path(\"config\") Problem\n"
-#define MSGTR_CreatingCfgFile "Erstelle Konfigurationsdatei"
-#define MSGTR_InvalidVOdriver "Ungültiger Videoausgabetreibername"
-#define MSGTR_InvalidAOdriver "Ungültiger Audioausgabetreibername"
-#define MSGTR_CopyCodecsConf "(kopiere/linke etc/codecs.conf nach ~/.mplayerxp/codecs.conf)\n"
-#define MSGTR_CantLoadFont "Kann Schriftdatei nicht laden"
-#define MSGTR_CantLoadSub "Kann Untertitel nicht laden"
-#define MSGTR_ErrorDVDkey "Fehler beim Bearbeiten des DVD-Schlüssels..\n"
-#define MSGTR_CmdlineDVDkey "Der DVD-Schlüssel der Kommandozeile wurde für das Descrambeln gespeichert.\n"
-#define MSGTR_DVDauthOk "DVD Authentifizierungssequenz scheint OK zu sein.\n"
-#define MSGTR_DumpSelectedSteramMissing "dump: FATAL: Ausgewählter Stream fehlt!\n"
-#define MSGTR_CantOpenDumpfile "Kann dump-Datei nicht öffnen!!!\n"
-#define MSGTR_CoreDumped "core dumped :)\n"
-#define MSGTR_FPSnotspecified "FPS ist im Header nicht angegeben (oder ungültig)! Benutze -fps Option!\n"
-#define MSGTR_NoVideoStream "Sorry, kein Videostream... ist nicht abspielbar\n"
-#define MSGTR_TryForceAudioFmt "Erzwinge Audiocodecgruppe"
-#define MSGTR_CantFindAfmtFallback "Kann keinen Audiocodec für gewünschte Gruppe finden, verwende anderen.\n"
-#define MSGTR_CantFindAudioCodec "Kann Codec für Audioformat nicht finden:"
-#define MSGTR_TryUpgradeCodecsConfOrRTFM "*** Versuche %s mit etc/codecs.conf zu erneuern\n*** Sollte es weiterhin nicht gehen, dann lese DOCS/CODECS!\n"
-#define MSGTR_CouldntInitAudioCodec "Kann Audiocodec nicht finden! -> Kein Ton\n"
-#define MSGTR_TryForceVideoFmt "Erzwinge Videocodecgruppe"
-#define MSGTR_CantFindVfmtFallback "Kann keinen Videocodec für gewünschte Gruppe finden, verwende anderen.\n"
-#define MSGTR_CantFindVideoCodec "Kann Videocodec für Format nicht finden:"
-#define MSGTR_VOincompCodec "Sorry, der ausgewählte Videoausgabetreiber ist nicht kompatibel mit diesem Codec.\n"
-#define MSGTR_CouldntInitVideoCodec "FATAL: Kann Videocodec nicht initialisieren :(\n"
-#define MSGTR_EncodeFileExists "Datei existiert: %s (überschreibe nicht deine schönsten AVI's!)\n"
-#define MSGTR_CantCreateEncodeFile "Kann Datei zum Encoden nicht öffnen\n"
-#define MSGTR_CannotInitVO "FATAL: Kann Videoausgabetreiber nicht initialisieren!\n"
-#define MSGTR_CannotInitAO "Kann Audiotreiber/Soundkarte nicht initialisieren -> Kein Ton\n"
-#define MSGTR_StartPlaying "Starte Wiedergabe...\n"
-
+#define MSGTR_Fatal_error "Schwerer Fehler"
+#define MSGTR_NoHomeDir "Kann Homeverzeichnis nicht finden"
#define MSGTR_Playing "Spiele"
-#define MSGTR_NoSound "Audio: kein Ton!!!\n"
-#define MSGTR_FPSforced "FPS fixiert auf %5.3f (ftime: %5.3f)\n"
-
-// open.c, stream.c:
-#define MSGTR_CdDevNotfound "CD-ROM Gerät '%s' nicht gefunden!\n"
-#define MSGTR_ErrTrackSelect "Fehler beim Auswählen des VCD Tracks!"
-#define MSGTR_ReadSTDIN "Lese von stdin...\n"
-#define MSGTR_UnableOpenURL "Kann URL nicht öffnen: %s\n"
-#define MSGTR_ConnToServer "Verbunden mit Server: %s\n"
-#define MSGTR_FileNotFound "Datei nicht gefunden: '%s'\n"
-
-#define MSGTR_CantOpenDVD "Kann DVD Gerät nicht öffnen: %s\n"
-#define MSGTR_DVDwait "Lese Disk-Struktur, bitte warten...\n"
-#define MSGTR_DVDnumTitles "Es sind %d Titel auf dieser DVD.\n"
-#define MSGTR_DVDinvalidTitle "Ungültige DVD Titelnummer: %d\n"
-#define MSGTR_DVDinvalidChapter "Ungültige DVD Kapitelnummer: %d\n"
-#define MSGTR_DVDnumAngles "Es sind %d Sequenzen auf diesem DVD Titel.\n"
-#define MSGTR_DVDinvalidAngle "Ungültige DVD Sequenznummer: %d\n"
-#define MSGTR_DVDnoIFO "Kann die IFO-Datei für den DVD-Titel nicht öffnen %d.\n"
-#define MSGTR_DVDnoVOBs "Kann Titel-VOBS (VTS_%02d_1.VOB) nicht öffnen.\n"
-#define MSGTR_DVDopenOk "DVD erfolgreich geöffnet!\n"
-
-// demuxer.c, demux_*.c:
-#define MSGTR_AudioStreamRedefined "Warnung! Audiostreamheader %d redefiniert!\n"
-#define MSGTR_VideoStreamRedefined "Warnung! Videostreamheader %d redefiniert!\n"
-#define MSGTR_TooManyAudioInBuffer "\nDEMUXER: Zu viele (%d in %d bytes) Audiopakete im Puffer!\n"
-#define MSGTR_TooManyVideoInBuffer "\nDEMUXER: Zu viele (%d in %d bytes) Videopakete im Puffer!\n"
-#define MSGTR_MaybeNI "Vielleicht spielst du einen non-interleaved Stream/Datei oder der Codec funktioniert nicht.\n"
-#define MSGTR_DetectedFILMfile "FILM Dateiformat erkannt!\n"
-#define MSGTR_DetectedFLIfile "FLI Dateiformat erkannt!\n"
-#define MSGTR_DetectedROQfile "RoQ Dateiformat erkannt!\n"
-#define MSGTR_DetectedREALfile "REAL Dateiformat erkannt!\n"
-#define MSGTR_DetectedAVIfile "AVI Dateiformat erkannt!\n"
-#define MSGTR_DetectedASFfile "ASF Dateiformat erkannt!\n"
-#define MSGTR_DetectedMPEGPESfile "MPEG-PES Dateiformat erkannt!\n"
-#define MSGTR_DetectedMPEGPSfile "MPEG-PS Dateiformat erkannt!\n"
-#define MSGTR_DetectedMPEGESfile "MPEG-ES Dateiformat erkannt!\n"
-#define MSGTR_DetectedQTMOVfile "QuickTime/MOV Dateiformat erkannt!\n"
-#define MSGTR_MissingMpegVideo "Vermisse MPEG Videostream!? Kontaktiere den Author, das könnte ein Bug sein :(\n"
-#define MSGTR_InvalidMPEGES "Ungültiger MPEG-ES Stream??? Kontaktiere den Author, das könnte ein Bug sein :(\n"
-#define MSGTR_FormatNotRecognized "=========== Sorry, das Dateiformat/Codec wird nicht unterstützt ==============\n"\
- "============== Sollte dies ein AVI, ASF oder MPEG Stream sein, ===============\n"\
- "================== dann kontaktiere bitte den Author =========================\n"
-#define MSGTR_MissingVideoStream "kann keinen Videostream finden!\n"
-#define MSGTR_MissingAudioStream "kann keinen Audiostream finden... -> kein Ton\n"
-#define MSGTR_MissingVideoStreamBug "Vermisse Videostream!? Kontaktiere den Author, möglicherweise ein Bug :(\n"
-
-#define MSGTR_DoesntContainSelectedStream "Demux: Datei enthält den gewählen Audio- oder Videostream nicht\n"
-
-#define MSGTR_NI_Forced "Erzwungen"
-#define MSGTR_NI_Detected "Erkannt"
-#define MSGTR_NI_Message "%s NON-INTERLEAVED AVI Dateiformat!\n"
-
-#define MSGTR_UsingNINI "Verwende NON-INTERLEAVED defektes AVI Dateiformat!\n"
-#define MSGTR_CouldntDetFNo "Konnte die Anzahl der Frames (für absulute Suche) nicht finden \n"
-#define MSGTR_CantSeekRawAVI "Kann keine RAW .AVI-Streams durchsuchen! (Index erforderlich, versuche es mit der -idx Option!) \n"
-#define MSGTR_CantSeekFile "Kann diese Datei nicht durchsuchen! \n"
-
-#define MSGTR_MOVcomprhdr "MOV: Komprimierte Header werden (zur Zeit) nicht unterstützt!\n"
-#define MSGTR_MOVvariableFourCC "MOV: Warnung! Variable FOURCC erkannt!?\n"
-#define MSGTR_MOVtooManyTrk "MOV: Warnung! Zu viele Tracks!"
-#define MSGTR_MOVnotyetsupp "\n******** Quicktime MOV Format wird zu Zeit nicht unterstützt!!!!!!! *********\n"
-
-// dec_video.c & dec_audio.c:
-#define MSGTR_CantOpenCodec "kann Codec nicht öffnen\n"
-#define MSGTR_CantCloseCodec "kann Codec nicht schließen\n"
-
-#define MSGTR_MissingDLLcodec "FEHLER: Kann erforderlichen DirectShow Codec nicht finden: %s\n"
-#define MSGTR_ACMiniterror "Kann Win32/ACM AUDIO Codec nicht finden (fehlende DLL-Datei?)\n"
-#define MSGTR_MissingLAVCcodec "Kann Codec '%s' von libavcodec nicht finden...\n"
-
-#define MSGTR_NoDShowSupport "MPlayerXP wurde OHNE DirectShow Unterstützung kompiliert!\n"
-#define MSGTR_NoWfvSupport "Unterstützung für Win32 Codecs ausgeschaltet oder nicht verfügbar auf nicht-x86 Plattformen!\n"
-#define MSGTR_NoDivx4Support "MPlayerXP wurde OHNE DivX4Linux (libdivxdecore.so) Unterstützung kompiliert!\n"
-#define MSGTR_NoLAVCsupport "MPlayerXP wurde OHNE lavc/libavcodec Unterstützung kompiliert!\n"
-#define MSGTR_NoACMSupport "Win32/ACM Audiocodecs ausgeschaltet oder nicht verfügbar auf nicht-x86 Plattformen -> erzwinge -nosound :(\n"
-#define MSGTR_NoDShowAudio "MPlayerXP wurde ohne DirectShow Unterstützung kompiliert -> erzwinge -nosound :(\n"
-#define MSGTR_NoOggVorbis "OggVorbis Audiocodec ausgeschaltet -> erzwinge -nosound :(\n"
-
-#define MSGTR_MpegNoSequHdr "MPEG: FATAL: Ende der Datei während der Suche für Sequenzheader\n"
-#define MSGTR_CannotReadMpegSequHdr "FATAL: Kann Sequenzheader nicht lesen!\n"
-#define MSGTR_CannotReadMpegSequHdrEx "FATAL: Kann Sequenzheader-Erweiterung nicht lesen!\n"
-#define MSGTR_BadMpegSequHdr "MPEG: Schlechte Sequenzheader!\n"
-#define MSGTR_BadMpegSequHdrEx "MPEG: Schlechte Sequenzheader-Erweiterung!\n"
-
-#define MSGTR_ShMemAllocFail "Kann keine gemeinsamen Speicher zuweisen\n"
-#define MSGTR_OutOfMemory "Kein Speicher mehr verfügbar!\n"
-#define MSGTR_CantAllocAudioBuf "Kann keinen Audioausgabe-Puffer zuweisen\n"
-#define MSGTR_NoMemForDecodedImage "nicht genug Speicher für den Puffer der dekodierten Bilder (%ld Bytes)\n"
-
-#define MSGTR_AC3notvalid "AC3 Stream ungültig.\n"
-#define MSGTR_AC3only48k "Nur 48000 Hz Streams werden unterstützt.\n"
-#define MSGTR_UnknownAudio "Unbekanntes/fehlendes Audioformat -> kein Ton\n"
-
-// LIRC:
-#define MSGTR_SettingUpLIRC "Initialisiere Lirc Unterstützung...\n"
-#define MSGTR_LIRCdisabled "Verwenden der Fernbedienung nicht möglich\n"
-#define MSGTR_LIRCopenfailed "Fehler beim Öffnen der LIRC Unterstützung!\n"
-#define MSGTR_LIRCsocketerr "Fehler im LIRC Socket: %s\n"
-#define MSGTR_LIRCcfgerr "Kann LIRC Konfigurationsdatei nicht lesen %s !\n"
Modified: mplayerxp/nls/mpxp_help-dk.h
===================================================================
--- mplayerxp/nls/mpxp_help-dk.h 2012-12-20 08:10:31 UTC (rev 580)
+++ mplayerxp/nls/mpxp_help-dk.h 2012-12-20 09:57:50 UTC (rev 581)
@@ -43,138 +43,7 @@
#define MSGTR_Exit_frames "Anmoder om et antal billeder bliver afspillet"
#define MSGTR_Exit_quit "Afslut"
#define MSGTR_Exit_eof "Slutningen af filen"
-#define MSGTR_Exit_error "Fatal fejl"
-#define MSGTR_IntBySignal "\nMPlayerXP afbrudt af signal %d i modul: %s \n"
-#define MSGTR_NoHomeDir "Kan ikke finde hjemmekatalog (HOME)\n"
-#define MSGTR_GetpathProblem "get_path(\"config\") problem\n"
-#define MSGTR_CreatingCfgFile "Genererer konfig fil"
-#define MSGTR_InvalidVOdriver "Ugyldig valg af video driver"
-#define MSGTR_InvalidAOdriver "Ugyldig valg af lyd driver"
-#define MSGTR_CopyCodecsConf "(kopier/linker etc/codecs.conf (fra MPlayerXP kilde (source) katalog) til ~/.mplayerxp/codecs.conf)\n"
-#define MSGTR_CantLoadFont "Kan ikke loade fonten"
-#define MSGTR_CantLoadSub "Kan ikke loade undertekst-filen"
-#define MSGTR_ErrorDVDkey "Fejl under afvikling af DVD NØGLE.\n"
-#define MSGTR_CmdlineDVDkey "DVD kommandolinje nøgle er gemt til dekryptering.\n"
-#define MSGTR_DVDauthOk "DVD auth sekvens synes af være OK.\n"
-#define MSGTR_DumpSelectedSteramMissing "dump: FATAL: kan ikke finde den valge fil eller adresse!\n"
-#define MSGTR_CantOpenDumpfile "Kan ikke åbne dump filen!!!\n"
-#define MSGTR_CoreDumped "kernen dumped :)\n"
-#define MSGTR_FPSnotspecified "FPS ikke specificeret (eller ugyldig) i headeren! Brug -fps !\n"
-#define MSGTR_NoVideoStream "Desværre, filmen kan enten ikke findes eller kan ikke afspilles endnu\n"
-#define MSGTR_TryForceAudioFmt "Prøver at tvinge en lyd codec driver familie"
-#define MSGTR_CantFindAfmtFallback "Kan ikke finde lyd codec for den tvungede driver familie, falder tilbage på en anden driver.\n"
-#define MSGTR_CantFindAudioCodec "Kan ikke finde codec til lyd formatet"
-#define MSGTR_TryUpgradeCodecsConfOrRTFM "*** Prøv at opgradere %s fra etc/codecs.conf\n*** Hvis dette ikke hjælper, så læs filen DOCS/codecs.html!\n"
-#define MSGTR_CouldntInitAudioCodec "Kunne ikke initialisere lyd codec! -> ingen lyd\n"
-#define MSGTR_TryForceVideoFmt "Prøver at tvinge en video codec driver familie"
-#define MSGTR_CantFindVfmtFallback "Kan ikke finde video codec for den tvungede driver familie, falder tilbage på en anden driver.\n"
-#define MSGTR_CantFindVideoCodec "Kan ikke finde video codec til formatet"
-#define MSGTR_VOincompCodec "Desværre, den valgte video driver enhed er ikke kompatibel med dette codec.\n"
-#define MSGTR_CouldntInitVideoCodec "FATAL: Kunne ikke initialisere video codec :(\n"
-#define MSGTR_EncodeFileExists "Filen eksisterer allerede: %s (overskriv ikke din favorit film (AVI)!)\n"
-#define MSGTR_CantCreateEncodeFile "Kan ikke oprette fil til enkodning\n"
-#define MSGTR_CannotInitVO "FATAL: Kan ikke initialisere video driveren!\n"
-#define MSGTR_CannotInitAO "Kunne ikke åbne/initialisere lydkortet -> INGEN LYD\n"
-#define MSGTR_StartPlaying "Starter afspilning ...\n"
-
+#define MSGTR_Fatal_error "Fatal fejl"
+#define MSGTR_NoHomeDir "Kan ikke finde hjemmekatalog (HOME)"
#define MSGTR_Playing "Afspiller"
-#define MSGTR_NoSound "Lyd: ingen lyd!!!\n"
-#define MSGTR_FPSforced "FPS tvunget til %5.3f (ftime: %5.3f)\n"
-// open.c, stream.c:
-#define MSGTR_CdDevNotfound "CD-ROM Drev '%s' ikke fundet!\n"
-#define MSGTR_ErrTrackSelect "Fejl i valg af VCD nummer!"
-#define MSGTR_ReadSTDIN "Læser fra stdin...\n"
-#define MSGTR_UnableOpenURL "Ikke mulig at få kontakt til URL: %s\n"
-#define MSGTR_ConnToServer "Koblet op til serveren: %s\n"
-#define MSGTR_FileNotFound "Filen blev ikke fundet: '%s'\n"
-
-#define MSGTR_CantOpenDVD "Kunne ikke åbne DVD drev: %s\n"
-#define MSGTR_DVDwait "Læser disken struktur, vent venligst...\n"
-#define MSGTR_DVDnumTitles "Der er %d titler på denne DVD.\n"
-#define MSGTR_DVDinvalidTitle "Forkert DVD titel nummer: %d\n"
-#define MSGTR_DVDinvalidChapter "Forkert DVD katalog nummmer: %d\n"
-#define MSGTR_DVDnumAngles "Der er %d vinkler i denne DVD titel.\n"
-#define MSGTR_DVDinvalidAngle "Forkert DVD vinkelnummer: %d\n"
-#define MSGTR_DVDnoIFO "Kan ikke finde IFO filen for DVD titlen %d.\n"
-#define MSGTR_DVDnoVOBs "Kan ikke åbne titlen VOBS (VTS_%02d_1.VOB).\n"
-#define MSGTR_DVDopenOk "DVD korrekt åbnet!\n"
-
-// demuxer.c, demux_*.c:
-#define MSGTR_AudioStreamRedefined "Advarsel! Lyd-filens header %d er blevet omdefineret!\n"
-#define MSGTR_VideoStreamRedefined "Advarsel! Video-filens header %d er blevet omdefineret!\n"
-#define MSGTR_TooManyAudioInBuffer "\nDEMUXER: For mange (%d i %d bytes) lyd pakker i bufferen!\n"
-#define MSGTR_TooManyVideoInBuffer "\nDEMUXER: For mange (%d i %d bytes) video pakker i bufferen!\n"
-#define MSGTR_MaybeNI "(måske afspiller du en 'non-interleaved' stream/fil ellers fejlede codec'et)\n"
-#define MSGTR_DetectedFILMfile "Detecterede FILM fil format!\n"
-#define MSGTR_DetectedFLIfile "Detecterede FLI fil format!\n"
-#define MSGTR_DetectedROQfile "Detecterede RoQ fil format!\n"
-#define MSGTR_DetectedREALfile "Detecterede REAL fil format!\n"
-#define MSGTR_DetectedAVIfile "Detecterede AVI fil format!\n"
-#define MSGTR_DetectedASFfile "Detecterede ASF fil format!\n"
-#define MSGTR_DetectedMPEGPESfile "Detecterede MPEG-PES fil format!\n"
-#define MSGTR_DetectedMPEGPSfile "Detecterede MPEG-PS fil format!\n"
-#define MSGTR_DetectedMPEGESfile "Detecterede MPEG-ES fil format!\n"
-#define MSGTR_DetectedQTMOVfile "Detecterede QuickTime/MOV fil format!\n"
-#define MSGTR_MissingMpegVideo "Manglende MPEG video stream!? Rapporter venligst dette, det kan være en bug :(\n"
-#define MSGTR_InvalidMPEGES "Ugyldig MPEG-ES stream??? Rapporter venligst dette, det kunne være en bug :(\n"
-#define MSGTR_FormatNotRecognized \
-"============= Desværre, dette fil-format er ikke detecteret eller understøttet ===============\n"\
-"=== Hvis denne fil er en AVI, ASF or MPEG stream, så rapporter venligst dette, det kunne være en bug :(===\n"
-#define MSGTR_MissingVideoStream "Ingen video stream fundet!\n"
-#define MSGTR_MissingAudioStream "Ingen lyd stream fundet... ->ingen lyd\n"
-#define MSGTR_MissingVideoStreamBug "Manglende video stream!? Rapporter venligst dette, det kunne være en bug :(\n"
-
-#define MSGTR_DoesntContainSelectedStream "demux: filen indeholder ikke den valgte lyd eller video stream\n"
-
-#define MSGTR_NI_Forced "Tvunget"
-#define MSGTR_NI_Detected "Detecteret"
-#define MSGTR_NI_Message "%s NON-INTERLEAVED AVI fil-format!\n"
-
-#define MSGTR_UsingNINI "Bruger NON-INTERLEAVED ødelagt AVI fil-format!\n"
-#define MSGTR_CouldntDetFNo "Kunne ikke finde antallet af billeder (for en SOF søgning) \n"
-#define MSGTR_CantSeekRawAVI "Kan ikke søge i rå .AVI streams! (manglende index, prøv med -idx!) \n"
-#define MSGTR_CantSeekFile "Kan ikke søge i denne fil! \n"
-
-#define MSGTR_MOVcomprhdr "MOV: Komprimeret header (endnu) ikke supported!\n"
-#define MSGTR_MOVvariableFourCC "MOV: Advarsel! variablen FOURCC detecteret!?\n"
-#define MSGTR_MOVtooManyTrk "MOV: Advarsel! For mange numre!"
-#define MSGTR_MOVnotyetsupp "\n****** Quicktime MOV format endnu ikke supporteret!!!!!!! *******\n"
-
-// dec_video.c & dec_audio.c:
-#define MSGTR_CantOpenCodec "kunne ikke åbne codec\n"
-#define MSGTR_CantCloseCodec "kunne ikke afslutte codec\n"
-
-#define MSGTR_MissingDLLcodec "FEJL: Kunne ikke åbne DirectShow codec: %s\n"
-#define MSGTR_ACMiniterror "Kunne ikke loade/initialisere Win32/ACM LYD codec (manglende DLL fil?)\n"
-#define MSGTR_MissingLAVCcodec "Kunne ikke finde codec '%s' i libavcodec...\n"
-
-#define MSGTR_NoDShowSupport "MPlayerXP blev kompileret uden directshow support!\n"
-#define MSGTR_NoWfvSupport "Support for win32 codecs slået fra, eller er ikke tilråde på ikke-x86 platforme!\n"
-#define MSGTR_NoDivx4Support "MPlayerXP blev kompileret UDEN DivX4Linux (libdivxdecore.so) support!\n"
-#define MSGTR_NoLAVCsupport "MPlayerXP was kompileret UDEN lavc/libavcodec support!\n"
-#define MSGTR_NoACMSupport "Win32/ACM lyd codec slået fra, eller ikke tilråde på ikke-x86 CPU -> ingen lyd tvunget :(\n"
-#define MSGTR_NoDShowAudio "Kompileret uden DirectShow support -> tvunget ingen lyd :(\n"
-#define MSGTR_NoOggVorbis "OggVorbis lyd codec slået fra -> tvunget ingen lyd :(\n"
-#define MSGTR_NoXAnimSupport "MPlayerXP blev kompileret UDEN XAnim support!\n"
-
-#define MSGTR_MpegNoSequHdr "MPEG: FATAL: EOF under søgning efter sekvens header\n"
-#define MSGTR_CannotReadMpegSequHdr "FATAL: Kunne ikke læse sekvens header!\n"
-#define MSGTR_CannotReadMpegSequHdrEx "FATAL: Kunne ikke læse sekvems header extension!\n"
-#define MSGTR_BadMpegSequHdr "MPEG: Ugyldig sekvens header!\n"
-#define MSGTR_BadMpegSequHdrEx "MPEG: Ugyldig sekvens header extension!\n"
-
-#define MSGTR_ShMemAllocFail "Kunne ikke allokere delt ram\n"
-#define MSGTR_CantAllocAudioBuf "Kunne ikke allokere lyd buffer\n"
-#define MSGTR_NoMemForDecodedImage "ikke nok ram til at dekode billed buffer (%ld bytes)\n"
-
-#define MSGTR_AC3notvalid "AC3 stream invalid.\n"
-#define MSGTR_AC3only48k "Kun 48000 Hz streams supporteret.\n"
-#define MSGTR_UnknownAudio "Ukendt/manglende lyd format, slår over til ingen lyd\n"
-
-// LIRC:
-#define MSGTR_SettingUpLIRC "Sætter LIRC support op...\n"
-#define MSGTR_LIRCdisabled "Du vil ikke være i stand til at bruge din fjernbetjening\n"
-#define MSGTR_LIRCopenfailed "Ingen lirc support!\n"
-#define MSGTR_LIRCsocketerr "Der er noget galt med LIRC socket: %s\n"
-#define MSGTR_LIRCcfgerr "Kunne ikke læse LIRC config file %s !\n"
Modified: mplayerxp/nls/mpxp_help-en.h
===================================================================
--- mplayerxp/nls/mpxp_help-en.h 2012-12-20 08:10:31 UTC (rev 580)
+++ mplayerxp/nls/mpxp_help-en.h 2012-12-20 09:57:50 UTC (rev 581)
@@ -78,15 +78,20 @@
#ifndef MSGTR_Exit_eof
#define MSGTR_Exit_eof "End of file"
#endif
-#ifndef MSGTR_Exit_error
-#define MSGTR_Exit_error "Fatal error"
+#ifndef MSGTR_Fatal_error
+#define MSGTR_Fatal_error "Fatal error"
#endif
+#ifndef MSGTR_NoHomeDir
+#define MSGTR_NoHomeDir "Can't find HOME dir"
+#endif
+#ifndef MSGTR_Playing
+#define MSGTR_Playing "Playing"
+#endif
+
+
#ifndef MSGTR_IntBySignal
#define MSGTR_IntBySignal "\nMPlayerXP interrupted by signal %d in module: %s \n"
#endif
-#ifndef MSGTR_NoHomeDir
-#define MSGTR_NoHomeDir "Can't find HOME dir\n"
-#endif
#ifndef MSGTR_GetpathProblem
#define MSGTR_GetpathProblem "get_path(\"config\") problem\n"
#endif
@@ -142,7 +147,7 @@
#define MSGTR_CantFindAudioCodec "Can't find codec for audio format"
#endif
#ifndef MSGTR_TryUpgradeCodecsConfOrRTFM
-#define MSGTR_TryUpgradeCodecsConfOrRTFM "*** Try to upgrade %s from etc/codecs.conf\n*** If it's still not OK, then read DOCS/codecs.html!\n"
+#define MSGTR_TryUpgradeCodecsConfOrRTFM "*** Try to upgrade it from etc/codecs.conf*** If it's still not OK, then read DOCS/codecs.html!"
#endif
#ifndef MSGTR_CouldntInitAudioCodec
#define MSGTR_CouldntInitAudioCodec "Couldn't initialize audio codec! -> nosound\n"
@@ -174,9 +179,6 @@
#ifndef MSGTR_CannotInitAO
#define MSGTR_CannotInitAO "couldn't open/init audio device -> NOSOUND\n"
#endif
-#ifndef MSGTR_StartPlaying
-#define MSGTR_StartPlaying "Start playing...\n"
-#endif
#ifndef MSGTR_CODEC_INITAL_AV_RESYNC
#define MSGTR_CODEC_INITAL_AV_RESYNC "i_bps==0!!! You may have initial A-V resync\nUse '-' and '+' keys to supress that\n"
@@ -213,14 +215,11 @@
#endif
//#define MSGTR_NoGui "MPlayer was compiled WITHOUT GUI support!\n"
//#define MSGTR_GuiNeedsX "MPlayer GUI requires X11!\n"
-#ifndef MSGTR_Playing
-#define MSGTR_Playing "Playing"
-#endif
#ifndef MSGTR_NoSound
#define MSGTR_NoSound "Audio: no sound!!!\n"
#endif
#ifndef MSGTR_FPSforced
-#define MSGTR_FPSforced "FPS forced to be %5.3f (ftime: %5.3f)\n"
+#define MSGTR_FPSforced "FPS forced to be"
#endif
// open.c, stream.c:
@@ -293,13 +292,13 @@
// demuxer.c, demux_*.c:
#ifndef MSGTR_AudioStreamRedefined
-#define MSGTR_AudioStreamRedefined "Warning! Audio stream header %d redefined!\n"
+#define MSGTR_AudioStreamRedefined "Warning! Audio stream header redefined"
#endif
#ifndef MSGTR_VideoStreamRedefined
-#define MSGTR_VideoStreamRedefined "Warning! video stream header %d redefined!\n"
+#define MSGTR_VideoStreamRedefined "Warning! video stream header redefined"
#endif
#ifndef MSGTR_SubStreamRedefined
-#define MSGTR_SubStreamRedefined "Warning! subtitle stream id: %d redefined!\n"
+#define MSGTR_SubStreamRedefined "Warning! subtitle stream header redefined"
#endif
#ifndef MSGTR_TooManyAudioInBuffer
#define MSGTR_TooManyAudioInBuffer "\nDEMUXER: Too many (%d in %d bytes) audio packets in the buffer!\n"
@@ -310,45 +309,8 @@
#ifndef MSGTR_MaybeNI
#define MSGTR_MaybeNI "(maybe you play a non-interleaved stream/file or the codec failed)\n"
#endif
-#ifndef MSGTR_DetectedFILMfile
-#define MSGTR_DetectedFILMfile "Detected FILM file format!\n"
-#endif
-#ifndef MSGTR_DetectedFLIfile
-#define MSGTR_DetectedFLIfile "Detected FLI file format!\n"
-#endif
-#ifndef MSGTR_DetectedROQfile
-#define MSGTR_DetectedROQfile "Detected RoQ file format!\n"
-#endif
-#ifndef MSGTR_DetectedREALfile
-#define MSGTR_DetectedREALfile "Detected REAL file format!\n"
-#endif
-#ifndef MSGTR_DetectedAVIfile
-#define MSGTR_DetectedAVIfile "Detected AVI file format!\n"
-#endif
-#ifndef MSGTR_DetectedASFfile
-#define MSGTR_DetectedASFfile "Detected ASF file format!\n"
-#endif
-#ifndef MSGTR_DetectedMPEGPESfile
-#define MSGTR_DetectedMPEGPESfile "Detected MPEG-PES file format!\n"
-#endif
-#ifndef MSGTR_DetectedMPEGPSfile
-#define MSGTR_DetectedMPEGPSfile "Detected MPEG-PS file format!\n"
-#endif
-#ifndef MSGTR_DetectedMPEGESfile
-#define MSGTR_DetectedMPEGESfile "Detected MPEG-ES file format!\n"
-#endif
-#ifndef MSGTR_DetectedQTMOVfile
-#define MSGTR_DetectedQTMOVfile "Detected QuickTime/MOV file format!\n"
-#endif
-#ifndef MSGTR_MissingMpegVideo
-#define MSGTR_MissingMpegVideo "Missing MPEG video stream!? contact the author, it may be a bug :(\n"
-#endif
-#ifndef MSGTR_InvalidMPEGES
-#define MSGTR_InvalidMPEGES "Invalid MPEG-ES stream??? contact the author, it may be a bug :(\n"
-#endif
#ifndef MSGTR_FormatNotRecognized
-#define MSGTR_FormatNotRecognized "============= Sorry, this file format not recognized/supported ===============\n"\
- "=== If this file is an AVI, ASF or MPEG stream, please contact the author! ===\n"
+#define MSGTR_FormatNotRecognized "============= Sorry, this file format not recognized/supported ==============="
#endif
#ifndef MSGTR_MissingVideoStream
#define MSGTR_MissingVideoStream "No video stream found!\n"
Modified: mplayerxp/nls/mpxp_help-es.h
===================================================================
--- mplayerxp/nls/mpxp_help-es.h 2012-12-20 08:10:31 UTC (rev 580)
+++ mplayerxp/nls/mpxp_help-es.h 2012-12-20 09:57:50 UTC (rev 581)
@@ -44,138 +44,6 @@
#define MSGTR_Exit_frames "Número de cuadros requeridos reproducidos"
#define MSGTR_Exit_quit "Salida"
#define MSGTR_Exit_eof "Fin del archivo"
-#define MSGTR_Exit_error "Error fatal"
-#define MSGTR_IntBySignal "\nMPlayerXP interrumpido por señal %d en el módulo: %s \n"
-#define MSGTR_NoHomeDir "No se puede encontrar el directorio HOME\n"
-#define MSGTR_GetpathProblem "problema en get_path(\"config\")\n"
-#define MSGTR_CreatingCfgFile "Creando archivo de configuración"
-#define MSGTR_InvalidVOdriver "Nombre del driver de salida de video incorrecto"
-#define MSGTR_InvalidAOdriver "Nombre del driver de salida de audio incorrecto"
-#define MSGTR_CopyCodecsConf "(copie/ln etc/codecs.conf (en el árbol del codigo fuente de MPlayerXP) a ~/.mplayerxp/codecs.conf)\n"
-#define MSGTR_CantLoadFont "No se puede cargar la fuente"
-#define MSGTR_CantLoadSub "No se puede cargar el subtítulo"
-#define MSGTR_ErrorDVDkey "Error procesando la clave del DVD.\n"
-#define MSGTR_CmdlineDVDkey "Clave de DVD requerida en la línea de comandos esta almacenada para 'descrambling'.\n"
-#define MSGTR_DVDauthOk "La secuencia de autorización del DVD parece estar bien.\n"
-#define MSGTR_DumpSelectedSteramMissing "dump: FATAL: no se encuentra el stream seleccionado!\n"
-#define MSGTR_CantOpenDumpfile "No se puede abrir el archivo de dump!!!\n"
-#define MSGTR_CoreDumped "core dumped :)\n"
-#define MSGTR_FPSnotspecified "FPS no especificado (o inválido) en la cabecera! Use la opción -fps!\n"
-#define MSGTR_NoVideoStream "Disculpe, no tiene stream de video... no es reproducible todavía\n"
-#define MSGTR_TryForceAudioFmt "Tratando de forzar la familia del codec de audio"
-#define MSGTR_CantFindAfmtFallback "No se encuentra codec de audio para la familia forzada, se usan otros drivers.\n"
-#define MSGTR_CantFindAudioCodec "No se encuentra codec para el formato de audio"
-#define MSGTR_TryUpgradeCodecsConfOrRTFM "*** Intente actualizar %s en etc/codecs.conf\n*** Si todavía no funciona, lea DOCS/codecs.html!\n"
-#define MSGTR_CouldntInitAudioCodec "No se pudo inicializar el codec de audio! -> sin sonido\n"
-#define MSGTR_TryForceVideoFmt "Tratando de forzar la familia del codec de video"
-#define MSGTR_CantFindVfmtFallback "No se encuentra codec de video para la familia forzada, se usan otros drivers.\n"
-#define MSGTR_CantFindVideoCodec "No se encuentra codec para el formato de video"
-#define MSGTR_VOincompCodec "Disculpe, el dispositivo de salida de video es incompatible con este codec.\n"
-#define MSGTR_CouldntInitVideoCodec "FATAL: No se puede inicializar el codec de video :(\n"
-#define MSGTR_EncodeFileExists "El archivo ya existe: %s (no sobrescriba su AVI favorito!)\n"
-#define MSGTR_CantCreateEncodeFile "No se puede crear el archivo para 'encodear'\n"
-#define MSGTR_CannotInitVO "FATAL: No se puede inicializar el driver de video!\n"
-#define MSGTR_CannotInitAO "no se puede abrir/inicializar dispositivo de audio -> SIN SONIDO\n"
-#define MSGTR_StartPlaying "Empezando a reproducir...\n"
-
+#define MSGTR_Fatal_error "Error fatal"
+#define MSGTR_NoHomeDir "No se puede encontrar el directorio HOME"
#define MSGTR_Playing "Reproduciendo"
-#define MSGTR_NoSound "Audio: sin sonido!!!\n"
-#define MSGTR_FPSforced "FPS forzado en %5.3f (ftime: %5.3f)\n"
-
-// open.c, stream.c:
-#define MSGTR_CdDevNotfound "Dispositivo de CD-ROM '%s' no encontrado!\n"
-#define MSGTR_ErrTrackSelect "Error seleccionando la pista de VCD!"
-#define MSGTR_ReadSTDIN "Leyendo desde la entrada estándar (stdin)...\n"
-#define MSGTR_UnableOpenURL "No es posible abrir URL: %s\n"
-#define MSGTR_ConnToServer "Connectado al servidor: %s\n"
-#define MSGTR_FileNotFound "Archivo no encontrado: '%s'\n"
-
-#define MSGTR_CantOpenDVD "No se puede abrir el dispositivo de DVD: %s\n"
-#define MSGTR_DVDwait "Leyendo la estructura del disco, espere por favor...\n"
-#define MSGTR_DVDnumTitles "Hay %d títulos en este DVD.\n"
-#define MSGTR_DVDinvalidTitle "Número de título de DVD inválido: %d\n"
-#define MSGTR_DVDinvalidChapter "Número de capítulo de DVD inválido: %d\n"
-#define MSGTR_DVDnumAngles "Hay %d ángulos en este título de DVD.\n"
-#define MSGTR_DVDinvalidAngle "Número de ángulo de DVD inválido: %d\n"
-#define MSGTR_DVDnoIFO "No se puede abrir archivo IFO para el título de DVD %d.\n"
-#define MSGTR_DVDnoVOBs "No se puede abrir VOBS del título (VTS_%02d_1.VOB).\n"
-#define MSGTR_DVDopenOk "DVD abierto existosamente!\n"
-
-// demuxer.c, demux_*.c:
-#define MSGTR_AudioStreamRedefined "Advertencia! Cabecera de stream de audio %d redefinida!\n"
-#define MSGTR_VideoStreamRedefined "Advertencia! Cabecera de stream de video %d redefinida!\n"
-#define MSGTR_TooManyAudioInBuffer "\nDEMUXER: Demasiados (%d en %d bytes) paquetes de audio en el buffer!\n"
-#define MSGTR_TooManyVideoInBuffer "\nDEMUXER: Demasiados (%d en %d bytes) paquetes de video en el buffer!\n"
-#define MSGTR_MaybeNI "(tal vez está reproduciendo un stream/archivo 'non-interleaved' o falló el codec)\n"
-#define MSGTR_DetectedFILMfile "Detectado formato de archivo FILM!\n"
-#define MSGTR_DetectedFLIfile "Detectado formato de archivo FLI!\n"
-#define MSGTR_DetectedROQfile "Detectado formato de archivo RoQ!\n"
-#define MSGTR_DetectedREALfile "Detectado formato de archivo REAL!\n"
-#define MSGTR_DetectedAVIfile "Detectado formato de archivo AVI!\n"
-#define MSGTR_DetectedASFfile "Detectado formato de archivo ASF!\n"
-#define MSGTR_DetectedMPEGPESfile "Detectado formato de archivo MPEG-PES!\n"
-#define MSGTR_DetectedMPEGPSfile "Detectado formato de archivo MPEG-PS!\n"
-#define MSGTR_DetectedMPEGESfile "Detectado formato de archivo MPEG-ES!\n"
-#define MSGTR_DetectedQTMOVfile "Detectado formato de archivo QuickTime/MOV!\n"
-#define MSGTR_MissingMpegVideo "Stream de video MPEG no encontrado!? contacte al autor, puede ser un bug :(\n"
-#define MSGTR_InvalidMPEGES "Stream MPEG-ES inválido??? contacte al autor, puede ser un bug :(\n"
-#define MSGTR_FormatNotRecognized "============ Disculpe, este formato no está soporta...
[truncated message content] |
