1.1 --- a/mplayer.c	Sat Dec 29 14:47:49 2007 +0100
     1.2 +++ b/mplayer.c	Sat Dec 29 14:49:09 2007 +0100
     1.3 @@ -76,6 +76,8 @@
     1.4  const char *sourcesSub=0;
     1.5  cFileSources MPlaySources;
     1.6  
     1.7 +static const char *plugin_name=0;
     1.8 +
     1.9  // --- cMenuSetupMPlayer --------------------------------------------------------
    1.10  
    1.11  class cMenuSetupMPlayer : public cMenuSetupPage {
    1.12 @@ -416,7 +418,7 @@
    1.13  void cMPlayerControl::JumpDisplay(void)
    1.14  {
    1.15    char buf[64];
    1.16 -  const char *j=tr("Jump: "), u=jumpmode?'%':'m';
    1.17 +  const char *j=trVDR("Jump: "), u=jumpmode?'%':'m';
    1.18    if(!jumpval) sprintf(buf,"%s- %c",  j,u);
    1.19    else         sprintf(buf,"%s%d- %c",j,jumpval,u);
    1.20  #if APIVERSNUM >= 10307
    1.21 @@ -539,7 +541,7 @@
    1.22        case kBack:
    1.23  #if APIVERSNUM >= 10332
    1.24                       Hide();
    1.25 -                     cRemote::CallPlugin(i18n_name);
    1.26 +                     cRemote::CallPlugin(plugin_name);
    1.27                       return osBack;
    1.28  #endif
    1.29        case kStop:
    1.30 @@ -629,7 +631,7 @@
    1.31  {
    1.32    static char blue[12];
    1.33    snprintf(blue,sizeof(blue),MPlayerAid>=0 ? "AID:%d" : "AID:def",MPlayerAid);
    1.34 -  SetHelp(tr(BUTTON"Play"), MPlayerSetup.ResumeMode ? tr(BUTTON"Rewind"):0, tr("Source"), blue);
    1.35 +  SetHelp(trVDR(BUTTON"Play"), MPlayerSetup.ResumeMode ? trVDR(BUTTON"Rewind"):0, tr("Source"), blue);
    1.36    Display();
    1.37  }
    1.38  
    1.39 @@ -727,7 +729,7 @@
    1.40  // --- cPluginMPlayer ----------------------------------------------------------
    1.41  
    1.42  static const char *VERSION        = PLUGIN_VERSION;
    1.43 -static const char *DESCRIPTION    = "Media replay via MPlayer";
    1.44 +static const char *DESCRIPTION    = trNOOP("Media replay via MPlayer");
    1.45  static const char *MAINMENUENTRY  = "MPlayer";
    1.46  
    1.47  class cPluginMPlayer : public cPlugin {
    1.48 @@ -824,14 +826,21 @@
    1.49  #endif
    1.50  {
    1.51    if(!CheckVDRVersion(1,1,16,"mplayer")) return false;
    1.52 -  i18n_name=Name();
    1.53 +  plugin_name="mplayer";
    1.54 +#if APIVERSNUM < 10507
    1.55 +  i18n_name="mplayer";
    1.56 +#else
    1.57 +  i18n_name="vdr-mplayer";
    1.58 +#endif
    1.59    MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayersources.conf"));
    1.60    if(MPlaySources.Count()<1) {
    1.61      esyslog("ERROR: you must have defined at least one source in mplayersources.conf");
    1.62      fprintf(stderr,"No source(s) defined in mplayersources.conf\n");
    1.63      return false;
    1.64      }
    1.65 +#if APIVERSNUM < 10507
    1.66    RegisterI18n(Phrases);
    1.67 +#endif
    1.68    if(!(status=new cMPlayerStatus)) return false;
    1.69    return true;
    1.70  }