Updated HISTORY.

HISTORY

@@ -459,3 +459,8 @@ VDR Plugin 'femon' Revision History
 - Updated for vdr-1.7.37.
 - Modified how the receiver is detached.
 - Added Ukrainian translation (Thanks to Yarema aka Knedlyk).
+
+2013-03-10: Version 1.7.19
+
+- Updated for vdr-1.7.40.
+- Updated French translation (Thanks to Bernard Jaulin).

Makefile

@@ -145,4 +145,4 @@ clean:
 
 .PHONY: cppcheck
 cppcheck:
-	@cppcheck --enable=all -v -f $(OBJS:%.o=%.c)
+	@cppcheck --language=c++ --enable=all -v -f $(OBJS:%.o=%.c)

femon.c

@@ -14,15 +14,15 @@
 #include "femonservice.h"
 #include "femontools.h"
 
-#if defined(APIVERSNUM) && APIVERSNUM < 10737
-#error "VDR-1.7.37 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 10740
+#error "VDR-1.7.40 API version or greater is required!"
 #endif
 
 #ifndef GITVERSION
 #define GITVERSION ""
 #endif
 
-static const char VERSION[]       = "1.7.18" GITVERSION;
+static const char VERSION[]       = "1.7.19" GITVERSION;
 static const char DESCRIPTION[]   = trNOOP("DVB Signal Information Monitor (OSD)");
 static const char MAINMENUENTRY[] = trNOOP("Signal Information");
 
