Index: libvo/font_load_ft.c =================================================================== --- libvo/font_load_ft.c (revision 24831) +++ libvo/font_load_ft.c (working copy) @@ -32,6 +32,7 @@ #include "mpbswap.h" #include "font_load.h" #include "mp_msg.h" +#include "help_mp.h" #include "mplayer.h" #include "get_path.h" #include "osd_font.h" @@ -904,7 +905,7 @@ if (err) { err = FT_New_Face(library, MPLAYER_DATADIR "/subfont.ttf", 0, face); if (err) { - mp_msg(MSGT_OSD, MSGL_ERR, "New_Face failed. Maybe the font path is wrong.\nPlease supply the text font file (~/.mplayer/subfont.ttf).\n" ); + mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_NewFaceFailed); return -1; } } @@ -915,7 +916,7 @@ static int load_osd_face(FT_Face *face) { if ( FT_New_Memory_Face(library, osd_font_pfb, sizeof(osd_font_pfb), 0, face) ) { - mp_msg(MSGT_OSD, MSGL_ERR, "New_Memory_Face failed..\n"); + mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_NewMemoryFaceFailed); return -1; } return 0; @@ -1002,7 +1003,7 @@ /* generate the subtitle font */ err = load_sub_face(fname, &face); if (err) { - mp_msg(MSGT_OSD, MSGL_WARN, "subtitle font: load_sub_face failed.\n"); + mp_msg(MSGT_OSD, MSGL_WARN, MSGTR_LIBVO_FONT_LOAD_FT_SubFaceFailed); goto gen_osd; } desc->face_cnt++; @@ -1019,7 +1020,7 @@ } if (charset_size < 0) { - mp_msg(MSGT_OSD, MSGL_ERR, "subtitle font: prepare_charset failed.\n"); + mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_SubFontCharsetFailed); goto err_out; } #else @@ -1033,7 +1034,7 @@ subtitle_font_thickness, subtitle_font_radius); if (err) { - mp_msg(MSGT_OSD, MSGL_ERR, "Cannot prepare subtitle font.\n"); + mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_CannotPrepareSubtitleFont); goto err_out; } @@ -1051,14 +1052,14 @@ subtitle_font_thickness, subtitle_font_radius); if (err) { - mp_msg(MSGT_OSD, MSGL_ERR, "Cannot prepare OSD font.\n"); + mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_CannotPrepareOSDFont); goto err_out; } err = generate_tables(desc, subtitle_font_thickness, subtitle_font_radius); if (err) { - mp_msg(MSGT_OSD, MSGL_ERR, "Cannot generate tables.\n"); + mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_CannotGenerateTables); goto err_out; } @@ -1096,10 +1097,10 @@ /* initialize freetype */ err = FT_Init_FreeType(&library); if (err) { - mp_msg(MSGT_OSD, MSGL_ERR, "Init_FreeType failed.\n"); + mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_InitFreeTypeFailed); return -1; } - mp_msg(MSGT_OSD, MSGL_V, "init_freetype\n"); + mp_msg(MSGT_OSD, MSGL_V, MSGTR_LIBVO_FONT_LOAD_FT_InitFreeType); using_freetype = 1; return 0; } @@ -1113,7 +1114,7 @@ err = FT_Done_FreeType(library); if (err) { - mp_msg(MSGT_OSD, MSGL_ERR, "FT_Done_FreeType failed.\n"); + mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_DoneFreeTypeFailed); return -1; } Index: help/help_mp-en.h =================================================================== --- help/help_mp-en.h (revision 24831) +++ help/help_mp-en.h (working copy) @@ -1767,6 +1767,19 @@ #define MSGTR_LIBVO_DXR3_XCorrection "[VO_DXR3] Xcorrection: %d.\n" #define MSGTR_LIBVO_DXR3_FailedSetSignalMix "[VO_DXR3] Failed to set signal mix!\n" +// libvo/font_load_ft.c + +#define MSGTR_LIBVO_FONT_LOAD_FT_NewFaceFailed "New_Face failed. Maybe the font path is wrong.\nPlease supply the text font file (~/.mplayer/subfont.ttf).\n" +#define MSGTR_LIBVO_FONT_LOAD_FT_NewMemoryFaceFailed "New_Memory_Face failed..\n" +#define MSGTR_LIBVO_FONT_LOAD_FT_SubFaceFailed "subtitle font: load_sub_face failed.\n" +#define MSGTR_LIBVO_FONT_LOAD_FT_SubFontCharsetFailed "subtitle font: prepare_charset failed.\n" +#define MSGTR_LIBVO_FONT_LOAD_FT_CannotPrepareSubtitleFont "Cannot prepare subtitle font.\n" +#define MSGTR_LIBVO_FONT_LOAD_FT_CannotPrepareOSDFont "Cannot prepare OSD font.\n" +#define MSGTR_LIBVO_FONT_LOAD_FT_CannotGenerateTables "Cannot generate tables.\n" +#define MSGTR_LIBVO_FONT_LOAD_FT_InitFreeTypeFailed "Init_FreeType failed.\n" +#define MSGTR_LIBVO_FONT_LOAD_FT_InitFreeType "init_freetype\n" +#define MSGTR_LIBVO_FONT_LOAD_FT_DoneFreeTypeFailed "FT_Done_FreeType failed.\n" + // libvo/vo_mga.c #define MSGTR_LIBVO_MGA_AspectResized "[VO_MGA] aspect(): resized to %dx%d.\n"