use new, more secure msprintf instead of asprintf. Do

not use cString::sprintf from core vdr because it does
not work nicely together with STL which we use heavily

add more translation strings and their german and
french translations



git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@1033 e10066b5-e1e2-0310-b819-94efdf66514b

16 files changed, 213 insertions, 65 deletions

diff --git a/mg_db.c b/mg_db.c
index 9d98612..b2df71f 100644
--- a/mg_db.c
+++ b/mg_db.c
@@ -194,7 +194,7 @@ mgSQLStringImp::quoted() const
 {
 	if (!m_quoted)
 	{
-		asprintf(&m_quoted,"'%s'",unquoted());
+		msprintf(&m_quoted,"'%s'",unquoted());
 	}
 	return m_quoted;
 }
@@ -388,7 +388,7 @@ mgDb::Sync(char * const * path_argv)
 			if (!item->Valid(true))
 			{
 				char *b;
-				asprintf(&b,"DELETE FROM tracks WHERE id=%ld",item->getItemid());
+				msprintf(&b,"DELETE FROM tracks WHERE id=%ld",item->getItemid());
 				count += Execute(b);
 				free(b);
 			}
@@ -1056,7 +1056,7 @@ mgDb::getAlbum(const char *filename,const mgSQLString& c_album,
 		const mgSQLString& c_artist)
 {
 	char *b;
-	asprintf(&b,"SELECT cddbid FROM album"
+	msprintf(&b,"SELECT cddbid FROM album"
 			" WHERE title=%s AND artist=%s",c_album.quoted(),c_artist.quoted());
 	mgSQLString result(get_col0(b));
 	free(b);
@@ -1071,13 +1071,13 @@ mgDb::getAlbum(const char *filename,const mgSQLString& c_album,
 		mgSQLString c_directory(directory);
 		free(directory);
 		char *where;
-		asprintf(&where,"WHERE tracks.sourceid=album.cddbid "
+		msprintf(&where,"WHERE tracks.sourceid=album.cddbid "
 			"AND %s=%s "
 			"AND album.title=%s",
 			Directory().c_str(),c_directory.quoted(),
 			c_album.quoted());
 		// how many artists will the album have after adding this one?
-		asprintf(&b,"SELECT distinct album.artist FROM album, tracks %s ",where);
+		msprintf(&b,"SELECT distinct album.artist FROM album, tracks %s ",where);
 		mgQuery q(DbHandle(),b);
 		free(b);
 		long new_album_artists = q.Rows();
@@ -1093,10 +1093,10 @@ mgDb::getAlbum(const char *filename,const mgSQLString& c_album,
 		if (new_album_artists>1 && strcmp(buf.original(),"Various Artists"))
 			// is the album multi artist and not yet marked as such?
 		{
-			asprintf(&b,"SELECT album.cddbid FROM album, tracks %s",where);
+			msprintf(&b,"SELECT album.cddbid FROM album, tracks %s",where);
 			result=mgSQLString(get_col0(b));
 			free(b);
-			asprintf(&b,"UPDATE album SET artist='Various Artists' WHERE cddbid=%s",result.quoted());
+			msprintf(&b,"UPDATE album SET artist='Various Artists' WHERE cddbid=%s",result.quoted());
 			Execute(b);
 			free(b);
 			// here we could change all tracks.sourceid to result and delete
@@ -1108,7 +1108,7 @@ mgDb::getAlbum(const char *filename,const mgSQLString& c_album,
 		{				// no usable album found
 			result=Build_cddbid(c_artist);
 			char *b;
-			asprintf(&b,"INSERT INTO album (title,artist,cddbid) "
+			msprintf(&b,"INSERT INTO album (title,artist,cddbid) "
 					"VALUES(%s,%s,%s)",
 				c_album.quoted(),c_artist.quoted(),result.quoted());
 			int rows = Execute(b);
@@ -1169,7 +1169,7 @@ mgDb::DefineGenre(const string genre)
 		if (c!='a')
 			sprintf(strchr(g,0)," %c",c);
 		char *b;
-		asprintf(&b,"INSERT INTO genre (id,genre) VALUES('z%c','%s')",c,g);
+		msprintf(&b,"INSERT INTO genre (id,genre) VALUES('z%c','%s')",c,g);
 		Execute(b);
 		free(b);
 	}
@@ -1196,7 +1196,7 @@ mgDb::DefineGenre(const string genre)
     }
     char *b;
     mgSQLString c_genre(genre);
-    asprintf(&b,"INSERT INTO genre (id,genre) VALUES('%s',%s)",newid,c_genre.quoted());
+    msprintf(&b,"INSERT INTO genre (id,genre) VALUES('%s',%s)",newid,c_genre.quoted());
     Execute(b);
     free(b);
     m_Genres[genre]=newid;
diff --git a/mg_db_gd_mysql.c b/mg_db_gd_mysql.c
index d34a958..a2d43f8 100644
--- a/mg_db_gd_mysql.c
+++ b/mg_db_gd_mysql.c
@@ -198,7 +198,7 @@ mgDbServerMySQL::mgDbServerMySQL()
 					the_setup.DbDatadir,errno);
 			abort();
 		}
-		asprintf(&mysql_embedded_args[1],"--datadir=%s",the_setup.DbDatadir);
+		msprintf(&mysql_embedded_args[1],"--datadir=%s",the_setup.DbDatadir);
 		mgDebug(1,"calling mysql_server_init for embedded in %s",the_setup.DbDatadir);
 	}
 	else
@@ -657,7 +657,7 @@ bool
 mgDbGd::FieldExists(string table, string field)
 {
     	char *b;
-    	asprintf(&b,"DESCRIBE %s %s",table.c_str(),field.c_str());
+    	msprintf(&b,"DESCRIBE %s %s",table.c_str(),field.c_str());
     	mgQuery q(m_db,b);
     	free(b);
     	if (q.Next())
diff --git a/mg_db_gd_pg.c b/mg_db_gd_pg.c
index fda72f2..ea63816 100644
--- a/mg_db_gd_pg.c
+++ b/mg_db_gd_pg.c
@@ -346,7 +346,7 @@ bool
 mgDbGd::FieldExists(string table, string field)
 {
     	char *b;
-        asprintf(&b,"SELECT COUNT(*) FROM information_schema.columns WHERE table_name='%s' AND column_name='%s'",
+        msprintf(&b,"SELECT COUNT(*) FROM information_schema.columns WHERE table_name='%s' AND column_name='%s'",
 		table.c_str(),field.c_str());
     	bool result = exec_count(b)==1;
 	free(b);
diff --git a/mg_db_gd_sqlite.c b/mg_db_gd_sqlite.c
index 09b986d..12b69e6 100644
--- a/mg_db_gd_sqlite.c
+++ b/mg_db_gd_sqlite.c
@@ -276,7 +276,7 @@ mgDecade(sqlite3_context *context, int argc, sqlite3_value **argv)
 	assert(argc==1);
 	unsigned int year=sqlite3_value_int(argv[0]);
 	char *buf;
-	asprintf(&buf,"%02d",(year-year%10)%100);
+	msprintf(&buf,"%02d",(year-year%10)%100);
 	sqlite3_result_text(context,buf,2,free);
 }
 
@@ -353,7 +353,7 @@ bool
 mgDbGd::FieldExists(string table, string field)
 {
     	char *b;
-    	asprintf(&b,"SELECT %s FROM %s LIMIT 1",field.c_str(),table.c_str());
+    	msprintf(&b,"SELECT %s FROM %s LIMIT 1",field.c_str(),table.c_str());
 	mgQuery q(m_db,b,mgQuerySilent);
     	free(b);
 	return q.ErrorMessage().empty();
diff --git a/mg_image_provider.c b/mg_image_provider.c
index aeab5ec..801c504 100644
--- a/mg_image_provider.c
+++ b/mg_image_provider.c
@@ -362,7 +362,7 @@ void mgImageProvider::Action()
 
 
 	  char *tmp;
-	  asprintf( &tmp, "muggle-image-convert \"%s\" \"%s\"", filename.c_str(), tmpFile.c_str() );
+	  msprintf( &tmp, "muggle-image-convert \"%s\" \"%s\"", filename.c_str(), tmpFile.c_str() );
 	  system( (const char*) tmp );
 	  free(tmp);
 	 
@@ -406,7 +406,7 @@ void mgImageProvider::writeImage( TagLib::ByteVector &image, int num, string &im
   
   // save image_data to temporary file  
   char *buf;
-  asprintf( &buf, "%s/image-%d.jpg", image_cache.c_str(), num );
+  msprintf( &buf, "%s/image-%d.jpg", image_cache.c_str(), num );
 
   FILE *f = fopen( buf, "w+" );
   fwrite( image_data, sizeof(char), len, f );
diff --git a/mg_item_gd.c b/mg_item_gd.c
index 479c2ca..a684b43 100644
--- a/mg_item_gd.c
+++ b/mg_item_gd.c
@@ -182,7 +182,7 @@ mgItemGd::getSourceFile(bool AbsolutePath,bool Silent) const
 			{
 				struct stat stbuf;
 				char *dir;
-				asprintf(&dir,"%s%02d",tld.c_str(),i);
+				msprintf(&dir,"%s%02d",tld.c_str(),i);
 				gd_music_dir_exists[i]=!stat(dir,&stbuf);
 				free(dir);
 			}
@@ -193,7 +193,7 @@ mgItemGd::getSourceFile(bool AbsolutePath,bool Silent) const
 			if (!gd_music_dir_exists[i])
 				continue;
 			char *file;
-			asprintf(&file,"%02d/%s",i,m_mp3file.c_str());
+			msprintf(&file,"%02d/%s",i,m_mp3file.c_str());
 			if (readable(file))
 			{
 				m_mp3file = file;
diff --git a/mg_setup.c b/mg_setup.c
index 8a395de..54b44a3 100644
--- a/mg_setup.c
+++ b/mg_setup.c
@@ -43,7 +43,7 @@ mgSetup::mgSetup ()
     DbName = strdup ("GiantDisc");
     DbUser = 0;
     DbPass = 0;
-    asprintf(&DbDatadir,"%s/.muggle",getenv("HOME"));
+    msprintf(&DbDatadir,"%s/.muggle",getenv("HOME"));
     ToplevelDir = strdup(MUSICDIR "/");
     CreateMode = false;
     utf8 = false;
diff --git a/mg_tools.c b/mg_tools.c
index a456377..60fa26e 100644
--- a/mg_tools.c
+++ b/mg_tools.c
@@ -38,14 +38,23 @@ msprintf(char **strp, const char *fmt, ...)
         va_list ap;
 	int res;
         va_start (ap, fmt);
+	res=vmsprintf(strp,fmt,ap);
+        va_end (ap);
+	return res;
+}
+
+int
+vmsprintf(char **strp, const char *fmt, va_list &ap)
+{
+	int res;
         res=vasprintf (strp, fmt, ap);
 	if (res<0)
 	{
-		*strp=0;
-		mgError("asprintf() returns %d. This probably means illformed UTF-8 characters."
+		*strp=strdup("???,see logfile");
+		mgError("vasprintf() returns %d. This probably means illformed UTF-8 characters."
 		" Please convert your file names to UTF-8",fmt,res);
 	}
-        va_end (ap);
+	return res;
 }
 
 void
diff --git a/mg_tools.h b/mg_tools.h
index 12cf432..f6dd7b0 100644
--- a/mg_tools.h
+++ b/mg_tools.h
@@ -32,6 +32,7 @@ void mgDebug (const char *fmt, ...);
 void mgWarning (const char *fmt, ...);
 void mgError (const char *fmt, ...); 
 int msprintf(char **strp, const char *fmt, ...);
+int vmsprintf(char **strp, const char *fmt, va_list &ap);
 //@}
 
 #ifdef DEBUG
diff --git a/po/de.po b/po/de.po
index 1b1e089..3ae3e02 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: <vdr-muggle-develop@sourceforge.net>\n"
-"POT-Creation-Date: 2008-02-12 14:40+0100\n"
-"PO-Revision-Date: 2008-02-12 14:41+0100\n"
+"POT-Creation-Date: 2008-02-19 00:28+0100\n"
+"PO-Revision-Date: 2008-02-19 00:31+0100\n"
 "Last-Translator: Wolfgang Rohdewald <wolfgang@rohdewald.de>\n"
 "Language-Team: deutsch <vdr-muggle-i18n@sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -152,6 +152,52 @@ msgstr "Titel importieren?"
 msgid "Cannot access directory %s:%d"
 msgstr "Kein Zugriff auf Verzeichnis %s:%d"
 
+msgid "Track info view"
+msgstr "Details"
+
+#, c-format
+msgid "Title:\t%s"
+msgstr "Titel:\t%s"
+
+#, c-format
+msgid "Artist:\t%s"
+msgstr "Künstler:\t%s"
+
+#, c-format
+msgid "Album:\t%s"
+msgstr "Album:\t%s"
+
+#, c-format
+msgid "Genre:\t%s"
+msgstr "Stil:\t%s"
+
+#, c-format
+msgid "Year:\t%d"
+msgstr "Jahr:\t%d"
+
+#, c-format
+msgid "Length:\t%s"
+msgstr "Länge:\t%s"
+
+#, c-format
+msgid "Bit rate:\t%s"
+msgstr "Bitrate:\t%s"
+
+#, c-format
+msgid "Sampling rate:\t%d"
+msgstr "Sampling Rate:\t%d"
+
+#, c-format
+msgid "File name:\t%d"
+msgstr "Dateiname:\t%d"
+
+#, c-format
+msgid "File name:\t%s"
+msgstr "Dateiname:\t%s"
+
+msgid "Now playing"
+msgstr "Jetzt läuft"
+
 msgid "Loop mode off"
 msgstr "Endlosmodus aus"
 
diff --git a/po/fr.po b/po/fr.po
index bc76983..1fa36a4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: <vdr-muggle-develop@sourceforge.net>\n"
-"POT-Creation-Date: 2008-02-12 14:40+0100\n"
-"PO-Revision-Date: 2008-02-12 14:43+0100\n"
+"POT-Creation-Date: 2008-02-19 00:28+0100\n"
+"PO-Revision-Date: 2008-02-19 00:36+0100\n"
 "Last-Translator: Wolfgang Rohdewald <wolfgang@rohdewald.de>\n"
 "Language-Team: deutsch <vdr-muggle-i18n@sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -151,6 +151,52 @@ msgstr "Importer les titres?"
 msgid "Cannot access directory %s:%d"
 msgstr "Ne peux pas lire %s:%d"
 
+msgid "Track info view"
+msgstr "Les détails"
+
+#, c-format
+msgid "Title:\t%s"
+msgstr "Titre:\t%s"
+
+#, c-format
+msgid "Artist:\t%s"
+msgstr "Artiste:\t%s"
+
+#, c-format
+msgid "Album:\t%s"
+msgstr "Album:\t%s"
+
+#, c-format
+msgid "Genre:\t%s"
+msgstr "Genre:\t%s"
+
+#, c-format
+msgid "Year:\t%d"
+msgstr "Année:\t%d"
+
+#, c-format
+msgid "Length:\t%s"
+msgstr "Longeur:\t%s"
+
+#, c-format
+msgid "Bit rate:\t%s"
+msgstr ""
+
+#, c-format
+msgid "Sampling rate:\t%d"
+msgstr ""
+
+#, c-format
+msgid "File name:\t%d"
+msgstr "Nom du fichier:\t%d"
+
+#, c-format
+msgid "File name:\t%s"
+msgstr "Nom du fichier:\t%s"
+
+msgid "Now playing"
+msgstr "En jouant"
+
 msgid "Loop mode off"
 msgstr "Déclancher le mode répétition"
 
diff --git a/po/muggle.pot b/po/muggle.pot
index 9baf562..88fa4e6 100644
--- a/po/muggle.pot
+++ b/po/muggle.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: <vdr-muggle-develop@sourceforge.net>\n"
-"POT-Creation-Date: 2008-02-19 00:14+0100\n"
+"POT-Creation-Date: 2008-02-19 00:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -148,6 +148,52 @@ msgstr ""
 msgid "Cannot access directory %s:%d"
 msgstr ""
 
+msgid "Track info view"
+msgstr ""
+
+#, c-format
+msgid "Title:\t%s"
+msgstr ""
+
+#, c-format
+msgid "Artist:\t%s"
+msgstr ""
+
+#, c-format
+msgid "Album:\t%s"
+msgstr ""
+
+#, c-format
+msgid "Genre:\t%s"
+msgstr ""
+
+#, c-format
+msgid "Year:\t%d"
+msgstr ""
+
+#, c-format
+msgid "Length:\t%s"
+msgstr ""
+
+#, c-format
+msgid "Bit rate:\t%s"
+msgstr ""
+
+#, c-format
+msgid "Sampling rate:\t%d"
+msgstr ""
+
+#, c-format
+msgid "File name:\t%d"
+msgstr ""
+
+#, c-format
+msgid "File name:\t%s"
+msgstr ""
+
+msgid "Now playing"
+msgstr ""
+
 msgid "Loop mode off"
 msgstr ""
 
diff --git a/vdr_actions.c b/vdr_actions.c
index 0ac1da0..315d390 100644
--- a/vdr_actions.c
+++ b/vdr_actions.c
@@ -328,16 +328,16 @@ mgEntry::MenuName(const unsigned int idx,const mgListItem* item)
 	if (selection()->isCollectionlist())
 	{
 		if (item->value() == osd()->default_collection)
-			asprintf(&result,"-> %s%s",ct,item->value().c_str());
+			msprintf(&result,"-> %s%s",ct,item->value().c_str());
         	else
-			asprintf(&result,"     %s%s",ct,item->value().c_str());
+			msprintf(&result,"     %s%s",ct,item->value().c_str());
 	}
 	else if (selection()->inCollection())
-		asprintf(&result,"%4d %s",idx,item->value().c_str());
+		msprintf(&result,"%4d %s",idx,item->value().c_str());
 	else if (selection()->isLanguagelist())
-		asprintf(&result,"%s%s",ct,dgettext("iso_639",item->value().c_str()));
+		msprintf(&result,"%s%s",ct,dgettext("iso_639",item->value().c_str()));
 	else
-		asprintf(&result,"%s%s",ct,item->value().c_str());
+		msprintf(&result,"%s%s",ct,item->value().c_str());
 	return result;
 }
 
@@ -520,7 +520,7 @@ mgExternal::Execute()
         if (command->Confirm ())
         {
             char *buffer;
-            asprintf (&buffer, "%s?", command->Title ());
+            msprintf (&buffer, "%s?", command->Title ());
             confirmed = Interface->Confirm (buffer);
             free (buffer);
         }
@@ -743,7 +743,7 @@ class mgSetDefaultCollection:public mgCommand
 const char * mgSetDefaultCollection::MenuName(const unsigned int idx,const mgListItem* item)
 {
     char *b;
-    asprintf (&b, tr("Set default to collection '%s'"),
+    msprintf (&b, tr("Set default to collection '%s'"),
 	    selection ()->getCurrentValue().c_str());
     return b;
 }
@@ -829,7 +829,7 @@ mgAddAllToCollection::ExecuteMove()
     if (osd() ->Menus.size()>1) 
 	osd ()->CloseMenu();	// TODO Gebastel...
     char *b;
-    asprintf(&b,tr("'%s' to collection"),selection()->getCurrentValue().c_str());
+    msprintf(&b,tr("'%s' to collection"),selection()->getCurrentValue().c_str());
     osd ()->newmenu = new mgTreeAddToCollSelector(string(b));
     osd ()->collselection()->leave_all();
     osd ()->newposition = osd()->collselection()->getPosition(); 
@@ -852,7 +852,7 @@ const char *
 mgAddAllToDefaultCollection::MenuName (const unsigned int idx,const mgListItem* item)
 {
     char *b;
-    asprintf (&b, tr ("Add all to '%s'"),
+    msprintf (&b, tr ("Add all to '%s'"),
         osd ()->default_collection.c_str ());
     return b;
 }
@@ -958,7 +958,7 @@ const char *
 mgAddThisToDefaultCollection::MenuName (const unsigned int idx,const mgListItem* item)
 {
     char *b;
-    asprintf (&b, tr ("Add to '%s'"), osd ()->default_collection.c_str ());
+    msprintf (&b, tr ("Add to '%s'"), osd ()->default_collection.c_str ());
     return b;
 }
 
@@ -993,7 +993,7 @@ mgRemoveAllFromCollection::ExecuteRemove ()
     if (osd() ->Menus.size()>1) 
 	    osd ()->CloseMenu();	// TODO Gebastel...
     char *b;
-    asprintf(&b,tr("Remove '%s' from collection"),osd()->moveselection->getListname().c_str());
+    msprintf(&b,tr("Remove '%s' from collection"),osd()->moveselection->getListname().c_str());
     osd ()->newmenu = new mgTreeRemoveFromCollSelector(string(b));
     osd ()->collselection()->leave_all();
     osd ()->newposition = osd()->collselection()->getPosition(); 
diff --git a/vdr_menu.c b/vdr_menu.c
index 3a48577..aaa7b9f 100644
--- a/vdr_menu.c
+++ b/vdr_menu.c
@@ -261,9 +261,9 @@ mgMainMenu::SaveState()
     mgValmap nmain("MainMenu");
     mgValmap nsel("tree");
     mgValmap ncol("collection");
-    asprintf(&oldfile,"%s/muggle.state.old",cPlugin::ConfigDirectory ("muggle"));
-    asprintf(&newfile,"%s/muggle.state.new",cPlugin::ConfigDirectory ("muggle"));
-    asprintf(&statefile,"%s/muggle.state",cPlugin::ConfigDirectory ("muggle"));
+    msprintf(&oldfile,"%s/muggle.state.old",cPlugin::ConfigDirectory ("muggle"));
+    msprintf(&newfile,"%s/muggle.state.new",cPlugin::ConfigDirectory ("muggle"));
+    msprintf(&statefile,"%s/muggle.state",cPlugin::ConfigDirectory ("muggle"));
     FILE *f = fopen(newfile,"w");
     if (!f) 
     {
@@ -325,7 +325,7 @@ mgMainMenu::mgMainMenu ():cOsdMenu ("",25)
 
     // load values from state file
     char *b;
-    asprintf(&b,"%s/muggle.state",cPlugin::ConfigDirectory ("muggle"));
+    msprintf(&b,"%s/muggle.state",cPlugin::ConfigDirectory ("muggle"));
     FILE *f = fopen(b,"r");
     free(b);
     if (f) {
@@ -825,7 +825,7 @@ mgMainMenu::Message1(const char *msg, ...)
     if (strlen(msg)==0) return 0;
     va_list ap;
     va_start(ap, msg);
-    vasprintf(&m_message, tr(msg), ap);
+    vmsprintf(&m_message, tr(msg), ap);
     va_end(ap);
     return m_message;
 }
@@ -834,7 +834,7 @@ const char*
 mgMainMenu::Message1(const char *msg, const string &arg)
 {
     if (strlen(msg)==0) return 0;
-    asprintf(&m_message, tr(msg), arg.c_str());
+    msprintf(&m_message, tr(msg), arg.c_str());
     return m_message;
 }
 
@@ -1213,7 +1213,7 @@ bool
 create_question()
 {
     char *b;
-    asprintf(&b,tr("Create database %s?"),the_setup.DbName);
+    msprintf(&b,tr("Create database %s?"),the_setup.DbName);
     bool result = Interface->Confirm(b);
     free(b);
     return result;
diff --git a/vdr_player.c b/vdr_player.c
index 19c8502..139885f 100644
--- a/vdr_player.c
+++ b/vdr_player.c
@@ -1344,42 +1344,42 @@ mgPlayerControl::ShowContents ()
         if (m_track_view)
         {
             m_menu->Clear ();
-            m_menu->SetTitle ("Track info view");
+            m_menu->SetTitle (tr("Track info view"));
 
             m_menu->SetTabs (15);
 
             char *buf;
             if (num_items > 0)
             {
-                asprintf (&buf, "Title:\t%s",
+                msprintf (&buf, tr("Title:\t%s"),
                     player->getCurrent ()->getTitle ().c_str ());
                 m_menu->SetItem (buf, 0, false, false);
                 free (buf);
             }
             if (num_items > 1)
             {
-                asprintf (&buf, "Artist:\t%s",
+                msprintf (&buf, tr("Artist:\t%s"),
                     player->getCurrent ()->getArtist ().c_str ());
                 m_menu->SetItem (buf, 1, false, false);
                 free (buf);
             }
             if (num_items > 2)
             {
-                asprintf (&buf, "Album:\t%s",
+                msprintf (&buf, tr("Album:\t%s"),
                     player->getCurrent ()->getAlbum ().c_str ());
                 m_menu->SetItem (buf, 2, false, false);
                 free (buf);
             }
             if (num_items > 3)
             {
-                asprintf (&buf, "Genre:\t%s",
+                msprintf (&buf, tr("Genre:\t%s"),
                     player->getCurrent ()->getGenre ().c_str ());
                 m_menu->SetItem (buf, 3, false, false);
                 free (buf);
             }
 	    if( num_items > 4 )
 	      {
-                asprintf (&buf, "Year:\t%d",
+                msprintf (&buf, tr("Year:\t%d"),
 			  player->getCurrent ()->getYear () );
                 m_menu->SetItem (buf, 4, false, false);
                 free (buf);
@@ -1387,7 +1387,7 @@ mgPlayerControl::ShowContents ()
             if (num_items > 5)
             {
                 int len = player->getCurrent ()->getDuration ();
-                asprintf (&buf, "Length:\t%s",
+                msprintf (&buf, tr("Length:\t%s"),
 #if VDRVERSNUM >= 10318
                     *IndexToHMSF (SecondsToFrames (len)));
 #else
@@ -1398,7 +1398,7 @@ mgPlayerControl::ShowContents ()
             }
             if (num_items > 6)
             {
-                asprintf (&buf, "Bit rate:\t%s",
+                msprintf (&buf, tr("Bit rate:\t%s"),
                     player->getCurrent ()->getBitrate ().c_str ());
                 m_menu->SetItem (buf, 6, false, false);
                 free (buf);
@@ -1407,14 +1407,14 @@ mgPlayerControl::ShowContents ()
             {
                 int sr = player->getCurrent ()->getSampleRate ();
 
-                asprintf (&buf, "Sampling rate:\t%d", sr);
+                msprintf (&buf, tr("Sampling rate:\t%d"), sr);
                 m_menu->SetItem (buf, 7, false, false);
                 free (buf);
             }
             if (num_items > 8)
             {
 		int t = player->getCurrent ()->getTrack();
-                asprintf (&buf, "File name:\t%d", t);
+                msprintf (&buf, tr("File name:\t%d"), t);
                 m_menu->SetItem (buf, 8, false, false);
                 free (buf);
 	    }
@@ -1422,7 +1422,7 @@ mgPlayerControl::ShowContents ()
             {
                 string sf = player->getCurrent ()->getSourceFile ();
 		char *p = strrchr(sf.c_str(),'/');
-                asprintf (&buf, "File name:\t%s", p+1);
+                msprintf (&buf, tr("File name:\t%s"), p+1);
                 m_menu->SetItem (buf, 9, false, false);
                 free (buf);
 	    }
@@ -1434,7 +1434,7 @@ mgPlayerControl::ShowContents ()
             {
 // use items for playlist tag display
                 m_menu->Clear ();
-                m_menu->SetTitle ("Now playing");
+                m_menu->SetTitle (tr("Now playing"));
                 m_menu->SetTabs (25);
 
                 int cur = list->getItemPosition ();
@@ -1444,7 +1444,7 @@ mgPlayerControl::ShowContents ()
                     if (item)
                     {
                         char *buf;
-                        asprintf (&buf, "%s\t%s", item->getTitle ().c_str (),
+                        msprintf (&buf, "%s\t%s", item->getTitle ().c_str (),
                             item->getArtist ().c_str ());
                         m_menu->SetItem (buf, i, i == 0, i >= 0);
                         free (buf);
@@ -1476,7 +1476,7 @@ mgPlayerControl::ShowProgress ()
             {
                 total_frames = SecondsToFrames (list->getLength ());
                 current_frame += SecondsToFrames (list->getCompletedLength ());
-                asprintf (&buf, "(%d/%zd) %s:%s",
+                msprintf (&buf, "(%d/%zd) %s:%s",
                     list->getItemPosition () + 1, list->items().size(),
                     player->getCurrent ()->getArtist ().c_str (),
                     player->getCurrent ()->getTitle ().c_str ());
@@ -1484,7 +1484,7 @@ mgPlayerControl::ShowProgress ()
         }
         else
         {                                         // track view
-            asprintf (&buf, "%s: %s",
+            msprintf (&buf, "%s: %s",
                 player->getCurrent ()->getArtist ().c_str (),
                 player->getCurrent ()->getTitle ().c_str ());
         }
@@ -1832,7 +1832,7 @@ mgPlayerControl::StatusMsgReplaying ()
 
         if (item->getArtist ().length () > 0)
         {
-            asprintf (&szBuf, "[%c%c] (%d/%zd) %s - %s",
+            msprintf (&szBuf, "[%c%c] (%d/%zd) %s - %s",
                 cLoopMode,
                 cShuffle,
                 sel->getItemPosition () + 1,
@@ -1842,7 +1842,7 @@ mgPlayerControl::StatusMsgReplaying ()
         }
         else
         {
-            asprintf (&szBuf, "[%c%c] (%d/%zd) %s",
+            msprintf (&szBuf, "[%c%c] (%d/%zd) %s",
                 cLoopMode,
                 cShuffle,
                 sel->getItemPosition () + 1,
@@ -1852,7 +1852,7 @@ mgPlayerControl::StatusMsgReplaying ()
     }
     else
     {
-        asprintf (&szBuf, "[muggle]");
+        msprintf (&szBuf, "[muggle]");
     }
 
 //fprintf(stderr,"StatusMsgReplaying(%s)\n",szBuf);
diff --git a/vdr_stream.c b/vdr_stream.c
index cf3be99..8ec6caf 100644
--- a/vdr_stream.c
+++ b/vdr_stream.c
@@ -298,7 +298,7 @@ bool mgStream::fileinfo (bool log)
                 {
                     char *
                         tmpbuf;
-                    asprintf (&tmpbuf, "%llx:%llx", sfs.f_blocks, sfs.f_files);
+                    msprintf (&tmpbuf, "%llx:%llx", sfs.f_blocks, sfs.f_files);
                     m_fsID = tmpbuf;
                     free (tmpbuf);
                 }