@@ -136,7 +136,7 @@ bool cPluginFemon::Service(const char *Id, void *Data)
 {
   if (strcmp(Id,"FemonService-v1.0") == 0) {
      if (Data) {
-        FemonService_v1_0 *data = (FemonService_v1_0*)Data;
+        FemonService_v1_0 *data = reinterpret_cast<FemonService_v1_0*>(Data);
         if (!cDevice::ActualDevice())
            return false;
         cDvbDevice *dev = getDvbDevice(cDevice::ActualDevice());

femonosd.c

@@ -434,8 +434,9 @@ void cFemonOsd::DrawInfoWindow(void)
                    OSDDRAWINFORIGHT(trVDR("CoderateH"),    *getCoderate(dtp.CoderateH()));
                    offset += OSDROWHEIGHT;
                    OSDDRAWINFOLEFT( trVDR("System"),       *getSatelliteSystem(dtp.System()));
-                   if (dtp.System())
-                   OSDDRAWINFORIGHT(trVDR("RollOff"),      *getRollOff(dtp.RollOff()));
+                   if (dtp.System()) {
+                      OSDDRAWINFORIGHT(trVDR("RollOff"),   *getRollOff(dtp.RollOff()));
+                      }
                    }
                    break;
 
@@ -471,8 +472,9 @@ void cFemonOsd::DrawInfoWindow(void)
                    OSDDRAWINFORIGHT(trVDR("Guard"),        *getGuard(dtp.Guard()));
                    offset += OSDROWHEIGHT;
                    OSDDRAWINFOLEFT( trVDR("System"),       *getTerrestrialSystem(dtp.System()));
-                   if (dtp.System())
-                   OSDDRAWINFORIGHT(trVDR("PlpId"),        *cString::sprintf("%d", dtp.PlpId()));
+                   if (dtp.System()) {
+                      OSDDRAWINFORIGHT(trVDR("StreamId"),  *cString::sprintf("%d", dtp.StreamId()));
+                      }
                    }
                    break;
 

po/de_DE.po

@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.18\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2010-10-10 10:10+0300\n"
 "PO-Revision-Date: 2010-10-10 10:10+0300\n"

po/es_ES.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.18\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2010-10-10 10:10+0300\n"
 "PO-Revision-Date: 2010-10-10 10:10+0300\n"

po/et_EE.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.18\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2010-10-10 10:10+0300\n"
 "PO-Revision-Date: 2010-10-10 10:10+0300\n"

po/fi_FI.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.18\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2010-10-10 10:10+0300\n"
 "PO-Revision-Date: 2010-10-10 10:10+0300\n"
@@ -170,7 +170,7 @@ msgid "Nid"
 msgstr "Verkko-ID"
 
 msgid "Tid"
-msgstr "Lähete-ID"
+msgstr "TS-ID"
 
 msgid "Rid"
 msgstr "Radio-ID"
@@ -387,9 +387,3 @@ msgstr "Mbit/s"
 
 msgid "kbit/s"
 msgstr "kbit/s"
-
-#~ msgid "Information"
-#~ msgstr "Tiedot"
-
-#~ msgid "Statistics"
-#~ msgstr "Tilastot"

po/fr_FR.po

@@ -2,25 +2,27 @@
 # Copyright (C) 2007 Rolf Ahrenberg
 # This file is distributed under the same license as the femon package.
 # Nicolas Huillard
+# Michaël Nival <mnival@club-internet.fr>, 2010
+# Bernard Jaulin <bernard.jaulin@gmail.com>, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.18\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2010-10-10 10:10+0300\n"
 "PO-Revision-Date: 2010-10-10 10:10+0300\n"
-"Last-Translator: NIVAL Micha<68>l <mnival@club-internet.fr>\n"
+"Last-Translator: Bernard Jaulin <bernard.jaulin@gmail.com>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "DVB Signal Information Monitor (OSD)"
 msgstr "Affiche les informations du signal DVB"
 
 msgid "Signal Information"
-msgstr "Signal DVB"
+msgstr "Infos sur le signal"
 
 msgid "Femon not available"
 msgstr "Femon n'est pas disponible"
@@ -71,91 +73,91 @@ msgid "Hide main menu entry"
 msgstr "Masquer dans le menu principal"
 
 msgid "Define whether the main menu entry is hidden."
-msgstr "D<EFBFBD>finit si l'entr<EFBFBD>e doit <EFBFBD>tre masqu<EFBFBD>e dans le menu principal."
+msgstr "Définit si l'entrée doit être masquée dans le menu principal."
 
 msgid "Default display mode"
-msgstr "Affichage par d<EFBFBD>faut"
+msgstr "Affichage par défaut"
 
 msgid "Define the default display mode at startup."
-msgstr "D<EFBFBD>finit l'affichage par d<EFBFBD>faut au d<EFBFBD>marrage."
+msgstr "Définit l'affichage par défaut au démarrage."
 
 msgid "Define the used OSD skin."
-msgstr "D<EFBFBD>finit le skin OSD <EFBFBD> utiliser."
+msgstr "Définit le skin OSD à utiliser."
 
 msgid "Define the used OSD theme."
-msgstr "D<EFBFBD>finit le th<EFBFBD>me OSD <EFBFBD> utiliser."
+msgstr "Définit le thème OSD à utiliser."
 
 msgid "Position"
 msgstr "Position"
 
 msgid "Define the position of OSD."
-msgstr "D<EFBFBD>finit la position de l'OSD."
+msgstr "Définit la position de l'OSD."
 
 msgid "Downscale OSD size [%]"
-msgstr ""
+msgstr "Réduit la taille de l'OSD (%)"
 
 msgid "Define the downscale ratio for OSD size."
-msgstr ""
+msgstr "Définit le ration de réduction de l'OSD."
 
 msgid "Red limit [%]"
 msgstr "Limite du rouge (%)"
 
 msgid "Define a limit for red bar, which is used to indicate a bad signal."
-msgstr "D<EFBFBD>finit la limite de la barre rouge, qui est utilis<EFBFBD> pour indiquer un mauvais signal."
+msgstr "Définit la limite de la barre rouge, qui est utilisé pour indiquer un mauvais signal."
 
 msgid "Green limit [%]"
 msgstr "Limite du vert (%)"
 
 msgid "Define a limit for green bar, which is used to indicate a good signal."
-msgstr "D<EFBFBD>finit la limite de la barre rouge, qui est utilis<EFBFBD> pour indiquer un bon signal."
+msgstr "Définit la limite de la barre rouge, qui est utilisé pour indiquer un bon signal."
 
 msgid "OSD update interval [0.1s]"
-msgstr "Intervalle de mise <EFBFBD> jour (0,1s)"
+msgstr "Intervalle de mise à jour (0,1s)"
 
 msgid "Define an interval for OSD updates. The smaller interval generates higher CPU load."
-msgstr "D<EFBFBD>finit l'intervalle de mise <EFBFBD> jour de l'OSD. Un petit intervalle g<EFBFBD>n<EFBFBD>re une charge CPU plus importante."
+msgstr "Définit l'intervalle de mise à jour de l'OSD. Un petit intervalle génère une charge CPU plus importante."
 
 msgid "Analyze stream"
 msgstr "Analyser le flux"
 
 msgid "Define whether the DVB stream is analyzed and bitrates calculated."
-msgstr "D<EFBFBD>finit si le flux DVB est analys<EFBFBD> et le bitrates calcul<EFBFBD>."
+msgstr "Définit si le flux DVB est analysé et le taux d'échantillonnage fixe calculé."
 
 msgid "Calculation interval [0.1s]"
 msgstr "Intervalle de calcul (0,1s)"
 
 msgid "Define an interval for calculation. The bigger interval generates more stable values."
-msgstr "D<EFBFBD>finit l'intervalle de cacul. Un plus grand intervalle g<EFBFBD>n<EFBFBD>re une valeur plus stable."
+msgstr "Définit l'intervalle de cacul. Un plus grand intervalle génère une valeur plus stable."
 
 msgid "Use SVDRP service"
 msgstr "Utiliser le service SVDRP"
 
 msgid "Define whether the SVDRP service is used in client/server setups."
-msgstr "D<EFBFBD>finit si le service SVDRP est utilis<EFBFBD> en configuration client/serveur."
+msgstr "Définit si le service SVDRP est utilisé dans la configuration client/serveur."
 
 msgid "SVDRP service port"
 msgstr "Port du service SVDRP"
 
 msgid "Define the port number of SVDRP service."
-msgstr "D<EFBFBD>finit le port d'<EFBFBD>coute du service SVDRP."
+msgstr "Définit le port d'écoute du service SVDRP."
 
 msgid "SVDRP service IP"
 msgstr "IP du service SVDRP"
 
 msgid "Define the IP address of SVDRP service."
-msgstr "D<EFBFBD>finit l'adresse IP du service SVDRP."
+msgstr "Définit l'adresse IP du service SVDRP."
 
 msgid "Help"
 msgstr "Aide"
 
 msgid "Video"
-msgstr "Vid<EFBFBD>o"
+msgstr "Vidéo"
 
 msgid "Audio"
 msgstr "Audio"
 
 msgid "Transponder Information"
-msgstr "Information transpondeur"
+msgstr "Information du transpondeur"
 
 msgid "Apid"
 msgstr "Apid"
@@ -179,40 +181,40 @@ msgid "Coderate"
 msgstr "Coderate"
 
 msgid "Protocol"
-msgstr ""
+msgstr "Protocole"
 
 msgid "Bitrate"
-msgstr "Bitrate"
+msgstr "Taux d'échantillonnage fixe"
 
 msgid "Stream Information"
-msgstr "Information flux"
+msgstr "Information du flux"
 
 msgid "Video Stream"
-msgstr "Flux vid<EFBFBD>o"
+msgstr "Flux vidéo"
 
 msgid "Codec"
-msgstr ""
+msgstr "Codec"
 
 msgid "Aspect Ratio"
-msgstr "Proportions d'image"
+msgstr "Format de l'image"
 
 msgid "Frame Rate"
-msgstr "Rafra<EFBFBD>chissement"
+msgstr "Rafraîchissement"
 
 msgid "Video Format"
-msgstr "Standard vid<EFBFBD>o"
+msgstr "Standard vidéo"
 
 msgid "Resolution"
-msgstr "R<EFBFBD>solution"
+msgstr "Résolution"
 
 msgid "Audio Stream"
 msgstr "Flux audio"
 
 msgid "Channel Mode"
-msgstr ""
+msgstr "Mode chaîne"
 
 msgid "Sampling Frequency"
-msgstr "Fr<EFBFBD>quence d'<EFBFBD>chantillonage"
+msgstr "Fréquence d'échantillonage"
 
 msgid "AC-3 Stream"
 msgstr "Flux AC-3"
@@ -245,64 +247,64 @@ msgid "Analog"
 msgstr "Analogique"
 
 msgid "MPEG-2"
-msgstr ""
+msgstr "MPEG-2"
 
 msgid "H.264"
-msgstr ""
+msgstr "H.264"
 
 msgid "MPEG-1 Layer I"
-msgstr ""
+msgstr "MPEG-1 Layer I"
 
 msgid "MPEG-1 Layer II"
-msgstr ""
+msgstr "MPEG-1 Layer II"
 
 msgid "MPEG-1 Layer III"
-msgstr ""
+msgstr "MPEG-1 Layer III"
 
 msgid "MPEG-2 Layer I"
-msgstr ""
+msgstr "MPEG-2 Layer I"
 
 msgid "MPEG-2 Layer II"
-msgstr ""
+msgstr "MPEG-2 Layer II"
 
 msgid "MPEG-2 Layer III"
-msgstr ""
+msgstr "MPEG-2 Layer III"
 
 msgid "HE-AAC"
-msgstr ""
+msgstr "HE-AAC"
 
 msgid "LATM"
-msgstr ""
+msgstr "LATM"
 
 msgid "stereo"
-msgstr ""
+msgstr "stéréo"
 
 msgid "joint Stereo"
-msgstr ""
+msgstr "joint Stereo"
 
 msgid "dual"
-msgstr ""
+msgstr "double"
 
 msgid "mono"
-msgstr ""
+msgstr "mono"
 
 msgid "interlaced"
-msgstr ""
+msgstr "entrelacé"
 
 msgid "progressive"
-msgstr ""
+msgstr "progressif"
 
 msgid "reserved"
-msgstr "r<EFBFBD>serv<EFBFBD>"
+msgstr "réservé"
 
 msgid "extended"
-msgstr ""
+msgstr "étendu"
 
 msgid "unknown"
 msgstr "inconnu"
 
 msgid "component"
-msgstr ""
+msgstr "composant"
 
 msgid "PAL"
 msgstr "PAL"
@@ -311,10 +313,10 @@ msgid "NTSC"
 msgstr "NTSC"
 
 msgid "SECAM"
-msgstr ""
+msgstr "SECAM"
 
 msgid "MAC"
-msgstr ""
+msgstr "MAC"
 
 msgid "Hz"
 msgstr "Hz"
@@ -374,7 +376,7 @@ msgid "dB"
 msgstr "dB"
 
 msgid "not indicated"
-msgstr "non indiqu<EFBFBD>"
+msgstr "non indiqué"
 
 msgid "MHz"
 msgstr "MHz"

po/hu_HU.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.18\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2010-10-10 10:10+0300\n"
 "PO-Revision-Date: 2010-10-10 10:10+0200\n"

po/it_IT.po

@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.18\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2010-10-10 10:10+0300\n"
 "PO-Revision-Date: 2010-10-10 10:10+0300\n"

po/lt_LT.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.18\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2010-10-10 10:10+0300\n"
 "PO-Revision-Date: 2010-10-10 10:10+0300\n"

po/ru_RU.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.18\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2010-10-10 10:10+0300\n"
 "PO-Revision-Date: 2010-10-10 10:10+0300\n"

po/uk_UA.po

@@ -4,7 +4,7 @@
 # Yarema aka Knedlyk <yupadmin@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.18\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2010-10-10 10:10+0300\n"
 "PO-Revision-Date: 2010-10-10 10:10+0300\n"

po/zh_CN.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.18\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2010-10-10 10:10+0300\n"
 "PO-Revision-Date: 2010-10-10 10:10+0300\n"

po/zh_TW.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-femon 1.7.18\n"
+"Project-Id-Version: vdr-femon 1.7.19\n"
 "Report-Msgid-Bugs-To: <see README>\n"
 "POT-Creation-Date: 2010-10-10 10:10+0300\n"
 "PO-Revision-Date: 2010-10-10 10:10+0300\n"