# HG changeset patch # User ib # Date 1326558603 0 # Node ID 887c198b5b78ca9fe81fa6b6b2980d83a257544e # Parent 6c6fb701fa8e7a3037090aa830cd55c577f682ab Add size to ICONERROR warning message. diff -r 6c6fb701fa8e -r 887c198b5b78 gui/ui/widgets.c --- a/gui/ui/widgets.c Sat Jan 14 16:08:16 2012 +0000 +++ b/gui/ui/widgets.c Sat Jan 14 16:30:03 2012 +0000 @@ -105,7 +105,7 @@ g_object_unref(pixbuf); } else - mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_ICONERROR, GUI_ICON_NAME); + mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_ICONERROR, GUI_ICON_NAME, size); // start up GTK which realizes the pixmaps gtk_main_iteration_do(FALSE); diff -r 6c6fb701fa8e -r 887c198b5b78 help/help_mp-de.h --- a/help/help_mp-de.h Sat Jan 14 16:08:16 2012 +0000 +++ b/help/help_mp-de.h Sat Jan 14 16:30:03 2012 +0000 @@ -756,7 +756,7 @@ #define MSGTR_NEMFMR "Sorry, nicht genug Speicher für Menü-Rendering." #define MSGTR_IDFGCVD "Sorry, es wurde kein GUI-kompatibler Ausgabetreiber gefunden.\n" #define MSGTR_NEEDLAVC "Sorry, du versuchst, Nicht-MPEG Dateien ohne erneute Encodierung abzuspielen.\nBitte aktiviere lavc in der DXR3/H+-Konfigurationsbox." -#define MSGTR_ICONERROR "Icon '%s' wurde nicht gefunden oder das Format wird nicht unterstützt.\n" +#define MSGTR_ICONERROR "Icon '%s' (Größe %d) wurde nicht gefunden oder das Format wird nicht unterstützt.\n" // --- skin loader error messages #define MSGTR_SKIN_ERRORMESSAGE "Fehler in Skin-Konfigurationsdatei in Zeile %d: %s" diff -r 6c6fb701fa8e -r 887c198b5b78 help/help_mp-en.h --- a/help/help_mp-en.h Sat Jan 14 16:08:16 2012 +0000 +++ b/help/help_mp-en.h Sat Jan 14 16:30:03 2012 +0000 @@ -562,7 +562,7 @@ #define MSGTR_NEMFMR "Sorry, not enough memory for menu rendering." #define MSGTR_IDFGCVD "Sorry, no GUI-compatible video output driver found.\n" #define MSGTR_NEEDLAVC "Sorry, you cannot play non-MPEG files with your DXR3/H+ device without reencoding.\nPlease enable lavc in the DXR3/H+ configuration box." -#define MSGTR_ICONERROR "Icon '%s' not found or unsupported format.\n" +#define MSGTR_ICONERROR "Icon '%s' (size %d) not found or unsupported format.\n" // --- skin loader error messages #define MSGTR_SKIN_ERRORMESSAGE "Error in skin config file on line %d: %s" diff -r 6c6fb701fa8e -r 887c198b5b78 help/help_mp-zh_CN.h --- a/help/help_mp-zh_CN.h Sat Jan 14 16:08:16 2012 +0000 +++ b/help/help_mp-zh_CN.h Sat Jan 14 16:30:03 2012 +0000 @@ -562,7 +562,6 @@ #define MSGTR_NEMFMR "抱歉,没有足够的内存用于菜单渲染。" #define MSGTR_IDFGCVD "抱歉,未找到与 GUI 兼容的视频输出驱动。\n" #define MSGTR_NEEDLAVC "抱歉,未重新编码前无法用你的 DXR3/H+ 设备播放非 MPEG 文件。\n请启用 DXR3/H+ 配置盒中的 lavc 编解码器。" -#define MSGTR_ICONERROR "图标‘%s’未找到或格式不支持。\n" // --- skin loader error messages #define MSGTR_SKIN_ERRORMESSAGE "界面外观配置文件错误,行 %d:%s"