[MPlayer-cvslog] r36790 - in trunk: gui/app/cfg.c gui/dialog/about.c gui/dialog/dialog.c gui/dialog/equalizer.c gui/dialog/fileselect.c gui/dialog/menu.c gui/dialog/msgbox.c gui/dialog/playlist.c gui/dialog/prefere...
ib
subversion at mplayerhq.hu
Wed Feb 5 17:39:38 CET 2014
Author: ib
Date: Wed Feb 5 17:39:38 2014
New Revision: 36790
Log:
Rename symbolic constants of GUI help message texts.
Create a kind of GUI namespace and don't add place or kind of
usage to the name unless it's advantageous.
This reduces the amount of definitions as well.
Arrange them alphabetically.
Modified:
trunk/gui/app/cfg.c
trunk/gui/dialog/about.c
trunk/gui/dialog/dialog.c
trunk/gui/dialog/equalizer.c
trunk/gui/dialog/fileselect.c
trunk/gui/dialog/menu.c
trunk/gui/dialog/msgbox.c
trunk/gui/dialog/playlist.c
trunk/gui/dialog/preferences.c
trunk/gui/dialog/skinbrowser.c
trunk/gui/dialog/url.c
trunk/gui/interface.c
trunk/gui/skin/skin.c
trunk/gui/ui/actions.c
trunk/gui/ui/main.c
trunk/gui/ui/menu.c
trunk/gui/ui/playbar.c
trunk/gui/util/string.c
trunk/gui/win32/dialogs.c
trunk/gui/win32/gui.c
trunk/gui/win32/preferences.c
trunk/gui/win32/wincfg.c
trunk/gui/wm/ws.c
trunk/gui/wm/wsxdnd.c
Changes in other areas also in this revision:
Modified:
trunk/help/help_mp-bg.h
trunk/help/help_mp-cs.h
trunk/help/help_mp-da.h
trunk/help/help_mp-de.h
trunk/help/help_mp-el.h
trunk/help/help_mp-en.h
trunk/help/help_mp-es.h
trunk/help/help_mp-fr.h
trunk/help/help_mp-hu.h
trunk/help/help_mp-it.h
trunk/help/help_mp-ja.h
trunk/help/help_mp-ko.h
trunk/help/help_mp-mk.h
trunk/help/help_mp-nb.h
trunk/help/help_mp-nl.h
trunk/help/help_mp-pl.h
trunk/help/help_mp-pt_BR.h
trunk/help/help_mp-ro.h
trunk/help/help_mp-ru.h
trunk/help/help_mp-sk.h
trunk/help/help_mp-sv.h
trunk/help/help_mp-tr.h
trunk/help/help_mp-uk.h
trunk/help/help_mp-zh_CN.h
trunk/help/help_mp-zh_TW.h
Modified: trunk/gui/app/cfg.c
==============================================================================
--- trunk/gui/app/cfg.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/app/cfg.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -379,7 +379,7 @@ void cfg_write(void)
char *val = m_option_print(opts, opts->p);
if (val == (char *)-1) {
- gmp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_UnableToSaveOption, opts->name);
+ gmp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_UnableToSaveOption, opts->name);
val = NULL;
}
Modified: trunk/gui/dialog/about.c
==============================================================================
--- trunk/gui/dialog/about.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/dialog/about.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -62,7 +62,7 @@ static GtkWidget * CreateAbout( void )
About=gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_widget_set_usize( About,340,415 );
- gtk_window_set_title( GTK_WINDOW( About ),MSGTR_MENU_AboutMPlayer );
+ gtk_window_set_title( GTK_WINDOW( About ),MSGTR_GUI_AboutMPlayer );
gtk_window_set_position( GTK_WINDOW( About ),GTK_WIN_POS_CENTER );
gtk_window_set_policy( GTK_WINDOW( About ),FALSE,FALSE,TRUE );
gtk_window_set_wmclass( GTK_WINDOW( About ),"About",MPlayer );
@@ -108,10 +108,10 @@ static GtkWidget * CreateAbout( void )
gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL,
#endif
"\n"
- MSGTR_ABOUT_UHU":\n"
+ MSGTR_GUI_Sponsored":\n"
" http://www.uhulinux.hu/\n"
"\n"
- MSGTR_ABOUT_Contributors":\n"
+ MSGTR_GUI_Contributors":\n"
"\n"
" * Andreas Ackermann\n"
" * adland\n"
@@ -269,7 +269,7 @@ static GtkWidget * CreateAbout( void )
" * Matan Ziv-Av\n"
" * Márk Vicián Zoltán\n"
"\n"
- MSGTR_ABOUT_Codecs_libs_contributions":\n"
+ MSGTR_GUI_CodecsAndLibraries":\n"
"\n"
" * Fabrice Bellard\n"
" * Vivien Chappelier\n"
@@ -282,7 +282,7 @@ static GtkWidget * CreateAbout( void )
" * Mark Podlipec\n"
" * Damien Vincent\n"
"\n"
- MSGTR_ABOUT_Translations":\n"
+ MSGTR_GUI_Translations":\n"
"\n"
" * Marcin Biernat\n"
" * Marc Fargas\n"
@@ -299,7 +299,7 @@ static GtkWidget * CreateAbout( void )
" * Wacław Schiller\n"
" * Andoni Zubimendi\n"
"\n"
- MSGTR_ABOUT_Skins":\n"
+ MSGTR_GUI_Skins":\n"
"\n"
" * Azrael\n"
" * Viktor Bekesi\n"
@@ -334,7 +334,7 @@ static GtkWidget * CreateAbout( void )
" * Michael Zeising", -1 );
gtkAddHSeparator( vbox );
- Ok=gtkAddButton( MSGTR_Ok,gtkAddHButtonBox( vbox ) );
+ Ok=gtkAddButton( MSGTR_GUI_Ok,gtkAddHButtonBox( vbox ) );
gtk_signal_connect( GTK_OBJECT( About ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&About );
gtk_signal_connect_object( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( abWidgetDestroy ),NULL );
Modified: trunk/gui/dialog/dialog.c
==============================================================================
--- trunk/gui/dialog/dialog.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/dialog/dialog.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -96,7 +96,7 @@ static int gtkLoadIcon(GtkIconTheme *the
g_object_unref(pixbuf);
} else
- mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_ICONERROR, guiIconName, size);
+ mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_IconError, guiIconName, size);
/* start up GTK which realizes the pixmaps */
gtk_main_iteration_do(FALSE);
@@ -135,7 +135,7 @@ void gtkInit(char *display_name)
env = getenv("G_FILENAME_ENCODING");
if ((!env && getenv("G_BROKEN_FILENAMES")) || (gstrncmp(env, "@locale", 7) == 0))
- mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_LOCALE_ENCODING);
+ mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_LocaleEncoding);
#endif
gtk_init(&argc, &argv);
@@ -196,28 +196,28 @@ void gtkMessageBox(int type, const gchar
switch (type) {
case MSGBOX_FATAL:
- gtk_window_set_title(GTK_WINDOW(MessageBox), MSGTR_MSGBOX_LABEL_FatalError);
+ gtk_window_set_title(GTK_WINDOW(MessageBox), MSGTR_GUI_ErrorFatal);
gtk_widget_hide(InformationPixmap);
gtk_widget_hide(WarningPixmap);
gtk_widget_show(ErrorPixmap);
break;
case MSGBOX_ERROR:
- gtk_window_set_title(GTK_WINDOW(MessageBox), MSGTR_MSGBOX_LABEL_Error);
+ gtk_window_set_title(GTK_WINDOW(MessageBox), MSGTR_GUI_Error);
gtk_widget_hide(InformationPixmap);
gtk_widget_hide(WarningPixmap);
gtk_widget_show(ErrorPixmap);
break;
case MSGBOX_WARNING:
- gtk_window_set_title(GTK_WINDOW(MessageBox), MSGTR_MSGBOX_LABEL_Warning);
+ gtk_window_set_title(GTK_WINDOW(MessageBox), MSGTR_GUI_Warning);
gtk_widget_hide(InformationPixmap);
gtk_widget_show(WarningPixmap);
gtk_widget_hide(ErrorPixmap);
break;
case MSGBOX_INFORMATION:
- gtk_window_set_title(GTK_WINDOW(MessageBox), MSGTR_MSGBOX_LABEL_Information);
+ gtk_window_set_title(GTK_WINDOW(MessageBox), MSGTR_GUI_Information);
gtk_widget_show(InformationPixmap);
gtk_widget_hide(WarningPixmap);
gtk_widget_hide(ErrorPixmap);
Modified: trunk/gui/dialog/equalizer.c
==============================================================================
--- trunk/gui/dialog/equalizer.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/dialog/equalizer.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -106,7 +106,7 @@ static void eqSetChannelNames( void )
gchar * str[2];
gtk_clist_clear( GTK_CLIST( ChannelsList ) );
str[1]="";
- str[0]=MSGTR_EQU_All;
+ str[0]=MSGTR_GUI_ChannelAll;
gtk_clist_append( GTK_CLIST( ChannelsList ) ,str);
if ( guiInfo.AudioChannels > 1 )
{
@@ -260,7 +260,7 @@ static GtkWidget * CreateEqualizer( void
Equalizer=gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_widget_set_usize( Equalizer,-1,256 );
- gtk_window_set_title( GTK_WINDOW( Equalizer ),MSGTR_Equalizer );
+ gtk_window_set_title( GTK_WINDOW( Equalizer ),MSGTR_GUI_Equalizer );
gtk_window_set_position( GTK_WINDOW( Equalizer ),GTK_WIN_POS_CENTER );
gtk_window_set_policy( GTK_WINDOW( Equalizer ),FALSE,FALSE,TRUE );
gtk_window_set_wmclass( GTK_WINDOW( Equalizer ),"Equalizer",MPlayer );
@@ -336,66 +336,66 @@ static GtkWidget * CreateEqualizer( void
gtk_table_attach( GTK_TABLE( table1 ),A16000,9,10,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Frequency0,NULL ),
+ gtkAddLabel( MSGTR_GUI_Frequency0,NULL ),
0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Frequency1,NULL ),
+ gtkAddLabel( MSGTR_GUI_Frequency1,NULL ),
1,2,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Frequency2,NULL ),
+ gtkAddLabel( MSGTR_GUI_Frequency2,NULL ),
2,3,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Frequency3,NULL ),
+ gtkAddLabel( MSGTR_GUI_Frequency3,NULL ),
3,4,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Frequency4,NULL ),
+ gtkAddLabel( MSGTR_GUI_Frequency4,NULL ),
4,5,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Frequency5,NULL ),
+ gtkAddLabel( MSGTR_GUI_Frequency5,NULL ),
5,6,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Frequency6,NULL ),
+ gtkAddLabel( MSGTR_GUI_Frequency6,NULL ),
6,7,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Frequency7,NULL ),
+ gtkAddLabel( MSGTR_GUI_Frequency7,NULL ),
7,8,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Frequency8,NULL ),
+ gtkAddLabel( MSGTR_GUI_Frequency8,NULL ),
8,9,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Frequency9,NULL ),
+ gtkAddLabel( MSGTR_GUI_Frequency9,NULL ),
9,10,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_notebook_set_tab_label( GTK_NOTEBOOK( Notebook ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( Notebook ),0 ),
- gtkAddLabel( MSGTR_EQU_Audio,NULL ) );
+ gtkAddLabel( MSGTR_GUI_Audio,NULL ) );
table1=gtk_table_new( 4,2,FALSE );
gtk_widget_show( table1 );
gtk_container_add( GTK_CONTAINER( Notebook ),table1 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Contrast":",NULL ),
+ gtkAddLabel( MSGTR_GUI_Contrast":",NULL ),
0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Brightness":",NULL ),
+ gtkAddLabel( MSGTR_GUI_Brightness":",NULL ),
0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Hue":",NULL ),
+ gtkAddLabel( MSGTR_GUI_Hue":",NULL ),
0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Saturation":",NULL ),
+ gtkAddLabel( MSGTR_GUI_Saturation":",NULL ),
0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
VContrastadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) );
@@ -419,7 +419,7 @@ static GtkWidget * CreateEqualizer( void
gtk_widget_set_usize( VSaturation,-1,45 );
gtk_notebook_set_tab_label( GTK_NOTEBOOK( Notebook ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( Notebook ),1 ),
- gtkAddLabel( MSGTR_EQU_Video,NULL ) );
+ gtkAddLabel( MSGTR_GUI_Video,NULL ) );
gtkAddHSeparator( vbox1 );
@@ -427,9 +427,9 @@ static GtkWidget * CreateEqualizer( void
gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END );
gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 );
- Config=gtkAddButton( MSGTR_Config,hbuttonbox1 );
- Clear=gtkAddButton( MSGTR_Clear,hbuttonbox1 );
- Ok=gtkAddButton( MSGTR_Ok,hbuttonbox1 );
+ Config=gtkAddButton( MSGTR_GUI_Configure,hbuttonbox1 );
+ Clear=gtkAddButton( MSGTR_GUI_Clear,hbuttonbox1 );
+ Ok=gtkAddButton( MSGTR_GUI_Ok,hbuttonbox1 );
gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
@@ -471,12 +471,12 @@ void ShowEqualizer( void )
if ( Equalizer ) gtkRaise( Equalizer );
else Equalizer=CreateEqualizer();
- if ( !gtkEquChannel1 ) gtkEquChannel1=strdup( MSGTR_EQU_Front_Right );
- if ( !gtkEquChannel2 ) gtkEquChannel2=strdup( MSGTR_EQU_Front_Left );
- if ( !gtkEquChannel3 ) gtkEquChannel3=strdup( MSGTR_EQU_Back_Right );
- if ( !gtkEquChannel4 ) gtkEquChannel4=strdup( MSGTR_EQU_Back_Left );
- if ( !gtkEquChannel5 ) gtkEquChannel5=strdup( MSGTR_EQU_Center );
- if ( !gtkEquChannel6 ) gtkEquChannel6=strdup( MSGTR_EQU_Bass );
+ if ( !gtkEquChannel1 ) gtkEquChannel1=strdup( MSGTR_GUI_FrontRight );
+ if ( !gtkEquChannel2 ) gtkEquChannel2=strdup( MSGTR_GUI_FrontLeft );
+ if ( !gtkEquChannel3 ) gtkEquChannel3=strdup( MSGTR_GUI_RearRight );
+ if ( !gtkEquChannel4 ) gtkEquChannel4=strdup( MSGTR_GUI_RearLeft );
+ if ( !gtkEquChannel5 ) gtkEquChannel5=strdup( MSGTR_GUI_Center );
+ if ( !gtkEquChannel6 ) gtkEquChannel6=strdup( MSGTR_GUI_Bass );
eqSetChannelNames();
@@ -534,12 +534,12 @@ void ShowEquConfig( void )
if ( EquConfig ) gtkRaise( EquConfig );
else EquConfig=CreateEquConfig();
- Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Right );
- Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Left );
- Items=g_list_append( Items,(gpointer)MSGTR_EQU_Back_Right );
- Items=g_list_append( Items,(gpointer)MSGTR_EQU_Back_Left );
- Items=g_list_append( Items,(gpointer)MSGTR_EQU_Center );
- Items=g_list_append( Items,(gpointer)MSGTR_EQU_Bass );
+ Items=g_list_append( Items,(gpointer)MSGTR_GUI_FrontRight );
+ Items=g_list_append( Items,(gpointer)MSGTR_GUI_FrontLeft );
+ Items=g_list_append( Items,(gpointer)MSGTR_GUI_RearRight );
+ Items=g_list_append( Items,(gpointer)MSGTR_GUI_RearLeft );
+ Items=g_list_append( Items,(gpointer)MSGTR_GUI_Center );
+ Items=g_list_append( Items,(gpointer)MSGTR_GUI_Bass );
gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel1 ),Items );
gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel2 ),Items );
@@ -589,7 +589,7 @@ GtkWidget * CreateEquConfig( void )
EquConfig=gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_widget_set_usize( EquConfig,350,260 );
- gtk_window_set_title( GTK_WINDOW( EquConfig ),MSGTR_ConfigureEqualizer );
+ gtk_window_set_title( GTK_WINDOW( EquConfig ),MSGTR_GUI_EqualizerConfiguration );
gtk_window_set_position( GTK_WINDOW( EquConfig ),GTK_WIN_POS_CENTER );
// gtk_window_set_modal( GTK_WINDOW( EquConfig ),TRUE );
gtk_window_set_policy( GTK_WINDOW( EquConfig ),FALSE,FALSE,TRUE );
@@ -607,27 +607,27 @@ GtkWidget * CreateEquConfig( void )
gtk_table_set_col_spacings( GTK_TABLE( table1 ),4 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Channel1":",NULL ),
+ gtkAddLabel( MSGTR_GUI_Channel1":",NULL ),
0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Channel2":",NULL ),
+ gtkAddLabel( MSGTR_GUI_Channel2":",NULL ),
0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Channel3":",NULL ),
+ gtkAddLabel( MSGTR_GUI_Channel3":",NULL ),
0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Channel4":",NULL ),
+ gtkAddLabel( MSGTR_GUI_Channel4":",NULL ),
0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Channel5":",NULL ),
+ gtkAddLabel( MSGTR_GUI_Channel5":",NULL ),
0,1,4,5,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Channel6":",NULL ),
+ gtkAddLabel( MSGTR_GUI_Channel6":",NULL ),
0,1,5,6,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
CBChannel1=gtkAddCombo( NULL );
@@ -672,8 +672,8 @@ GtkWidget * CreateEquConfig( void )
gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END );
gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 );
- ecOk=gtkAddButton( MSGTR_Ok,hbuttonbox1 );
- ecCancel=gtkAddButton( MSGTR_Cancel,hbuttonbox1 );
+ ecOk=gtkAddButton( MSGTR_GUI_Ok,hbuttonbox1 );
+ ecCancel=gtkAddButton( MSGTR_GUI_Cancel,hbuttonbox1 );
gtk_widget_add_accelerator( ecOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
gtk_widget_add_accelerator( ecCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
Modified: trunk/gui/dialog/fileselect.c
==============================================================================
--- trunk/gui/dialog/fileselect.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/dialog/fileselect.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -64,25 +64,25 @@ int fsType;
static gint fsCurrFNameListSelected, fsLastFNameListSelected;
char *fsVideoAudioFilterNames[][2] = {
- { MSGTR_Filter_AVIFiles, "*.avi" },
- { MSGTR_Filter_DivXFiles, "*.divx" },
- { MSGTR_Filter_FlashVideo, "*.flv" },
- { MSGTR_Filter_MP3Files, "*.mp3" },
- { MSGTR_Filter_MP4Files, "*.aac,*.f4a,*.f4b,*.f4v,*.m4a,*.m4b,*.m4v,*.mp4" },
- { MSGTR_Filter_MPEGFiles, "*.m1v,*.m2v,*.mp2,*.mpe,*.mpeg,*.mpg,*.mpga,*.vdr,*.vob" },
- { MSGTR_Filter_MP2TS, "*.bdm,*.bdmv,*.clpi,*.cpi,*.m2t,*.m2ts,*.mpl,*.mpls,*.mts,*.rec,*.trp,*.ts,*.ty" },
- { MSGTR_Filter_MatroskaMedia, "*.mka,*.mkv" },
- { MSGTR_Filter_OGGMedia, "*.oga,*.ogg,*.ogm,*.ogv,*.ogx,*.spx" },
- { MSGTR_Filter_QTMedia, "*.moov,*.mov,*.qt,*.qtvr" },
- { MSGTR_Filter_RNMedia, "*.ra,*.rm,*.rmvb,*.rv" },
- { MSGTR_Filter_VideoCDImages, "*.bin" },
- { MSGTR_Filter_WAVFiles, "*.wav" },
- { MSGTR_Filter_WindowsMedia, "*.asf,*.wma,*.wmv" },
- { MSGTR_Filter_Playlists, "*.asx,*.m3u,*.m3u8,*.nsc,*.pls,*.ram,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" },
- { MSGTR_Filter_AllAudioFiles, "*.aac,*.ac3,*.aif,*.aifc,*.aiff,*.amr,*.ape,*.au,*.awb,*.cdg,*.f4a,*.f4b,*.flac,*.m4a,*.m4b,*.mka,*.mp+,*.mp2,*.mp3,*.mpc,*.mpga,*.mpp,*.nsa,*.oga,*.ogg,*.pcm,*.qcp,*.ra,*.snd,*.spx,*.tak,*.voc,*.vqf,*.w64,*.wav,*.wma,*.wv,*.wvp" },
- { MSGTR_Filter_AllVideoFiles, "*.264,*.3g2,*.3ga,*.3gp,*.3gp2,*.3gpp,*.3gpp2,*.asf,*.avi,*.bdm,*.bdmv,*.bin,*.clpi,*.cpi,*.cpk,*.divx,*.dv,*.f4v,*.flc,*.fli,*.flv,*.m1v,*.m2t,*.m2ts,*.m2v,*.m4v,*.mjpg,*.mkv,*.moov,*.mov,*.mp2,*.mp4,*.mpe,*.mpeg,*.mpg,*.mpl,*.mpls,*.mts,*.mxf,*.nsv,*.nuv,*.ogg,*.ogm,*.ogv,*.ogx,*.pva,*.qt,*.qtvr,*.rec,*.rm,*.rmvb,*.roq,*.rv,*.spl,*.str,*.swf,*.trp,*.ts,*.ty,*.vdr,*.viv,*.vivo,*.vob,*.webm,*.wmv,*.y4m" },
- { MSGTR_Filter_AllFiles, "*" },
- { NULL, NULL }
+ { MSGTR_GUI_FilterVideoAvi, "*.avi" },
+ { MSGTR_GUI_FilterVideoDivX, "*.divx" },
+ { MSGTR_GUI_FilterVideoFlash, "*.flv" },
+ { MSGTR_GUI_FilterFileMP3, "*.mp3" },
+ { MSGTR_GUI_FilterFileMP4, "*.aac,*.f4a,*.f4b,*.f4v,*.m4a,*.m4b,*.m4v,*.mp4" },
+ { MSGTR_GUI_FilterFileMPEG, "*.m1v,*.m2v,*.mp2,*.mpe,*.mpeg,*.mpg,*.mpga,*.vdr,*.vob" },
+ { MSGTR_GUI_FilterFileMP2TS, "*.bdm,*.bdmv,*.clpi,*.cpi,*.m2t,*.m2ts,*.mpl,*.mpls,*.mts,*.rec,*.trp,*.ts,*.ty" },
+ { MSGTR_GUI_FilterMediumMatroska, "*.mka,*.mkv" },
+ { MSGTR_GUI_FilterMediumOgg, "*.oga,*.ogg,*.ogm,*.ogv,*.ogx,*.spx" },
+ { MSGTR_GUI_FilterMediumQuickTime, "*.moov,*.mov,*.qt,*.qtvr" },
+ { MSGTR_GUI_FilterMediumRealNetworks, "*.ra,*.rm,*.rmvb,*.rv" },
+ { MSGTR_GUI_FilterImageVCD, "*.bin" },
+ { MSGTR_GUI_FilterFileWav, "*.wav" },
+ { MSGTR_GUI_FilterMediumWindows, "*.asf,*.wma,*.wmv" },
+ { MSGTR_GUI_FilterFilePlaylist, "*.asx,*.m3u,*.m3u8,*.nsc,*.pls,*.ram,*.smi,*.smil,*.sml,*.vlc,*.wax,*.wmx,*.wvx" },
+ { MSGTR_GUI_FilterAudioAll, "*.aac,*.ac3,*.aif,*.aifc,*.aiff,*.amr,*.ape,*.au,*.awb,*.cdg,*.f4a,*.f4b,*.flac,*.m4a,*.m4b,*.mka,*.mp+,*.mp2,*.mp3,*.mpc,*.mpga,*.mpp,*.nsa,*.oga,*.ogg,*.pcm,*.qcp,*.ra,*.snd,*.spx,*.tak,*.voc,*.vqf,*.w64,*.wav,*.wma,*.wv,*.wvp" },
+ { MSGTR_GUI_FilterVideoAll, "*.264,*.3g2,*.3ga,*.3gp,*.3gp2,*.3gpp,*.3gpp2,*.asf,*.avi,*.bdm,*.bdmv,*.bin,*.clpi,*.cpi,*.cpk,*.divx,*.dv,*.f4v,*.flc,*.fli,*.flv,*.m1v,*.m2t,*.m2ts,*.m2v,*.m4v,*.mjpg,*.mkv,*.moov,*.mov,*.mp2,*.mp4,*.mpe,*.mpeg,*.mpg,*.mpl,*.mpls,*.mts,*.mxf,*.nsv,*.nuv,*.ogg,*.ogm,*.ogv,*.ogx,*.pva,*.qt,*.qtvr,*.rec,*.rm,*.rmvb,*.roq,*.rv,*.spl,*.str,*.swf,*.trp,*.ts,*.ty,*.vdr,*.viv,*.vivo,*.vob,*.webm,*.wmv,*.y4m" },
+ { MSGTR_GUI_FilterFileAll, "*" },
+ { NULL, NULL }
};
int fsLastVideoAudioFilterSelected = -1;
@@ -96,36 +96,36 @@ char *fsSubtitleFilterNames[][2] = {
{ "SubStation Alpha (*.ssa)", "*.ssa" },
{ "MicroDVD (*.sub)", "*.sub" },
{ "Text (*.txt)", "*.txt" },
- { MSGTR_Filter_UTF8Subtitles, "*.utf,*.utf-8,*.utf8" },
- { MSGTR_Filter_AllSubtitles, "*.aqt,*.ass,*.jss,*.rt,*.smi,*.srt,*.ssa,*.sub,*.txt,*.utf" },
- { MSGTR_Filter_AllFiles, "*" },
+ { MSGTR_GUI_FilterSubtitleUTF8, "*.utf,*.utf-8,*.utf8" },
+ { MSGTR_GUI_FilterSubtitleAll, "*.aqt,*.ass,*.jss,*.rt,*.smi,*.srt,*.ssa,*.sub,*.txt,*.utf" },
+ { MSGTR_GUI_FilterFileAll, "*" },
{ NULL, NULL }
};
int fsLastSubtitleFilterSelected = -1;
char *fsAudioFileNames[][2] = {
- { MSGTR_Filter_DDRawAudio, "*.ac3,*.pcm" },
- { MSGTR_Filter_MPEGAudio, "*.aac,*.f4a,*.m4a,*.mp2,*.mp3,*.mpga" },
- { MSGTR_Filter_MatroskaAudio, "*.mka" },
- { MSGTR_Filter_OGGAudio, "*.oga,*.ogg,*.spx" },
- { MSGTR_Filter_WAVAudio, "*.wav" },
- { MSGTR_Filter_WMAAudio, "*.wma" },
- { MSGTR_Filter_AllAudioFiles, "*.aac,*.ac3,*.f4a,*.m4a,*.mka,*.mp2,*.mp3,*.mpga,*.oga,*.ogg,*.pcm,*.spx,*.wav,*.wma" },
- { MSGTR_Filter_AllFiles, "*" },
- { NULL, NULL }
+ { MSGTR_GUI_FilterAudioDolbyPCM, "*.ac3,*.pcm" },
+ { MSGTR_GUI_FilterAudioMPEG, "*.aac,*.f4a,*.m4a,*.mp2,*.mp3,*.mpga" },
+ { MSGTR_GUI_FilterAudioMatroska, "*.mka" },
+ { MSGTR_GUI_FilterAudioOgg, "*.oga,*.ogg,*.spx" },
+ { MSGTR_GUI_FilterAudioWav, "*.wav" },
+ { MSGTR_GUI_FilterAudioWma, "*.wma" },
+ { MSGTR_GUI_FilterAudioAll, "*.aac,*.ac3,*.f4a,*.m4a,*.mka,*.mp2,*.mp3,*.mpga,*.oga,*.ogg,*.pcm,*.spx,*.wav,*.wma" },
+ { MSGTR_GUI_FilterFileAll, "*" },
+ { NULL, NULL }
};
int fsLastAudioFilterSelected = -1;
char *fsFontFileNames[][2] = {
#ifdef CONFIG_FREETYPE
- { MSGTR_Filter_TTF, "*.ttf" },
- { MSGTR_Filter_Type1, "*.pfb" },
- { MSGTR_Filter_AllFonts, "*.pfb,*.ttf" },
+ { MSGTR_GUI_FilterFontTTF, "*.ttf" },
+ { MSGTR_GUI_FilterFontType1, "*.pfb" },
+ { MSGTR_GUI_FilterFontAll, "*.pfb,*.ttf" },
#else
- { MSGTR_Filter_FontFiles, "*.desc" },
+ { MSGTR_GUI_FilterFontBitmap, "*.desc" },
#endif
- { MSGTR_Filter_AllFiles, "*" },
- { NULL, NULL }
+ { MSGTR_GUI_FilterFileAll, "*" },
+ { NULL, NULL }
};
int fsLastFontFilterSelected = -1;
@@ -466,7 +466,7 @@ static void fs_Ok_released(GtkButton *bu
case FILESELECT_VIDEO_AUDIO:
for (l = 0; fsVideoAudioFilterNames[l][0]; l++)
- if (strcmp(fsVideoAudioFilterNames[l][0], MSGTR_Filter_Playlists) == 0)
+ if (strcmp(fsVideoAudioFilterNames[l][0], MSGTR_GUI_FilterFilePlaylist) == 0)
break;
uiSetFile(fsSelectedDirectory, fsSelectedFile, fsLastVideoAudioFilterSelected == l ? STREAMTYPE_PLAYLIST : STREAMTYPE_FILE);
@@ -591,7 +591,7 @@ static GtkWidget *CreateFileSelect(void)
FileSelector = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_usize(FileSelector, 512, 300);
gtk_widget_set_events(FileSelector, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK);
- gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_FileSelect);
+ gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_GUI_SelectFile);
gtk_window_set_position(GTK_WINDOW(FileSelector), GTK_WIN_POS_CENTER);
gtk_window_set_wmclass(GTK_WINDOW(FileSelector), "FileSelector", MPlayer);
fsColorMap = gdk_colormap_get_system();
@@ -669,8 +669,8 @@ static GtkWidget *CreateFileSelect(void)
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox3), GTK_BUTTONBOX_END);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox3), 10);
- fsOk = gtkAddButton(MSGTR_Ok, hbuttonbox3);
- fsCancel = gtkAddButton(MSGTR_Cancel, hbuttonbox3);
+ fsOk = gtkAddButton(MSGTR_GUI_Ok, hbuttonbox3);
+ fsCancel = gtkAddButton(MSGTR_GUI_Cancel, hbuttonbox3);
gtk_signal_connect(GTK_OBJECT(FileSelector), "destroy", GTK_SIGNAL_FUNC(fs_Destroy), NULL);
gtk_signal_connect(GTK_OBJECT(fsFNameListWindow), "key-release-event", GTK_SIGNAL_FUNC(fs_key_release_event), NULL);
@@ -707,7 +707,7 @@ void ShowFileSelector(int type)
switch (type) {
case FILESELECT_VIDEO_AUDIO:
- gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_FileSelect);
+ gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_GUI_SelectFile);
fsList_items = NULL;
for (i = 0; fsVideoAudioFilterNames[i][0]; i++)
@@ -721,7 +721,7 @@ void ShowFileSelector(int type)
break;
case FILESELECT_SUBTITLE:
- gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_SubtitleSelect);
+ gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_GUI_SelectSubtitle);
fsList_items = NULL;
for (i = 0; fsSubtitleFilterNames[i][0]; i++)
@@ -735,7 +735,7 @@ void ShowFileSelector(int type)
break;
case FILESELECT_AUDIO:
- gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_AudioFileSelect);
+ gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_GUI_SelectAudioFile);
fsList_items = NULL;
for (i = 0; fsAudioFileNames[i][0]; i++)
@@ -749,7 +749,7 @@ void ShowFileSelector(int type)
break;
case FILESELECT_FONT:
- gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_FontSelect);
+ gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_GUI_SelectFont);
fsList_items = NULL;
for (i = 0; fsFontFileNames[i][0]; i++)
Modified: trunk/gui/dialog/menu.c
==============================================================================
--- trunk/gui/dialog/menu.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/dialog/menu.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -437,67 +437,67 @@ GtkWidget * CreatePopUpMenu( void )
window1 = gtk_widget_get_toplevel(Menu);
- AddMenuItem( window1, (const char*)about_xpm, Menu,MSGTR_MENU_AboutMPlayer" ", evAbout );
+ AddMenuItem( window1, (const char*)about_xpm, Menu,MSGTR_GUI_AboutMPlayer" ", evAbout );
AddSeparator( Menu );
- SubMenu=AddSubMenu( window1, (const char*)open_xpm, Menu,MSGTR_MENU_Open );
- AddMenuItem( window1, (const char*)file2_xpm, SubMenu,MSGTR_MENU_PlayFile"... ", evLoadPlay );
+ SubMenu=AddSubMenu( window1, (const char*)open_xpm, Menu,MSGTR_GUI_Open );
+ AddMenuItem( window1, (const char*)file2_xpm, SubMenu,MSGTR_GUI_File"... ", evLoadPlay );
#ifdef CONFIG_CDDA
- AddMenuItem( window1, (const char*)playcd_xpm, SubMenu,MSGTR_MENU_PlayCD, evPlayCD );
- CDSubMenu=AddSubMenu( window1, (const char*)cd_xpm, Menu,MSGTR_MENU_CD );
- AddMenuItem( window1, (const char*)playcd_xpm, CDSubMenu,MSGTR_MENU_PlayDisc,evPlayCD );
+ AddMenuItem( window1, (const char*)playcd_xpm, SubMenu,MSGTR_GUI_CD, evPlayCD );
+ CDSubMenu=AddSubMenu( window1, (const char*)cd_xpm, Menu,MSGTR_GUI_CD );
+ AddMenuItem( window1, (const char*)playcd_xpm, CDSubMenu,MSGTR_GUI_Play,evPlayCD );
AddSeparator( CDSubMenu );
- CDTitleMenu=AddSubMenu( window1, (const char*)title_xpm, CDSubMenu,MSGTR_MENU_Titles );
+ CDTitleMenu=AddSubMenu( window1, (const char*)title_xpm, CDSubMenu,MSGTR_GUI_Titles );
if ( guiInfo.Tracks && ( guiInfo.StreamType == STREAMTYPE_CDDA ) )
{
char tmp[32]; int i;
for ( i=1;i <= guiInfo.Tracks;i++ )
{
- snprintf( tmp,32,MSGTR_MENU_Title,i );
+ snprintf( tmp,32,MSGTR_GUI_TitleNN,i );
//AddMenuItem( CDTitleMenu,tmp,( i << 16 ) + ivSetCDTrack );
AddMenuCheckItem(window1, (const char*)empty1px_xpm, CDTitleMenu,tmp, guiInfo.Track == i, ( i << 16 ) + ivSetCDTrack );
}
}
else
{
- MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, CDTitleMenu,MSGTR_MENU_None,evNone );
+ MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, CDTitleMenu,MSGTR_GUI__none_,evNone );
gtk_widget_set_sensitive( MenuItem,FALSE );
}
#endif
#ifdef CONFIG_VCD
- AddMenuItem( window1, (const char*)playvcd_xpm, SubMenu,MSGTR_MENU_PlayVCD, evPlayVCD );
- VCDSubMenu=AddSubMenu( window1, (const char*)vcd_xpm, Menu,MSGTR_MENU_VCD );
- AddMenuItem( window1, (const char*)playvcd_xpm, VCDSubMenu,MSGTR_MENU_PlayDisc,evPlayVCD );
+ AddMenuItem( window1, (const char*)playvcd_xpm, SubMenu,MSGTR_GUI_VCD, evPlayVCD );
+ VCDSubMenu=AddSubMenu( window1, (const char*)vcd_xpm, Menu,MSGTR_GUI_VCD );
+ AddMenuItem( window1, (const char*)playvcd_xpm, VCDSubMenu,MSGTR_GUI_Play,evPlayVCD );
AddSeparator( VCDSubMenu );
- VCDTitleMenu=AddSubMenu( window1, (const char*)title_xpm, VCDSubMenu,MSGTR_MENU_Titles );
+ VCDTitleMenu=AddSubMenu( window1, (const char*)title_xpm, VCDSubMenu,MSGTR_GUI_Titles );
if ( guiInfo.Tracks && ( guiInfo.StreamType == STREAMTYPE_VCD ) )
{
char tmp[32]; int i;
for ( i=1;i < guiInfo.Tracks;i++ )
{
- snprintf( tmp,32,MSGTR_MENU_Title,i );
+ snprintf( tmp,32,MSGTR_GUI_TitleNN,i );
//AddMenuItem( VCDTitleMenu,tmp,( i << 16 ) + ivSetVCDTrack );
AddMenuCheckItem(window1, (const char*)empty1px_xpm, VCDTitleMenu,tmp, guiInfo.Track == i + 1, ( ( i + 1 ) << 16 ) + ivSetVCDTrack );
}
}
else
{
- MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, VCDTitleMenu,MSGTR_MENU_None,evNone );
+ MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, VCDTitleMenu,MSGTR_GUI__none_,evNone );
gtk_widget_set_sensitive( MenuItem,FALSE );
}
#endif
#ifdef CONFIG_DVDREAD
- AddMenuItem( window1, (const char*)playdvd_xpm, SubMenu,MSGTR_MENU_PlayDVD, evPlayDVD );
- DVDSubMenu=AddSubMenu( window1, (const char*)dvd_xpm, Menu,MSGTR_MENU_DVD );
- AddMenuItem( window1, (const char*)playdvd_xpm, DVDSubMenu,MSGTR_MENU_PlayDisc" ", evPlayDVD );
+ AddMenuItem( window1, (const char*)playdvd_xpm, SubMenu,MSGTR_GUI_DVD, evPlayDVD );
+ DVDSubMenu=AddSubMenu( window1, (const char*)dvd_xpm, Menu,MSGTR_GUI_DVD );
+ AddMenuItem( window1, (const char*)playdvd_xpm, DVDSubMenu,MSGTR_GUI_Play" ", evPlayDVD );
// AddMenuItem( DVDSubMenu,MSGTR_MENU_ShowDVDMenu, evNone );
AddSeparator( DVDSubMenu );
- DVDTitleMenu=AddSubMenu( window1, (const char*)title_xpm, DVDSubMenu,MSGTR_MENU_Titles );
+ DVDTitleMenu=AddSubMenu( window1, (const char*)title_xpm, DVDSubMenu,MSGTR_GUI_Titles );
if ( guiInfo.Tracks && ( guiInfo.StreamType == STREAMTYPE_DVD ) )
{
char tmp[32]; int i;
for ( i=1 ; i<= guiInfo.Tracks;i++ )
{
- snprintf( tmp,32,MSGTR_MENU_Title,i);
+ snprintf( tmp,32,MSGTR_GUI_TitleNN,i);
AddMenuCheckItem( window1, (const char*)empty1px_xpm, DVDTitleMenu,tmp,
guiInfo.Track == i,
(i << 16) + ivSetDVDTitle );
@@ -505,26 +505,26 @@ GtkWidget * CreatePopUpMenu( void )
}
else
{
- MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, DVDTitleMenu,MSGTR_MENU_None,evNone );
+ MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, DVDTitleMenu,MSGTR_GUI__none_,evNone );
gtk_widget_set_sensitive( MenuItem,FALSE );
}
- DVDChapterMenu=AddSubMenu( window1, (const char*)chapter_xpm, DVDSubMenu,MSGTR_MENU_Chapters );
+ DVDChapterMenu=AddSubMenu( window1, (const char*)chapter_xpm, DVDSubMenu,MSGTR_GUI_Chapters );
if ( guiInfo.Chapters && ( guiInfo.StreamType == STREAMTYPE_DVD ) )
{
char tmp[32]; int i;
for ( i=1;i <= guiInfo.Chapters;i++ )
{
- snprintf( tmp,32,MSGTR_MENU_Chapter,i );
+ snprintf( tmp,32,MSGTR_GUI_ChapterNN,i );
AddMenuCheckItem( window1, (const char*)empty1px_xpm, DVDChapterMenu,tmp,guiInfo.Chapter == i,
( i << 16 ) + ivSetDVDChapter );
}
}
else
{
- MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, DVDChapterMenu,MSGTR_MENU_None,evNone );
+ MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, DVDChapterMenu,MSGTR_GUI__none_,evNone );
gtk_widget_set_sensitive( MenuItem,FALSE );
}
- DVDAudioLanguageMenu=AddSubMenu( window1, (const char*)audio_xpm, DVDSubMenu,MSGTR_MENU_AudioLanguages );
+ DVDAudioLanguageMenu=AddSubMenu( window1, (const char*)audio_xpm, DVDSubMenu,MSGTR_GUI_AudioTracks );
if ( guiInfo.AudioStreams && ( guiInfo.StreamType == STREAMTYPE_DVD ) )
{
char tmp[64]; int i, id = demuxer ? demuxer->audio->id : audio_id;
@@ -541,14 +541,14 @@ GtkWidget * CreatePopUpMenu( void )
}
else
{
- MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, DVDAudioLanguageMenu,MSGTR_MENU_None,evNone );
+ MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, DVDAudioLanguageMenu,MSGTR_GUI__none_,evNone );
gtk_widget_set_sensitive( MenuItem,FALSE );
}
- DVDSubtitleLanguageMenu=AddSubMenu( window1, (const char*)subtitle_xpm, DVDSubMenu,MSGTR_MENU_SubtitleLanguages );
+ DVDSubtitleLanguageMenu=AddSubMenu( window1, (const char*)subtitle_xpm, DVDSubMenu,MSGTR_GUI_Subtitles );
if ( guiInfo.Subtitles && ( guiInfo.StreamType == STREAMTYPE_DVD ) )
{
char tmp[64]; int i;
- AddMenuItem( window1, (const char*)empty1px_xpm, DVDSubtitleLanguageMenu,MSGTR_MENU_None,( (unsigned short)-1 << 16 ) + ivSetDVDSubtitle );
+ AddMenuItem( window1, (const char*)empty1px_xpm, DVDSubtitleLanguageMenu,MSGTR_GUI__none_,( (unsigned short)-1 << 16 ) + ivSetDVDSubtitle );
for ( i=0;i < guiInfo.Subtitles;i++ )
{
av_strlcpy( tmp,GetLanguage( guiInfo.Subtitle[i].language ),sizeof(tmp) );
@@ -559,33 +559,33 @@ GtkWidget * CreatePopUpMenu( void )
}
else
{
- MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, DVDSubtitleLanguageMenu,MSGTR_MENU_None,evNone );
+ MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, DVDSubtitleLanguageMenu,MSGTR_GUI__none_,evNone );
gtk_widget_set_sensitive( MenuItem,FALSE );
}
#endif
- AddMenuItem( window1, (const char*)url_xpm, SubMenu,MSGTR_MENU_PlayURL"...", evLoadURL );
+ AddMenuItem( window1, (const char*)url_xpm, SubMenu,MSGTR_GUI_URL"...", evLoadURL );
#ifdef CONFIG_TV
- AddMenuItem( window1, (const char*)tv_xpm, SubMenu,MSGTR_MENU_PlayTV, evPlayTV );
+ AddMenuItem( window1, (const char*)tv_xpm, SubMenu,MSGTR_GUI_TV, evPlayTV );
#endif
AddSeparator( SubMenu );
- AddMenuItem( window1, (const char*)loadeaf_xpm, SubMenu,MSGTR_MENU_LoadExternAudioFile"...", evLoadAudioFile );
- AddMenuItem( window1, (const char*)sub_xpm, SubMenu,MSGTR_MENU_LoadSubtitle"... ", evLoadSubtitle );
- AddMenuItem( window1, (const char*)nosub_xpm, SubMenu,MSGTR_MENU_DropSubtitle,evDropSubtitle );
- SubMenu=AddSubMenu(window1, (const char*)play_xpm, Menu,MSGTR_MENU_Playing );
- AddMenuItem( window1, (const char*)play_xpm, SubMenu,MSGTR_MENU_Play" ", evPlay );
- AddMenuItem( window1, (const char*)pause_xpm, SubMenu,MSGTR_MENU_Pause, evPause );
- AddMenuItem( window1, (const char*)stop_xpm, SubMenu,MSGTR_MENU_Stop, evStop );
- AddMenuItem( window1, (const char*)next_xpm, SubMenu,MSGTR_MENU_NextStream, evNext );
- AddMenuItem( window1, (const char*)prev_xpm, SubMenu,MSGTR_MENU_PrevStream, evPrev );
+ AddMenuItem( window1, (const char*)loadeaf_xpm, SubMenu,MSGTR_GUI_AudioTrack"...", evLoadAudioFile );
+ AddMenuItem( window1, (const char*)sub_xpm, SubMenu,MSGTR_GUI_Subtitle"... ", evLoadSubtitle );
+ AddMenuItem( window1, (const char*)nosub_xpm, SubMenu,MSGTR_GUI_DropSubtitle,evDropSubtitle );
+ SubMenu=AddSubMenu(window1, (const char*)play_xpm, Menu,MSGTR_GUI_Playback );
+ AddMenuItem( window1, (const char*)play_xpm, SubMenu,MSGTR_GUI_Play" ", evPlay );
+ AddMenuItem( window1, (const char*)pause_xpm, SubMenu,MSGTR_GUI_Pause, evPause );
+ AddMenuItem( window1, (const char*)stop_xpm, SubMenu,MSGTR_GUI_Stop, evStop );
+ AddMenuItem( window1, (const char*)next_xpm, SubMenu,MSGTR_GUI_Next, evNext );
+ AddMenuItem( window1, (const char*)prev_xpm, SubMenu,MSGTR_GUI_Previous, evPrev );
// AddSeparator( SubMenu );
// AddMenuItem( SubMenu,"Back 10 sec", evBackward10sec );
// AddMenuItem( SubMenu,"Fwd 10 sec", evForward10sec );
// AddMenuItem( SubMenu,"Back 1 min", evBackward1min );
// AddMenuItem( SubMenu,"Fwd 1 min", evForward1min );
// SubMenu=AddSubMenu( Menu,MSGTR_MENU_Size );
-// AddMenuItem( SubMenu,MSGTR_MENU_NormalSize" ", evNormalSize );
-// AddMenuItem( SubMenu,MSGTR_MENU_DoubleSize, evDoubleSize );
-// AddMenuItem( SubMenu,MSGTR_MENU_FullScreen, evFullScreen + ( True << 16 ) );
+// AddMenuItem( SubMenu,MSGTR_GUI_SizeNormal" ", evNormalSize );
+// AddMenuItem( SubMenu,MSGTR_GUI_SizeDouble, evDoubleSize );
+// AddMenuItem( SubMenu,MSGTR_GUI_SizeFullscreen, evFullScreen + ( True << 16 ) );
if ( guiInfo.VideoWindow )
{
@@ -599,11 +599,11 @@ GtkWidget * CreatePopUpMenu( void )
a235 = (FFABS(movie_aspect - 2.35f) <= 0.01f);
}
- AspectMenu=AddSubMenu( window1, (const char*)aspect_xpm, Menu,MSGTR_MENU_AspectRatio );
- H=AddMenuCheckItem( window1, (const char*)aspect11_xpm, AspectMenu,MSGTR_MENU_Original, a11, evSetAspect + ( 1 << 16 ) );
+ AspectMenu=AddSubMenu( window1, (const char*)aspect_xpm, Menu,MSGTR_GUI_AspectRatio );
+ H=AddMenuCheckItem( window1, (const char*)aspect11_xpm, AspectMenu,MSGTR_GUI_Original, a11, evSetAspect + ( 1 << 16 ) );
N=AddMenuCheckItem( window1, (const char*)aspect169_xpm, AspectMenu,"16:9", a169, evSetAspect + ( 2 << 16 ) );
D=AddMenuCheckItem( window1, (const char*)aspect43_xpm, AspectMenu,"4:3", a43, evSetAspect + ( 3 << 16 ) );
- F=AddMenuCheckItem( window1, (const char*)aspect235_xpm, AspectMenu,MSGTR_MENU_235, a235, evSetAspect + ( 4 << 16 ) );
+ F=AddMenuCheckItem( window1, (const char*)aspect235_xpm, AspectMenu,MSGTR_GUI_235To1, a235, evSetAspect + ( 4 << 16 ) );
if ( !guiInfo.Playing )
{
@@ -626,10 +626,10 @@ GtkWidget * CreatePopUpMenu( void )
( guiApp.videoWindow.Height == guiInfo.VideoHeight / 2 ) ) b_half=True;
else b1=( guiApp.videoWindow.Width == guiInfo.VideoWidth && guiApp.videoWindow.Height == guiInfo.VideoHeight );
} else b1=!guiApp.videoWindow.isFullScreen;
- F=AddMenuCheckItem( window1, (const char*)full_xpm, Menu,MSGTR_MENU_FullScreen,guiApp.videoWindow.isFullScreen,evFullScreen + ( True << 16 ) );
- D=AddMenuCheckItem( window1, (const char*)double_xpm, Menu,MSGTR_MENU_DoubleSize,b2,evDoubleSize );
- N=AddMenuCheckItem( window1, (const char*)normal_xpm, Menu,MSGTR_MENU_NormalSize" ",b1,evNormalSize );
- H=AddMenuCheckItem( window1, (const char*)half_xpm, Menu,MSGTR_MENU_HalfSize,b_half,evHalfSize );
+ F=AddMenuCheckItem( window1, (const char*)full_xpm, Menu,MSGTR_GUI_SizeFullscreen,guiApp.videoWindow.isFullScreen,evFullScreen + ( True << 16 ) );
+ D=AddMenuCheckItem( window1, (const char*)double_xpm, Menu,MSGTR_GUI_SizeDouble,b2,evDoubleSize );
+ N=AddMenuCheckItem( window1, (const char*)normal_xpm, Menu,MSGTR_GUI_SizeNormal" ",b1,evNormalSize );
+ H=AddMenuCheckItem( window1, (const char*)half_xpm, Menu,MSGTR_GUI_SizeHalf,b_half,evHalfSize );
if ( !guiInfo.Playing )
{
gtk_widget_set_sensitive( H,FALSE );
@@ -640,7 +640,7 @@ GtkWidget * CreatePopUpMenu( void )
}
AddSeparator( Menu );
- MenuItem=AddMenuCheckItem( window1, (const char*)sound_xpm, Menu,MSGTR_MENU_Mute,mixer->muted,evMute );
+ MenuItem=AddMenuCheckItem( window1, (const char*)sound_xpm, Menu,MSGTR_GUI_Mute,mixer->muted,evMute );
if ( !guiInfo.AudioChannels ) gtk_widget_set_sensitive( MenuItem,FALSE );
if ( guiInfo.Playing && demuxer && guiInfo.StreamType != STREAMTYPE_DVD )
@@ -652,14 +652,14 @@ GtkWidget * CreatePopUpMenu( void )
if ( c > 1 )
{
- SubMenu=AddSubMenu( window1, (const char*)audio_xpm, Menu,MSGTR_MENU_AudioTrack );
+ SubMenu=AddSubMenu( window1, (const char*)audio_xpm, Menu,MSGTR_GUI_AudioTracks );
for ( i=0;i < MAX_A_STREAMS;i++ )
if ( demuxer->a_streams[i] )
{
int aid = ((sh_audio_t *)demuxer->a_streams[i])->aid;
int selected_id = (audio_id == aid || (audio_id == -1 && aid == demuxer_default_audio_track(mpctx_get_demuxer(guiInfo.mpcontext))));
char tmp[32];
- snprintf( tmp,32,MSGTR_MENU_Track,aid );
+ snprintf( tmp,32,MSGTR_GUI_TrackN,aid );
AddMenuCheckItem( window1, (const char*)empty1px_xpm, SubMenu,tmp,selected_id,( aid << 16 ) + ivSetAudio );
}
}
@@ -669,14 +669,14 @@ GtkWidget * CreatePopUpMenu( void )
if ( c > 1 )
{
- SubMenu=AddSubMenu( window1, (const char*)video_xpm, Menu,MSGTR_MENU_VideoTrack );
+ SubMenu=AddSubMenu( window1, (const char*)video_xpm, Menu,MSGTR_GUI_VideoTracks );
for ( i=0;i < MAX_V_STREAMS;i++ )
if ( demuxer->v_streams[i] )
{
int vid = ((sh_video_t *)demuxer->v_streams[i])->vid;
char tmp[32];
int selected_id = (video_id == vid || (video_id == -1 && vid == demuxer_default_video_track(mpctx_get_demuxer(guiInfo.mpcontext))));
- snprintf( tmp,32,MSGTR_MENU_Track,vid );
+ snprintf( tmp,32,MSGTR_GUI_TrackN,vid );
AddMenuCheckItem( window1, (const char*)empty1px_xpm, SubMenu,tmp,selected_id,( vid << 16 ) + ivSetVideo );
}
}
@@ -687,24 +687,24 @@ GtkWidget * CreatePopUpMenu( void )
{
int pos, i;
pos = mpctx_get_global_sub_pos(guiInfo.mpcontext);
- SubMenu=AddSubMenu( window1, (const char*)subtitle_xpm, Menu, MSGTR_MENU_Subtitles );
- AddMenuCheckItem( window1, (const char*)empty1px_xpm, SubMenu, MSGTR_MENU_None, pos == -1, (-1 << 16) + ivSetSubtitle );
+ SubMenu=AddSubMenu( window1, (const char*)subtitle_xpm, Menu, MSGTR_GUI_Subtitles );
+ AddMenuCheckItem( window1, (const char*)empty1px_xpm, SubMenu, MSGTR_GUI__none_, pos == -1, (-1 << 16) + ivSetSubtitle );
for ( i=0;i < global_sub_size;i++ )
{
char tmp[32];
- snprintf( tmp, 32, MSGTR_MENU_Track, i );
+ snprintf( tmp, 32, MSGTR_GUI_TrackN, i );
AddMenuCheckItem( window1,(const char*)empty1px_xpm,SubMenu,tmp,pos == i,( i << 16 ) + ivSetSubtitle );
}
}
AddSeparator( Menu );
- AddMenuItem( window1, (const char*)equalizer_xpm, Menu,MSGTR_Equalizer, evEqualizer );
- AddMenuItem( window1, (const char*)playlist_xpm, Menu,MSGTR_MENU_PlayList, evPlaylist );
- AddMenuItem( window1, (const char*)skin_xpm, Menu,MSGTR_MENU_SkinBrowser, evSkinBrowser );
- AddMenuItem( window1, (const char*)prefs_xpm, Menu,MSGTR_MENU_Preferences, evPreferences );
+ AddMenuItem( window1, (const char*)equalizer_xpm, Menu,MSGTR_GUI_Equalizer, evEqualizer );
+ AddMenuItem( window1, (const char*)playlist_xpm, Menu,MSGTR_GUI_Playlist, evPlaylist );
+ AddMenuItem( window1, (const char*)skin_xpm, Menu,MSGTR_GUI_SkinBrowser, evSkinBrowser );
+ AddMenuItem( window1, (const char*)prefs_xpm, Menu,MSGTR_GUI_Preferences, evPreferences );
AddSeparator( Menu );
- AddMenuItem( window1, (const char*)exit_xpm, Menu,MSGTR_MENU_Exit, evExit );
+ AddMenuItem( window1, (const char*)exit_xpm, Menu,MSGTR_GUI_Quit, evExit );
return Menu;
}
Modified: trunk/gui/dialog/msgbox.c
==============================================================================
--- trunk/gui/dialog/msgbox.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/dialog/msgbox.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -101,7 +101,7 @@ static GtkWidget * CreateMessageBox( voi
gtkAddHSeparator( vbox1 );
hbuttonbox1=gtkAddHButtonBox( vbox1 );
- Ok=gtkAddButton( MSGTR_Ok,hbuttonbox1 );
+ Ok=gtkAddButton( MSGTR_GUI_Ok,hbuttonbox1 );
gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
Modified: trunk/gui/dialog/playlist.c
==============================================================================
--- trunk/gui/dialog/playlist.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/dialog/playlist.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -446,7 +446,7 @@ static GtkWidget * CreatePlaylist( void
Playlist=gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_widget_set_usize( Playlist,512,384 );
- gtk_window_set_title( GTK_WINDOW( Playlist ),MSGTR_PlayList );
+ gtk_window_set_title( GTK_WINDOW( Playlist ),MSGTR_GUI_Playlist );
gtk_window_set_position( GTK_WINDOW( Playlist ),GTK_WIN_POS_CENTER );
gtk_window_set_wmclass( GTK_WINDOW( Playlist ),"Playlist",MPlayer );
@@ -491,7 +491,7 @@ static GtkWidget * CreatePlaylist( void
else if ( fsHistory[0] ) old_path = strdup( cfg_old_filename_from_utf8( fsHistory[0] ) );
gtk_clist_set_column_widget( GTK_CLIST( CTDirTree ),0,
- gtkAddLabel( MSGTR_PLAYLIST_DirectoryTree,NULL ) );
+ gtkAddLabel( MSGTR_GUI_DirectoryTree,NULL ) );
gtk_clist_column_title_passive( GTK_CLIST( CTDirTree ),0 );
@@ -513,7 +513,7 @@ static GtkWidget * CreatePlaylist( void
gtk_clist_set_shadow_type( GTK_CLIST( CLFiles ),GTK_SHADOW_NONE );
gtk_clist_set_column_widget( GTK_CLIST( CLFiles ),0,
- gtkAddLabel( MSGTR_PLAYLIST_Files,NULL ) );
+ gtkAddLabel( MSGTR_GUI_Files,NULL ) );
gtk_clist_column_title_passive( GTK_CLIST( CLFiles ),0 );
@@ -536,10 +536,10 @@ static GtkWidget * CreatePlaylist( void
gtk_clist_set_shadow_type( GTK_CLIST( CLSelected ),GTK_SHADOW_NONE );
gtk_clist_set_column_widget( GTK_CLIST( CLSelected ),0,
- gtkAddLabel( MSGTR_PLAYLIST_Selected,NULL ) );
+ gtkAddLabel( MSGTR_GUI_SelectedFiles,NULL ) );
gtk_clist_set_column_widget( GTK_CLIST( CLSelected ),1,
- gtkAddLabel( MSGTR_PLAYLIST_Path,NULL ) );
+ gtkAddLabel( MSGTR_GUI_Directory,NULL ) );
gtk_clist_column_title_passive( GTK_CLIST( CLSelected ),0 );
@@ -549,10 +549,10 @@ static GtkWidget * CreatePlaylist( void
gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END );
gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 );
- Add=gtkAddButton( MSGTR_Add,hbuttonbox1 );
- Remove=gtkAddButton( MSGTR_Remove,hbuttonbox1 );
- Ok=gtkAddButton( MSGTR_Ok,hbuttonbox1 );
- Cancel=gtkAddButton( MSGTR_Cancel,hbuttonbox1 );
+ Add=gtkAddButton( MSGTR_GUI_Add,hbuttonbox1 );
+ Remove=gtkAddButton( MSGTR_GUI_Remove,hbuttonbox1 );
+ Ok=gtkAddButton( MSGTR_GUI_Ok,hbuttonbox1 );
+ Cancel=gtkAddButton( MSGTR_GUI_Cancel,hbuttonbox1 );
gtk_widget_add_accelerator( Cancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
Modified: trunk/gui/dialog/preferences.c
==============================================================================
--- trunk/gui/dialog/preferences.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/dialog/preferences.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -163,42 +163,42 @@ static struct
char * comment;
} lEncoding[] =
{
- { ENC_UTF8, MSGTR_PREFERENCES_FontEncoding24 },
- { "ISO-8859-1", MSGTR_PREFERENCES_FontEncoding2 },
- { "ISO-8859-2", MSGTR_PREFERENCES_FontEncoding4 },
- { "ISO-8859-3", MSGTR_PREFERENCES_FontEncoding5 },
- { "ISO-8859-4", MSGTR_PREFERENCES_FontEncoding6 },
- { "ISO-8859-5", MSGTR_PREFERENCES_FontEncoding7 },
- { "ISO-8859-6", MSGTR_PREFERENCES_FontEncoding8 },
- { "ISO-8859-7", MSGTR_PREFERENCES_FontEncoding9 },
- { "ISO-8859-8", MSGTR_PREFERENCES_FontEncoding13 },
- { "ISO-8859-9", MSGTR_PREFERENCES_FontEncoding10 },
- { "ISO-8859-10", MSGTR_PREFERENCES_FontEncoding26 },
- { "ISO-8859-11", MSGTR_PREFERENCES_FontEncoding27 },
- { "ISO-8859-13", MSGTR_PREFERENCES_FontEncoding11 },
- { "ISO-8859-14", MSGTR_PREFERENCES_FontEncoding12 },
- { "ISO-8859-15", MSGTR_PREFERENCES_FontEncoding3 },
- { "ISO-8859-16", MSGTR_PREFERENCES_FontEncoding28 },
- { "KOI8-R", MSGTR_PREFERENCES_FontEncoding14 },
- { "KOI8-U", MSGTR_PREFERENCES_FontEncoding15 },
- { "KOI8-RU", MSGTR_PREFERENCES_FontEncoding25 },
- { "BIG5", MSGTR_PREFERENCES_FontEncoding17 },
- { "SHIFT-JIS", MSGTR_PREFERENCES_FontEncoding18 },
- { "CP1250", MSGTR_PREFERENCES_FontEncoding22},
- { "CP1251", MSGTR_PREFERENCES_FontEncoding21},
- { "CP1252", MSGTR_PREFERENCES_FontEncoding31 },
- { "CP1253", MSGTR_PREFERENCES_FontEncoding32 },
- { "CP1254", MSGTR_PREFERENCES_FontEncoding33 },
- { "CP1255", MSGTR_PREFERENCES_FontEncoding34 },
- { "CP1256", MSGTR_PREFERENCES_FontEncoding23 },
- { "CP1257", MSGTR_PREFERENCES_FontEncoding35 },
- { "CP1258", MSGTR_PREFERENCES_FontEncoding36 },
- { "CP874", MSGTR_PREFERENCES_FontEncoding20 },
- { "CP932", MSGTR_PREFERENCES_FontEncoding29 },
- { "CP936", MSGTR_PREFERENCES_FontEncoding16 },
- { "CP949", MSGTR_PREFERENCES_FontEncoding19 },
- { "CP950", MSGTR_PREFERENCES_FontEncoding30 },
- { ENC_UNICODE, MSGTR_PREFERENCES_FontEncoding1 },
+ { ENC_UTF8, MSGTR_GUI_CpUTF8 },
+ { "ISO-8859-1", MSGTR_GUI_CpISO8859_1 },
+ { "ISO-8859-2", MSGTR_GUI_CpISO8859_2 },
+ { "ISO-8859-3", MSGTR_GUI_CpISO8859_3 },
+ { "ISO-8859-4", MSGTR_GUI_CpISO8859_4 },
+ { "ISO-8859-5", MSGTR_GUI_CpISO8859_5 },
+ { "ISO-8859-6", MSGTR_GUI_CpISO8859_6 },
+ { "ISO-8859-7", MSGTR_GUI_CpISO8859_7 },
+ { "ISO-8859-8", MSGTR_GUI_CpISO8859_8 },
+ { "ISO-8859-9", MSGTR_GUI_CpISO8859_9 },
+ { "ISO-8859-10", MSGTR_GUI_CpISO8859_10 },
+ { "ISO-8859-11", MSGTR_GUI_CpISO8859_11 },
+ { "ISO-8859-13", MSGTR_GUI_CpISO8859_13 },
+ { "ISO-8859-14", MSGTR_GUI_CpISO8859_14 },
+ { "ISO-8859-15", MSGTR_GUI_CpISO8859_15 },
+ { "ISO-8859-16", MSGTR_GUI_CpISO8859_16 },
+ { "KOI8-R", MSGTR_GUI_CpKOI8_R },
+ { "KOI8-U", MSGTR_GUI_CpKOI8_U },
+ { "KOI8-RU", MSGTR_GUI_CpKOI8_RU },
+ { "BIG5", MSGTR_GUI_CpBIG5 },
+ { "SHIFT-JIS", MSGTR_GUI_CpShiftJis },
+ { "CP1250", MSGTR_GUI_Cp1250},
+ { "CP1251", MSGTR_GUI_Cp1251},
+ { "CP1252", MSGTR_GUI_Cp1252 },
+ { "CP1253", MSGTR_GUI_Cp1253 },
+ { "CP1254", MSGTR_GUI_Cp1254 },
+ { "CP1255", MSGTR_GUI_Cp1255 },
+ { "CP1256", MSGTR_GUI_Cp1256 },
+ { "CP1257", MSGTR_GUI_Cp1257 },
+ { "CP1258", MSGTR_GUI_Cp1258 },
+ { "CP874", MSGTR_GUI_Cp874 },
+ { "CP932", MSGTR_GUI_Cp932 },
+ { "CP936", MSGTR_GUI_Cp936 },
+ { "CP949", MSGTR_GUI_Cp949 },
+ { "CP950", MSGTR_GUI_Cp950 },
+ { ENC_UNICODE, MSGTR_GUI_CpUnicode },
{ NULL,NULL }
};
#endif
@@ -245,7 +245,7 @@ static void prEntry( GtkEditable * edita
if ( lEncoding[i].comment ) mplayer( MPLAYER_SET_SUB_ENCODING,0,lEncoding[i].name );
else
{
- if ( strcmp( comment,MSGTR_PREFERENCES_Default ) == 0 ) comment=NULL;
+ if ( strcmp( comment,MSGTR_GUI__Default_ ) == 0 ) comment=NULL;
mplayer( MPLAYER_SET_SUB_ENCODING,0,(char *)comment );
}
if ( !comment) gtk_widget_set_sensitive( CBSubEncoding,(!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(CBSubUtf8)) && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(CBSubUnicode))) );
@@ -544,7 +544,7 @@ static void prCListRow( GtkCList * clist
gtk_widget_set_sensitive( AConfig,TRUE );
#ifndef CONFIG_GTK2
if ( !strncmp( ao_driver[0],"arts",4 ) )
- gtkMessageBox(MSGBOX_WARNING, MSGTR_PREFERENCES_ArtsBroken);
+ gtkMessageBox(MSGBOX_WARNING, MSGTR_GUI_MSG_aRtsBroken);
#endif
break;
case 1: // video driver
@@ -611,7 +611,7 @@ static GtkWidget * CreatePreferences( vo
accel_group=gtk_accel_group_new();
Preferences=gtk_window_new( GTK_WINDOW_TOPLEVEL );
- gtk_window_set_title( GTK_WINDOW( Preferences ),MSGTR_Preferences );
+ gtk_window_set_title( GTK_WINDOW( Preferences ),MSGTR_GUI_Preferences );
gtk_window_set_position( GTK_WINDOW( Preferences ),GTK_WIN_POS_CENTER );
gtk_window_set_wmclass( GTK_WINDOW( Preferences ),"Preferences",MPlayer );
@@ -645,9 +645,9 @@ static GtkWidget * CreatePreferences( vo
gtk_clist_set_shadow_type( GTK_CLIST( CLADrivers ),GTK_SHADOW_NONE );
gtk_widget_set_usize( CLADrivers,250,-2 );
gtk_clist_set_column_widget( GTK_CLIST( CLADrivers ),0,
- gtkAddLabel( MSGTR_PREFERENCES_AvailableDrivers,NULL ) );
+ gtkAddLabel( MSGTR_GUI_AvailableDrivers,NULL ) );
- AConfig=gtkAddButton( MSGTR_ConfigDriver,
+ AConfig=gtkAddButton( MSGTR_GUI_ConfigureDriver,
gtkAddHButtonBox( vbox2 ) );
vbox3=gtkAddVBox(
@@ -655,28 +655,28 @@ static GtkWidget * CreatePreferences( vo
gtkAddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox1,0 ),1 ),0 );
gtk_widget_set_usize( vbox3,250,-2 );
- CBNormalize=gtkAddCheckButton( MSGTR_PREFERENCES_NormalizeSound,vbox3 );
- CBAudioEqualizer=gtkAddCheckButton( MSGTR_PREFERENCES_EnableEqualizer,vbox3 );
- CBSoftwareMixer=gtkAddCheckButton( MSGTR_PREFERENCES_SoftwareMixer,vbox3 );
+ CBNormalize=gtkAddCheckButton( MSGTR_GUI_NormalizeSound,vbox3 );
+ CBAudioEqualizer=gtkAddCheckButton( MSGTR_GUI_EnableEqualizer,vbox3 );
+ CBSoftwareMixer=gtkAddCheckButton( MSGTR_GUI_EnableSoftwareMixer,vbox3 );
#if 0
CBSurround=gtkAddCheckButton( "Enable surround",vbox3 );
#endif
gtkAddHSeparator( vbox3 );
- CBExtraStereo=gtkAddCheckButton( MSGTR_PREFERENCES_ExtraStereo,vbox3 );
+ CBExtraStereo=gtkAddCheckButton( MSGTR_GUI_EnableExtraStereo,vbox3 );
hbox8=gtkAddHBox( vbox3,1 );
- /*label=*/gtkAddLabel( MSGTR_PREFERENCES_Coefficient":",hbox8 );
+ /*label=*/gtkAddLabel( MSGTR_GUI_Coefficient":",hbox8 );
// gtk_misc_set_padding( GTK_MISC( label ),20,0 );
HSExtraStereoMuladj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-10,10,0.1,0,0 ) );
HSExtraStereoMul=gtkAddHScale( HSExtraStereoMuladj,hbox8,1 );
gtkAddHSeparator( vbox3 );
hbox8=gtkAddHBox( vbox3,1 );
- gtkAddLabel( MSGTR_PREFERENCES_AudioDelay":",hbox8 );
+ gtkAddLabel( MSGTR_GUI_AudioDelay":",hbox8 );
HSAudioDelayadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-10,10,0.01,0,0 ) );
HSAudioDelay=gtkAddHScale( HSAudioDelayadj,hbox8,2 );
- label=gtkAddLabel( MSGTR_PREFERENCES_Audio,NULL );
+ label=gtkAddLabel( MSGTR_GUI_Audio,NULL );
gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),0 ),label );
/* 2nd page */
@@ -700,31 +700,31 @@ static GtkWidget * CreatePreferences( vo
gtk_clist_set_shadow_type( GTK_CLIST( CLVDrivers ),GTK_SHADOW_NONE );
gtk_widget_set_usize( CLVDrivers,250,-2 );
- label=gtkAddLabel( MSGTR_PREFERENCES_AvailableDrivers,NULL );
+ label=gtkAddLabel( MSGTR_GUI_AvailableDrivers,NULL );
gtk_clist_set_column_widget( GTK_CLIST( CLVDrivers ),0,label );
hbuttonbox3=gtkAddHButtonBox( vbox4 );
- VConfig=gtkAddButton( MSGTR_ConfigDriver,hbuttonbox3 );
+ VConfig=gtkAddButton( MSGTR_GUI_ConfigureDriver,hbuttonbox3 );
vbox5=gtkAddVBox(
gtkAddFrame( NULL,GTK_SHADOW_NONE,
gtkAddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox2,0 ),1 ),0 );
gtk_widget_set_usize( vbox5,250,-2 );
- CBDoubleBuffer=gtkAddCheckButton( MSGTR_PREFERENCES_DoubleBuffer,vbox5 );
- CBDR=gtkAddCheckButton( MSGTR_PREFERENCES_DirectRender,vbox5 );
- CBFramedrop=gtkAddCheckButton( MSGTR_PREFERENCES_FrameDrop,vbox5 );
- CBHFramedrop=gtkAddCheckButton( MSGTR_PREFERENCES_HFrameDrop,vbox5 );
- CBFlip=gtkAddCheckButton( MSGTR_PREFERENCES_Flip,vbox5 );
+ CBDoubleBuffer=gtkAddCheckButton( MSGTR_GUI_EnableDoubleBuffering,vbox5 );
+ CBDR=gtkAddCheckButton( MSGTR_GUI_EnableDirectRendering,vbox5 );
+ CBFramedrop=gtkAddCheckButton( MSGTR_GUI_EnableFrameDropping,vbox5 );
+ CBHFramedrop=gtkAddCheckButton( MSGTR_GUI_EnableFrameDroppingIntense,vbox5 );
+ CBFlip=gtkAddCheckButton( MSGTR_GUI_Flip,vbox5 );
table1=gtk_table_new( 2,2,FALSE );
gtk_widget_show( table1 );
gtk_box_pack_start( GTK_BOX( vbox5 ),table1,FALSE,FALSE,0 );
- label=gtkAddLabel( MSGTR_PREFERENCES_Panscan":",NULL );
+ label=gtkAddLabel( MSGTR_GUI_PanAndScan":",NULL );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
- label=gtkAddLabel( MSGTR_PREFERENCES_FPS":",NULL );
+ label=gtkAddLabel( MSGTR_GUI_FrameRate":",NULL );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
HSPanscanadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,1,0.001,0,0 ) );
@@ -737,7 +737,7 @@ static GtkWidget * CreatePreferences( vo
gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( HSFPS ),TRUE );
gtk_table_attach( GTK_TABLE( table1 ),HSFPS,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
- label=gtkAddLabel( MSGTR_PREFERENCES_Video,NULL );
+ label=gtkAddLabel( MSGTR_GUI_Video,NULL );
gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),1 ),label );
/* 3rd page */
@@ -746,21 +746,21 @@ static GtkWidget * CreatePreferences( vo
vbox600=gtkAddVBox(
gtkAddFrame( NULL,GTK_SHADOW_NONE,
- gtkAddFrame( MSGTR_PREFERENCES_FRAME_OSD_Level,GTK_SHADOW_ETCHED_OUT,vbox6,0 ),1 ),0 );
+ gtkAddFrame( MSGTR_GUI_OsdLevel,GTK_SHADOW_ETCHED_OUT,vbox6,0 ),1 ),0 );
- RBOSDNone=gtkAddRadioButton( MSGTR_PREFERENCES_OSD_LEVEL0,&OSD_group,vbox600 );
- RBOSDIndicator=gtkAddRadioButton( MSGTR_PREFERENCES_OSD_LEVEL1,&OSD_group,vbox600 );
- RBOSDTandP=gtkAddRadioButton( MSGTR_PREFERENCES_OSD_LEVEL2,&OSD_group,vbox600 );
- RBOSDTPTT=gtkAddRadioButton( MSGTR_PREFERENCES_OSD_LEVEL3,&OSD_group,vbox600 );
+ RBOSDNone=gtkAddRadioButton( MSGTR_GUI_OsdLevel0,&OSD_group,vbox600 );
+ RBOSDIndicator=gtkAddRadioButton( MSGTR_GUI_OsdLevel1,&OSD_group,vbox600 );
+ RBOSDTandP=gtkAddRadioButton( MSGTR_GUI_OsdLevel2,&OSD_group,vbox600 );
+ RBOSDTPTT=gtkAddRadioButton( MSGTR_GUI_OsdLevel3,&OSD_group,vbox600 );
vbox7=gtkAddVBox(
gtkAddFrame( NULL,GTK_SHADOW_NONE,
- gtkAddFrame( MSGTR_PREFERENCES_FRAME_Subtitle,GTK_SHADOW_ETCHED_OUT,vbox6,0 ),1 ),0 );
+ gtkAddFrame( MSGTR_GUI_Subtitle,GTK_SHADOW_ETCHED_OUT,vbox6,0 ),1 ),0 );
#if 0
hbox4=gtkAddHBox( vbox7,1 );
- gtkAddLabel( MSGTR_PREFERENCES_Subtitle":",hbox4 );
+ gtkAddLabel( MSGTR_GUI_Subtitle":",hbox4 );
ESubtitleName=gtk_entry_new();
gtk_widget_show( ESubtitleName );
@@ -768,7 +768,7 @@ static GtkWidget * CreatePreferences( vo
hbuttonbox4=gtkAddHButtonBox( hbuttonbox4 );
gtk_container_set_border_width( GTK_CONTAINER( hbuttonbox4 ),3 );
- BLoadSubtitle=gtkAddButton( MSGTR_Browse,hbuttonbox4 );
+ BLoadSubtitle=gtkAddButton( MSGTR_GUI_Browse,hbuttonbox4 );
#endif
vbox8=gtkAddVBox( vbox7,0 );
@@ -777,16 +777,16 @@ static GtkWidget * CreatePreferences( vo
gtk_widget_show( table1 );
gtk_box_pack_start( GTK_BOX( vbox8 ),table1,FALSE,FALSE,0 );
- label=gtkAddLabel( MSGTR_PREFERENCES_SUB_Delay":",NULL );
+ label=gtkAddLabel( MSGTR_GUI_Delay":",NULL );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
- label=gtkAddLabel( MSGTR_PREFERENCES_SUB_POS":",NULL );
+ label=gtkAddLabel( MSGTR_GUI_Position":",NULL );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
- label=gtkAddLabel( MSGTR_PREFERENCES_SUB_FPS":",NULL );
+ label=gtkAddLabel( MSGTR_GUI_FrameRate":",NULL );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
- label=gtkAddLabel( MSGTR_PREFERENCES_FontEncoding":",NULL );
+ label=gtkAddLabel( MSGTR_GUI_Encoding":",NULL );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_FILL ),0,0 );
HSSubDelayadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-10.0,10,0.01,0,0 ) );
@@ -812,7 +812,7 @@ static GtkWidget * CreatePreferences( vo
CBSubEncoding=gtk_combo_new();
gtk_widget_show( CBSubEncoding );
gtk_box_pack_start( GTK_BOX( vbox10 ),CBSubEncoding,TRUE,FALSE,0 );
- CBSubEncoding_items=g_list_append( CBSubEncoding_items,MSGTR_PREFERENCES_Default );
+ CBSubEncoding_items=g_list_append( CBSubEncoding_items,MSGTR_GUI__Default_ );
{
int i, listed=(sub_cp == NULL);
@@ -845,31 +845,31 @@ static GtkWidget * CreatePreferences( vo
vbox9=gtkAddVBox( vbox8,0 );
- CBSubOverlap=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_Overlap,vbox9 );
- CBNoAutoSub=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_AutoLoad,vbox9 );
- CBSubUtf8=gtkAddCheckButton( MSGTR_PREFERENCES_FontEncoding24,hbox3 );
- CBSubUnicode=gtkAddCheckButton( MSGTR_PREFERENCES_FontEncoding1,hbox3 );
- CBDumpMPSub=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_MPSUB,vbox9 );
- CBDumpSrt=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_SRT,vbox9 );
+ CBSubOverlap=gtkAddCheckButton( MSGTR_GUI_SubtitleAllowOverlap,vbox9 );
+ CBNoAutoSub=gtkAddCheckButton( MSGTR_GUI_SubtitleAutomaticLoad,vbox9 );
+ CBSubUtf8=gtkAddCheckButton( MSGTR_GUI_CpUTF8,hbox3 );
+ CBSubUnicode=gtkAddCheckButton( MSGTR_GUI_CpUnicode,hbox3 );
+ CBDumpMPSub=gtkAddCheckButton( MSGTR_GUI_SubtitleConvertMpsub,vbox9 );
+ CBDumpSrt=gtkAddCheckButton( MSGTR_GUI_SubtitleConvertSrt,vbox9 );
gtkAddHSeparator( vbox9 );
- CBUseASS=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_USE_ASS,vbox9 );
+ CBUseASS=gtkAddCheckButton( MSGTR_GUI_EnableAssSubtitle,vbox9 );
hbox9=gtkAddHBox( vbox9,0 );
- CBASSUseMargins=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_ASS_USE_MARGINS,hbox9 );
+ CBASSUseMargins=gtkAddCheckButton( MSGTR_GUI_SubtitleAddMargins,hbox9 );
hbox91=gtk_hbox_new( FALSE,0 );
gtk_box_pack_start( GTK_BOX( hbox9 ),hbox91,TRUE,FALSE,0 );
gtk_widget_show( hbox91 );
- SBASSTopMargin=gtkAddSpinButton( MSGTR_PREFERENCES_SUB_ASS_TOP_MARGIN":",
+ SBASSTopMargin=gtkAddSpinButton( MSGTR_GUI_Top":",
(GtkAdjustment *)gtk_adjustment_new(0,0,512,1,8,0),hbox91 );
hbox92=gtk_hbox_new( FALSE,0 );
gtk_box_pack_start( GTK_BOX( hbox9 ),hbox92,TRUE,FALSE,0 );
gtk_widget_show( hbox92 );
- SBASSBottomMargin=gtkAddSpinButton( MSGTR_PREFERENCES_SUB_ASS_BOTTOM_MARGIN":",
+ SBASSBottomMargin=gtkAddSpinButton( MSGTR_GUI_Bottom":",
(GtkAdjustment *)gtk_adjustment_new(0,0,512,1,8,0),hbox92 );
- label=gtkAddLabel( MSGTR_PREFERENCES_SubtitleOSD,NULL );
+ label=gtkAddLabel( MSGTR_GUI_OSD_Subtitles,NULL );
gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),2 ),label );
vbox601=gtkAddVBox( notebook1,0 );
@@ -880,32 +880,32 @@ static GtkWidget * CreatePreferences( vo
gtkAddFrame( NULL,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 );
hbox6=gtkAddHBox( vbox603,1 );
- gtkAddLabel( MSGTR_PREFERENCES_Font":",hbox6 );
+ gtkAddLabel( MSGTR_GUI_Font":",hbox6 );
prEFontName=gtk_entry_new();
gtk_widget_show( prEFontName );
gtk_box_pack_start( GTK_BOX( hbox6 ),prEFontName,TRUE,TRUE,0 );
hbuttonbox5=gtkAddHButtonBox( hbox6 );
gtk_container_set_border_width( GTK_CONTAINER( hbuttonbox5 ),3 );
- BLoadFont=gtkAddButton( MSGTR_Browse,hbuttonbox5 );
+ BLoadFont=gtkAddButton( MSGTR_GUI_Browse,hbuttonbox5 );
#ifdef CONFIG_FREETYPE
table1=gtk_table_new( 6,2,FALSE );
gtk_widget_show( table1 );
gtk_box_pack_start( GTK_BOX( vbox603 ),table1,FALSE,FALSE,0 );
- label=gtkAddLabel( MSGTR_PREFERENCES_FontAutoScaleMode":",NULL );
+ label=gtkAddLabel( MSGTR_GUI_ScaleMode":",NULL );
gtk_misc_set_alignment( GTK_MISC( label ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_FILL ),0,0 );
vbox11=gtkAddVBox( NULL,0 );
gtk_table_attach( GTK_TABLE( table1 ),vbox11,1,2,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
- RBFontNoAutoScale=gtkAddRadioButton( MSGTR_PREFERENCES_FontNoAutoScale,&Font_group,vbox11 );
- RBFontAutoScaleHeight=gtkAddRadioButton( MSGTR_PREFERENCES_FontPropHeight,&Font_group,vbox11 );
- RBFontAutoScaleWidth=gtkAddRadioButton( MSGTR_PREFERENCES_FontPropWidth,&Font_group,vbox11 );
- RBFontAutoScaleDiagonal=gtkAddRadioButton( MSGTR_PREFERENCES_FontPropDiagonal,&Font_group,vbox11 );
+ RBFontNoAutoScale=gtkAddRadioButton( MSGTR_GUI_ScaleNo,&Font_group,vbox11 );
+ RBFontAutoScaleHeight=gtkAddRadioButton( MSGTR_GUI_ScaleMovieHeight,&Font_group,vbox11 );
+ RBFontAutoScaleWidth=gtkAddRadioButton( MSGTR_GUI_ScaleMovieWidth,&Font_group,vbox11 );
+ RBFontAutoScaleDiagonal=gtkAddRadioButton( MSGTR_GUI_ScaleMovieDiagonal,&Font_group,vbox11 );
- label=gtkAddLabel( MSGTR_PREFERENCES_FontEncoding":",NULL );
+ label=gtkAddLabel( MSGTR_GUI_Encoding":",NULL );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
CBFontEncoding=gtk_combo_new();
@@ -942,28 +942,28 @@ static GtkWidget * CreatePreferences( vo
gtk_entry_set_editable( GTK_ENTRY( EFontEncoding ),FALSE );
gtk_widget_show( EFontEncoding );
- label=gtkAddLabel( MSGTR_PREFERENCES_FontBlur":",NULL );
+ label=gtkAddLabel( MSGTR_GUI_Blur":",NULL );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
HSFontBluradj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0.1,0,0 ) );
HSFontBlur=gtkAddHScale( HSFontBluradj,NULL,2 );
gtk_table_attach( GTK_TABLE( table1 ),HSFontBlur,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
- label=gtkAddLabel( MSGTR_PREFERENCES_FontOutLine":",NULL );
+ label=gtkAddLabel( MSGTR_GUI_Outline":",NULL );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
HSFontOutLineadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0.1,0,0 ) );
HSFontOutLine=gtkAddHScale( HSFontOutLineadj,NULL,2 );
gtk_table_attach( GTK_TABLE( table1 ),HSFontOutLine,1,2,3,4,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
- label=gtkAddLabel( MSGTR_PREFERENCES_FontTextScale":",NULL );
+ label=gtkAddLabel( MSGTR_GUI_SizeSubtitles":",NULL );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,4,5,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
HSFontTextScaleadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0.1,0,0 ) );
HSFontTextScale=gtkAddHScale( HSFontTextScaleadj,NULL,2 );
gtk_table_attach( GTK_TABLE( table1 ),HSFontTextScale,1,2,4,5,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
- label=gtkAddLabel( MSGTR_PREFERENCES_FontOSDScale":",NULL );
+ label=gtkAddLabel( MSGTR_GUI_SizeOSD":",NULL );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,5,6,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
HSFontOSDScaleadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0.1,0,0 ) );
@@ -971,12 +971,12 @@ static GtkWidget * CreatePreferences( vo
gtk_table_attach( GTK_TABLE( table1 ),HSFontOSDScale,1,2,5,6,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
#else
hbox7=gtkAddHBox( vbox603,1 );
- gtkAddLabel( MSGTR_PREFERENCES_FontOutLine":",hbox7 );
+ gtkAddLabel( MSGTR_GUI_Outline":",hbox7 );
HSFontFactoradj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,10,0.05,0,0 ) );
HSFontFactor=gtkAddHScale( HSFontFactoradj,hbox7,2 );
#endif
- label=gtkAddLabel( MSGTR_PREFERENCES_FRAME_Font,NULL );
+ label=gtkAddLabel( MSGTR_GUI_Font,NULL );
gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),3 ),label );
/* 5th page */
@@ -985,18 +985,18 @@ static GtkWidget * CreatePreferences( vo
vbox602=gtkAddVBox(
gtkAddFrame( NULL,GTK_SHADOW_NONE,
- gtkAddFrame( MSGTR_PREFERENCES_FRAME_Demuxer,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 );
+ gtkAddFrame( MSGTR_GUI_Demuxer,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 );
- CBNonInterlaved=gtkAddCheckButton( MSGTR_PREFERENCES_NI,vbox602 );
- CBIndex=gtkAddCheckButton( MSGTR_PREFERENCES_IDX,vbox602 );
+ CBNonInterlaved=gtkAddCheckButton( MSGTR_GUI_NonInterleavedParser,vbox602 );
+ CBIndex=gtkAddCheckButton( MSGTR_GUI_SeekingInBrokenMedia,vbox602 );
vbox604=gtkAddVBox(
gtkAddFrame( NULL,GTK_SHADOW_NONE,
- gtkAddFrame( MSGTR_PREFERENCES_FRAME_Codecs,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 );
+ gtkAddFrame( MSGTR_GUI_Codecs,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 );
hbox5=gtkAddHBox( vbox604,1 );
- gtkAddLabel( MSGTR_PREFERENCES_VideoCodecFamily":",hbox5 );
+ gtkAddLabel( MSGTR_GUI_CodecFamilyVideo":",hbox5 );
CBVFM=gtk_combo_new();
gtk_widget_show( CBVFM );
@@ -1008,7 +1008,7 @@ static GtkWidget * CreatePreferences( vo
hbox5=gtkAddHBox( vbox604,1 );
- gtkAddLabel( MSGTR_PREFERENCES_AudioCodecFamily":",hbox5 );
+ gtkAddLabel( MSGTR_GUI_CodecFamilyAudio":",hbox5 );
CBAFM=gtk_combo_new();
gtk_widget_show( CBAFM );
@@ -1018,7 +1018,7 @@ static GtkWidget * CreatePreferences( vo
gtk_entry_set_editable( GTK_ENTRY( EAFM ),FALSE );
gtk_widget_show( EAFM );
- label=gtkAddLabel( MSGTR_PREFERENCES_Codecs,NULL );
+ label=gtkAddLabel( MSGTR_GUI_Demuxers_Codecs,NULL );
gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),4 ),label );
vbox601=gtkAddVBox( notebook1,0 );
@@ -1027,13 +1027,13 @@ static GtkWidget * CreatePreferences( vo
vbox602=gtkAddVBox(
gtkAddFrame( NULL,GTK_SHADOW_NONE,
- gtkAddFrame( MSGTR_PREFERENCES_FRAME_PostProcess,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 );
+ gtkAddFrame( MSGTR_GUI_PostProcessing,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 );
- CBPostprocess=gtkAddCheckButton( MSGTR_PREFERENCES_PostProcess,vbox602 );
+ CBPostprocess=gtkAddCheckButton( MSGTR_GUI_EnablePostProcessing,vbox602 );
hbox5=gtkAddHBox( vbox602,1 );
- gtkAddLabel( MSGTR_PREFERENCES_AutoQuality":",hbox5 );
+ gtkAddLabel( MSGTR_GUI_MaximumUsageSpareCPU":",hbox5 );
if ( guiInfo.sh_video && guiInfo.Playing ) HSPPQualityadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,get_video_quality_max( guiInfo.sh_video ),0,0,0 ) );
else HSPPQualityadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0,0,0 ) );
@@ -1041,13 +1041,13 @@ static GtkWidget * CreatePreferences( vo
vbox602=gtkAddVBox(
gtkAddFrame( NULL,GTK_SHADOW_NONE,
- gtkAddFrame( MSGTR_PREFERENCES_FRAME_Cache,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 );
+ gtkAddFrame( MSGTR_GUI_Cache,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 );
- CBCache=gtkAddCheckButton( MSGTR_PREFERENCES_Cache,vbox602 );
+ CBCache=gtkAddCheckButton( MSGTR_GUI_EnableCache,vbox602 );
hbox5=gtkAddHBox( vbox602,1 );
- gtkAddLabel( MSGTR_PREFERENCES_CacheSize":",hbox5 );
+ gtkAddLabel( MSGTR_GUI_CacheSize":",hbox5 );
SBCacheadj=GTK_ADJUSTMENT( gtk_adjustment_new( gtkCacheSize,32,0x7fffffff,1,32,0 ) );
SBCache=gtk_spin_button_new( GTK_ADJUSTMENT( SBCacheadj ),1,0 );
@@ -1056,21 +1056,21 @@ static GtkWidget * CreatePreferences( vo
vbox602=gtkAddVBox(
gtkAddFrame( NULL,GTK_SHADOW_NONE,
- gtkAddFrame( MSGTR_PREFERENCES_FRAME_Misc,GTK_SHADOW_ETCHED_OUT,vbox601,1 ),1 ),0 );
+ gtkAddFrame( MSGTR_GUI_Miscellaneous,GTK_SHADOW_ETCHED_OUT,vbox601,1 ),1 ),0 );
- CBShowVideoWindow=gtkAddCheckButton( MSGTR_PREFERENCES_ShowVideoWindow,vbox602 );
- CBLoadFullscreen=gtkAddCheckButton( MSGTR_PREFERENCES_LoadFullscreen,vbox602 );
- CBSaveWinPos=gtkAddCheckButton( MSGTR_PREFERENCES_SaveWinPos,vbox602 );
- CBStopXScreenSaver=gtkAddCheckButton( MSGTR_PREFERENCES_XSCREENSAVER,vbox602 );
- CBPlayBar=gtkAddCheckButton( MSGTR_PREFERENCES_PlayBar,vbox602 );
- CBTVDigital=gtkAddCheckButton( MSGTR_PREFERENCES_TV_Digital,vbox602 );
- CBNoIdle=gtkAddCheckButton( MSGTR_PREFERENCES_NoIdle,vbox602 );
+ CBShowVideoWindow=gtkAddCheckButton( MSGTR_GUI_HideVideoWindow,vbox602 );
+ CBLoadFullscreen=gtkAddCheckButton( MSGTR_GUI_StartFullscreen,vbox602 );
+ CBSaveWinPos=gtkAddCheckButton( MSGTR_GUI_SaveWindowPositions,vbox602 );
+ CBStopXScreenSaver=gtkAddCheckButton( MSGTR_GUI_TurnOffXScreenSaver,vbox602 );
+ CBPlayBar=gtkAddCheckButton( MSGTR_GUI_EnablePlaybar,vbox602 );
+ CBTVDigital=gtkAddCheckButton( MSGTR_GUI_EnableDigitalTV,vbox602 );
+ CBNoIdle=gtkAddCheckButton( MSGTR_GUI_QuitAfterPlaying,vbox602 );
gtkAddHSeparator( vbox602 );
- CBAutoSync=gtkAddCheckButton( MSGTR_PREFERENCES_AutoSync,vbox602 );
+ CBAutoSync=gtkAddCheckButton( MSGTR_GUI_EnableAutomaticAVSync,vbox602 );
hbox5=gtkAddHBox( vbox602,1 );
- gtkAddLabel( MSGTR_PREFERENCES_AutoSyncValue":",hbox5 );
+ gtkAddLabel( MSGTR_GUI_SyncValue":",hbox5 );
SBAutoSyncadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,10000,1,10,10 ) );
SBAutoSync=gtk_spin_button_new( GTK_ADJUSTMENT( SBAutoSyncadj ),1,0 );
gtk_widget_show( SBAutoSync );
@@ -1082,13 +1082,13 @@ static GtkWidget * CreatePreferences( vo
gtk_widget_show( table1 );
gtk_box_pack_start( GTK_BOX( vbox602 ),table1,FALSE,FALSE,0 );
- label=gtkAddLabel( MSGTR_PREFERENCES_DVDDevice":",NULL );
+ label=gtkAddLabel( MSGTR_GUI_DeviceDVD":",NULL );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
prEDVDDevice=gtk_entry_new();
gtk_widget_show( prEDVDDevice );
gtk_table_attach( GTK_TABLE( table1 ),prEDVDDevice,1,2,0,1,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
- label=gtkAddLabel( MSGTR_PREFERENCES_CDROMDevice":",NULL );
+ label=gtkAddLabel( MSGTR_GUI_DeviceCDROM":",NULL );
gtk_table_attach( GTK_TABLE( table1 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
prECDRomDevice=gtk_entry_new();
gtk_widget_show( prECDRomDevice );
@@ -1096,7 +1096,7 @@ static GtkWidget * CreatePreferences( vo
// gtkAddHSeparator( vbox602 );
- label=gtkAddLabel( MSGTR_PREFERENCES_Misc,NULL );
+ label=gtkAddLabel( MSGTR_GUI_Miscellaneous,NULL );
gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),5 ),label );
/* --- */
@@ -1106,8 +1106,8 @@ static GtkWidget * CreatePreferences( vo
hbuttonbox1=gtkAddHButtonBox( vbox1 );
gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END );
gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 );
- BOk=gtkAddButton( MSGTR_Ok,hbuttonbox1 );
- BCancel=gtkAddButton( MSGTR_Cancel,hbuttonbox1 );
+ BOk=gtkAddButton( MSGTR_GUI_Ok,hbuttonbox1 );
+ BCancel=gtkAddButton( MSGTR_GUI_Cancel,hbuttonbox1 );
gtk_widget_add_accelerator( BOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
gtk_widget_add_accelerator( BCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
@@ -1335,7 +1335,7 @@ void ShowPreferences( void )
GList * Items = NULL;
char * name = NULL;
- Items=g_list_append( Items,MSGTR_PREFERENCES_Default );
+ Items=g_list_append( Items,MSGTR_GUI__Default_ );
for( i=0;mpcodecs_vd_drivers[i];i++ )
{
Items=g_list_append( Items,(char *)mpcodecs_vd_drivers[i]->info->name );
@@ -1351,7 +1351,7 @@ void ShowPreferences( void )
GList * Items = NULL;
char * name = NULL;
- Items=g_list_append( Items,MSGTR_PREFERENCES_Default );
+ Items=g_list_append( Items,MSGTR_GUI__Default_ );
for( i=0;mpcodecs_ad_drivers[i];i++ )
{
Items=g_list_append( Items,(char *)mpcodecs_ad_drivers[i]->info->name );
@@ -1451,7 +1451,7 @@ void ShowPreferences( void )
static int visible = True;
if ( visible )
{
- gtkMessageBox( MSGBOX_INFORMATION,MSGTR_PREFERENCES_Message );
+ gtkMessageBox( MSGBOX_INFORMATION,MSGTR_GUI_MSG_PlaybackNeedsRestart );
visible=False;
}
}
@@ -1564,22 +1564,22 @@ static GList *appendESDDevices(GList *l)
#if defined(CONFIG_OSS_AUDIO) || defined(CONFIG_ALSA) || defined(CONFIG_SDL) || defined (CONFIG_ESD)
// Gets text string from a gtk entry, interpreting
-// MSGTR_PREFERENCES_DriverDefault as null string.
+// MSGTR_GUI_DefaultSetting as null string.
static const char *getGtkEntryText(GtkWidget *from)
{
const char *tmp = gtk_entry_get_text(GTK_ENTRY(from));
- if (strcmp(tmp, MSGTR_PREFERENCES_DriverDefault) == 0) {
+ if (strcmp(tmp, MSGTR_GUI_DefaultSetting) == 0) {
tmp = NULL;
}
return tmp;
}
// Sets text string of a gtk entry, interpreting
-// null string as MSGTR_PREFERENCES_DriverDefault.
+// null string as MSGTR_GUI_DefaultSetting.
static void setGtkEntryText(GtkWidget *dest, char *to)
{
if (!to) {
- to = MSGTR_PREFERENCES_DriverDefault;
+ to = MSGTR_GUI_DefaultSetting;
}
gtk_entry_set_text(GTK_ENTRY(dest),to);
}
@@ -1647,7 +1647,7 @@ static GtkWidget *CreateAudioConfig( voi
GtkAccelGroup *accel_group;
AudioConfig = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title(GTK_WINDOW(AudioConfig), MSGTR_AudioPreferences);
+ gtk_window_set_title(GTK_WINDOW(AudioConfig), MSGTR_GUI_AudioDriverConfiguration);
gtk_window_set_position(GTK_WINDOW(AudioConfig), GTK_WIN_POS_CENTER);
gtk_window_set_policy(GTK_WINDOW(AudioConfig), FALSE, FALSE, TRUE);
gtk_window_set_wmclass(GTK_WINDOW(AudioConfig), "AudioConfig", MPlayer);
@@ -1661,12 +1661,12 @@ static GtkWidget *CreateAudioConfig( voi
gtk_widget_show(table);
gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0);
- label = gtkAddLabel(MSGTR_PREFERENCES_Audio_Device":", NULL);
+ label = gtkAddLabel(MSGTR_GUI_Device":", NULL);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0);
CBAudioDevice = gtkAddCombo(NULL);
gtk_table_attach(GTK_TABLE(table), CBAudioDevice, 1, 2, 0, 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0);
- items = g_list_append(items,(gpointer)MSGTR_PREFERENCES_DriverDefault);
+ items = g_list_append(items,(gpointer)MSGTR_GUI_DefaultSetting);
#ifdef CONFIG_OSS_AUDIO
if (strncmp(ao_driver[0], "oss", 3) == 0)
items = appendOSSDevices(items);
@@ -1690,12 +1690,12 @@ static GtkWidget *CreateAudioConfig( voi
CEAudioDevice = GTK_COMBO(CBAudioDevice)->entry;
gtk_widget_show(CEAudioDevice);
- label = gtkAddLabel(MSGTR_PREFERENCES_Audio_Mixer":", NULL);
+ label = gtkAddLabel(MSGTR_GUI_Mixer":", NULL);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0);
CBAudioMixer = gtkAddCombo(NULL);
gtk_table_attach(GTK_TABLE(table), CBAudioMixer, 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0);
- items = g_list_append(items, (gpointer)MSGTR_PREFERENCES_DriverDefault);
+ items = g_list_append(items, (gpointer)MSGTR_GUI_DefaultSetting);
#ifdef CONFIG_OSS_AUDIO
if (strncmp(ao_driver[0], "oss", 3) == 0)
items = appendOSSMixers(items);
@@ -1711,12 +1711,12 @@ static GtkWidget *CreateAudioConfig( voi
CEAudioMixer = GTK_COMBO(CBAudioMixer)->entry;
gtk_widget_show(CEAudioMixer);
- label = gtkAddLabel(MSGTR_PREFERENCES_Audio_MixerChannel":", NULL);
+ label = gtkAddLabel(MSGTR_GUI_MixerChannel":", NULL);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0);
CBAudioMixerChannel = gtkAddCombo(NULL);
gtk_table_attach(GTK_TABLE(table), CBAudioMixerChannel, 1, 2, 2, 3, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0);
- items = g_list_append(items, (gpointer)MSGTR_PREFERENCES_DriverDefault);
+ items = g_list_append(items, (gpointer)MSGTR_GUI_DefaultSetting);
#ifdef CONFIG_OSS_AUDIO
if (strncmp(ao_driver[0], "oss", 3) == 0)
items = appendOSSMixerChannels(items);
@@ -1737,8 +1737,8 @@ static GtkWidget *CreateAudioConfig( voi
hbuttonbox = gtkAddHButtonBox(vbox);
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox), 10);
- BAudioOk = gtkAddButton(MSGTR_Ok, hbuttonbox);
- BAudioCancel = gtkAddButton(MSGTR_Cancel, hbuttonbox);
+ BAudioOk = gtkAddButton(MSGTR_GUI_Ok, hbuttonbox);
+ BAudioCancel = gtkAddButton(MSGTR_GUI_Cancel, hbuttonbox);
gtk_signal_connect(GTK_OBJECT(AudioConfig), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &AudioConfig);
gtk_signal_connect(GTK_OBJECT(BAudioOk), "clicked", GTK_SIGNAL_FUNC(audioButton), (void*)1);
@@ -1851,7 +1851,7 @@ GtkWidget * CreateDXR3Config( void )
vbox1=gtkAddVBox( gtkAddDialogFrame( DXR3Config ),0 );
vbox2=gtkAddVBox( vbox1,0 );
hbox1=gtkAddHBox( vbox2,1 );
- gtkAddLabel( MSGTR_PREFERENCES_Audio_Device":",hbox1 );
+ gtkAddLabel( MSGTR_GUI_Device":",hbox1 );
CBDevice=gtkAddCombo( hbox1 );
@@ -1869,17 +1869,17 @@ GtkWidget * CreateDXR3Config( void )
gtkAddHSeparator( vbox2 );
vbox3=gtkAddVBox( vbox2,0 );
- gtkAddLabel( MSGTR_PREFERENCES_DXR3_VENC":",vbox3 );
- RBVNone=gtkAddRadioButton( MSGTR_PREFERENCES_DXR3_NoEnc,&VEncoder_group,vbox3 );
- RBVLavc=gtkAddRadioButton( MSGTR_PREFERENCES_DXR3_LAVC,&VEncoder_group,vbox3 );
+ gtkAddLabel( MSGTR_GUI_VideoEncoder":",vbox3 );
+ RBVNone=gtkAddRadioButton( MSGTR_GUI_None,&VEncoder_group,vbox3 );
+ RBVLavc=gtkAddRadioButton( MSGTR_GUI_Lavc,&VEncoder_group,vbox3 );
gtkAddHSeparator( vbox1 );
hbuttonbox1=gtkAddHButtonBox( vbox1 );
gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END );
gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 );
- dxr3BOk=gtkAddButton( MSGTR_Ok,hbuttonbox1 );
- dxr3BCancel=gtkAddButton( MSGTR_Cancel,hbuttonbox1 );
+ dxr3BOk=gtkAddButton( MSGTR_GUI_Ok,hbuttonbox1 );
+ dxr3BCancel=gtkAddButton( MSGTR_GUI_Cancel,hbuttonbox1 );
gtk_widget_add_accelerator( dxr3BOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
gtk_widget_add_accelerator( dxr3BCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
Modified: trunk/gui/dialog/skinbrowser.c
==============================================================================
--- trunk/gui/dialog/skinbrowser.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/dialog/skinbrowser.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -102,7 +102,7 @@ static GtkWidget * CreateSkinBrowser( vo
gtk_widget_set_usize( SkinBrowser,256,320 );
gtk_container_set_border_width( GTK_CONTAINER( SkinBrowser ),1 );
gtk_widget_set_events( SkinBrowser,GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK );
- gtk_window_set_title( GTK_WINDOW( SkinBrowser ),MSGTR_SkinBrowser );
+ gtk_window_set_title( GTK_WINDOW( SkinBrowser ),MSGTR_GUI_SkinBrowser );
gtk_window_set_position( GTK_WINDOW( SkinBrowser ),GTK_WIN_POS_CENTER );
gtk_window_set_policy( GTK_WINDOW( SkinBrowser ),FALSE,FALSE,TRUE );
gtk_window_set_wmclass( GTK_WINDOW( SkinBrowser ),"SkinBrowser",MPlayer );
@@ -129,7 +129,7 @@ static GtkWidget * CreateSkinBrowser( vo
gtk_clist_set_selection_mode( GTK_CLIST( SkinList ),GTK_SELECTION_SINGLE );
gtk_clist_column_titles_show( GTK_CLIST( SkinList ) );
gtk_clist_set_shadow_type( GTK_CLIST( SkinList ),GTK_SHADOW_ETCHED_OUT );
- gtk_clist_set_column_widget( GTK_CLIST( SkinList ),0, gtkAddLabel( MSGTR_SKIN_LABEL,NULL ) );
+ gtk_clist_set_column_widget( GTK_CLIST( SkinList ),0, gtkAddLabel( MSGTR_GUI_AvailableSkins,NULL ) );
gtkAddHSeparator( vbox5 );
@@ -137,8 +137,8 @@ static GtkWidget * CreateSkinBrowser( vo
gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox4 ),GTK_BUTTONBOX_SPREAD );
gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox4 ),10 );
- Ok=gtkAddButton( MSGTR_Ok,hbuttonbox4 );
- Cancel=gtkAddButton( MSGTR_Cancel,hbuttonbox4 );
+ Ok=gtkAddButton( MSGTR_GUI_Ok,hbuttonbox4 );
+ Cancel=gtkAddButton( MSGTR_GUI_Cancel,hbuttonbox4 );
gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
gtk_widget_add_accelerator( Cancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
Modified: trunk/gui/dialog/url.c
==============================================================================
--- trunk/gui/dialog/url.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/dialog/url.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -104,7 +104,7 @@ static GtkWidget *CreateURLDialog(void)
URLDialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_widget_set_usize(URLDialog, 384, -1);
- gtk_window_set_title(GTK_WINDOW(URLDialog), MSGTR_Network);
+ gtk_window_set_title(GTK_WINDOW(URLDialog), MSGTR_GUI_NetworkStreaming);
gtk_window_set_position(GTK_WINDOW(URLDialog), GTK_WIN_POS_CENTER);
gtk_window_set_wmclass(GTK_WINDOW(URLDialog), "Network", MPlayer);
@@ -130,8 +130,8 @@ static GtkWidget *CreateURLDialog(void)
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox1), GTK_BUTTONBOX_END);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox1), 10);
- Ok = gtkAddButton(MSGTR_Ok, hbuttonbox1);
- Cancel = gtkAddButton(MSGTR_Cancel, hbuttonbox1);
+ Ok = gtkAddButton(MSGTR_GUI_Ok, hbuttonbox1);
+ Cancel = gtkAddButton(MSGTR_GUI_Cancel, hbuttonbox1);
geometry.max_width = gdk_screen_get_width(gtk_widget_get_screen(URLDialog));
geometry.max_height = -1;
Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/interface.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -139,7 +139,7 @@ void guiInit(void)
ret = skinRead(skinName);
if (ret == -1 && strcmp(skinName, "default") != 0) {
- mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_SKIN_SKINCFG_SelectedSkinNotFound, skinName);
+ mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_SkinCfgSelectedNotFound, skinName);
skinName = strdup("default");
ret = skinRead(skinName);
@@ -147,11 +147,11 @@ void guiInit(void)
switch (ret) {
case -1:
- gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinNotFound, skinName);
+ gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_SkinCfgNotFound, skinName);
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
case -2:
- gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinCfgError, skinName);
+ gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_SkinCfgError, skinName);
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
@@ -300,7 +300,7 @@ static void add_vf(char *str)
vf_settings[1].name = NULL;
}
- mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_AddingVideoFilter, str);
+ mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_AddingVideoFilter, str);
}
/**
@@ -474,7 +474,7 @@ int gui(int what, void *data)
}
if (!video_driver_list && !video_driver_list[0]) {
- gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_IDFGCVD);
+ gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_VideoOutError);
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
@@ -686,7 +686,7 @@ int gui(int what, void *data)
btnSet(evSetMoviePosition, state);
if (video_driver_list && !gstrcmp(video_driver_list[0], "dxr3") && (((demuxer_t *)mpctx_get_demuxer(guiInfo.mpcontext))->file_format != DEMUXER_TYPE_MPEG_PS) && !gtkVfLAVC) {
- gtkMessageBox(MSGBOX_FATAL, MSGTR_NEEDLAVC);
+ gtkMessageBox(MSGBOX_FATAL, MSGTR_GUI_MSG_DXR3NeedsLavc);
return False;
}
@@ -1114,7 +1114,7 @@ void mplayerLoadSubtitle(const char *nam
return;
if (subdata) {
- mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_DeletingSubtitles);
+ mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_RemovingSubtitle);
sub_free(subdata);
subdata = NULL;
@@ -1142,7 +1142,7 @@ void mplayerLoadSubtitle(const char *nam
}
if (name) {
- mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_LoadingSubtitles, name);
+ mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_LoadingSubtitle, name);
subdata = sub_read_file(name, (guiInfo.sh_video ? guiInfo.sh_video->fps : 0));
Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/skin/skin.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -71,7 +71,7 @@ static void skin_error(const char *forma
vsnprintf(p, sizeof(p), format, ap);
va_end(ap);
- gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_ERRORMESSAGE, linenumber, p);
+ gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_GUI_MSG_SkinErrorMessage, linenumber, p);
}
/**
@@ -84,7 +84,7 @@ static void skin_error(const char *forma
static int section_item(char *item)
{
if (!skin) {
- skin_error(MSGTR_SKIN_ERROR_SECTION, item);
+ skin_error(MSGTR_GUI_MSG_SkinErrorSection, item);
return False;
}
@@ -101,7 +101,7 @@ static int section_item(char *item)
static int window_item(char *item)
{
if (!currWinName[0]) {
- skin_error(MSGTR_SKIN_ERROR_WINDOW, item);
+ skin_error(MSGTR_GUI_MSG_SkinErrorWindow, item);
return False;
}
@@ -118,7 +118,7 @@ static int window_item(char *item)
static int in_window(char *name)
{
if (strcmp(currWinName, name) == 0) {
- skin_error(MSGTR_SKIN_ERROR_ITEM, name);
+ skin_error(MSGTR_GUI_MSG_SkinErrorItem, name);
return 1;
}
@@ -138,7 +138,7 @@ static guiItem *next_item(void)
(*currWinItemIdx)++;
item = &currWinItems[*currWinItemIdx];
} else
- skin_error(MSGTR_SKIN_TooManyItemsDeclared);
+ skin_error(MSGTR_GUI_MSG_SkinTooManyItems);
return item;
}
@@ -155,14 +155,14 @@ static guiItem *next_item(void)
static int item_section(char *in)
{
if (skin) {
- skin_error(MSGTR_SKIN_ERROR_ITEM, "section");
+ skin_error(MSGTR_GUI_MSG_SkinErrorItem, "section");
return 1;
}
if (!strcmp(strlower(in), "movieplayer"))
skin = &guiApp;
else {
- skin_error(MSGTR_SKIN_UNKNOWN_NAME, in);
+ skin_error(MSGTR_GUI_MSG_SkinUnknownName, in);
return 1;
}
@@ -225,7 +225,7 @@ static int item_window(char *in)
return 1;
if (currWinName[0]) {
- skin_error(MSGTR_SKIN_ERROR_ITEM, "window");
+ skin_error(MSGTR_GUI_MSG_SkinErrorItem, "window");
return 1;
}
@@ -251,7 +251,7 @@ static int item_window(char *in)
currWinItemIdx = &skin->IndexOfMenuItems;
currWinItems = skin->menuItems;
} else {
- skin_error(MSGTR_SKIN_UNKNOWN_NAME, in);
+ skin_error(MSGTR_GUI_MSG_SkinUnknownName, in);
return 1;
}
@@ -333,7 +333,7 @@ static int item_base(char *in)
if (!is_video) {
if (!bpRenderMask(&currWin->Bitmap, &currWin->Mask)) {
- skin_error(MSGTR_SKIN_NotEnoughMemory);
+ skin_error(MSGTR_GUI_MSG_SkinMemoryError);
return 1;
}
mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin] mask: %lux%lu\n", currWin->Mask.Width, currWin->Mask.Height);
@@ -412,7 +412,7 @@ static int item_button(char *in)
message = appFindMessage(msg);
if (message == -1) {
- skin_error(MSGTR_SKIN_UnknownMessage, msg);
+ skin_error(MSGTR_GUI_MSG_SkinUnknownMessage, msg);
return 1;
}
@@ -528,7 +528,7 @@ static int item_menu(char *in)
message = appFindMessage(msg);
if (message == -1) {
- skin_error(MSGTR_SKIN_UnknownMessage, msg);
+ skin_error(MSGTR_GUI_MSG_SkinUnknownMessage, msg);
return 1;
}
@@ -592,7 +592,7 @@ static int item_hpotmeter(char *in)
message = appFindMessage(buf);
if (message == -1) {
- skin_error(MSGTR_SKIN_UnknownMessage, buf);
+ skin_error(MSGTR_GUI_MSG_SkinUnknownMessage, buf);
return 1;
}
@@ -705,7 +705,7 @@ static int item_potmeter(char *in)
message = appFindMessage(buf);
if (message == -1) {
- skin_error(MSGTR_SKIN_UnknownMessage, buf);
+ skin_error(MSGTR_GUI_MSG_SkinUnknownMessage, buf);
return 1;
}
@@ -767,19 +767,19 @@ static int item_font(char *in)
// reasons with a meanwhile depreciated second parameter.
switch (fntRead(path, fnt)) {
case -1:
- skin_error(MSGTR_SKIN_NotEnoughMemory);
+ skin_error(MSGTR_GUI_MSG_SkinMemoryError);
return 1;
case -2:
- skin_error(MSGTR_SKIN_FONT_TooManyFontsDeclared);
+ skin_error(MSGTR_GUI_MSG_SkinTooManyFonts);
return 1;
case -3:
- skin_error(MSGTR_SKIN_FONT_FontFileNotFound);
+ skin_error(MSGTR_GUI_MSG_SkinFontFileNotFound);
return 1;
case -4:
- skin_error(MSGTR_SKIN_FONT_FontImageNotFound);
+ skin_error(MSGTR_GUI_MSG_SkinFontImageNotFound);
return 1;
}
@@ -824,7 +824,7 @@ static int item_slabel(char *in)
id = fntFindID(fnt);
if (id < 0) {
- skin_error(MSGTR_SKIN_FONT_NonExistentFont, fnt);
+ skin_error(MSGTR_GUI_MSG_SkinFontNotFound, fnt);
return 1;
}
@@ -844,7 +844,7 @@ static int item_slabel(char *in)
item->label = strdup(txt);
if (!item->label) {
- skin_error(MSGTR_SKIN_NotEnoughMemory);
+ skin_error(MSGTR_GUI_MSG_SkinMemoryError);
return 1;
}
@@ -890,7 +890,7 @@ static int item_dlabel(char *in)
id = fntFindID(fnt);
if (id < 0) {
- skin_error(MSGTR_SKIN_FONT_NonExistentFont, fnt);
+ skin_error(MSGTR_GUI_MSG_SkinFontNotFound, fnt);
return 1;
}
@@ -911,7 +911,7 @@ static int item_dlabel(char *in)
item->label = strdup(txt);
if (!item->label) {
- skin_error(MSGTR_SKIN_NotEnoughMemory);
+ skin_error(MSGTR_GUI_MSG_SkinMemoryError);
return 1;
}
@@ -942,7 +942,7 @@ static int item_decoration(char *in)
strlower(in);
if (strcmp(in, "enable") != 0 && strcmp(in, "disable") != 0) {
- skin_error(MSGTR_SKIN_UnknownParameter, in);
+ skin_error(MSGTR_GUI_MSG_SkinUnknownParameter, in);
return 1;
}
@@ -988,19 +988,19 @@ int skinImageRead(char *fname, guiImage
switch (i) {
case -1:
- skin_error(MSGTR_SKIN_BITMAP_16bit, fname);
+ skin_error(MSGTR_GUI_MSG_SkinErrorBitmap16Bit, fname);
break;
case -2:
- skin_error(MSGTR_SKIN_BITMAP_FileNotFound, fname);
+ skin_error(MSGTR_GUI_MSG_SkinBitmapNotFound, fname);
break;
case -5:
- skin_error(MSGTR_SKIN_BITMAP_PNGReadError, fname);
+ skin_error(MSGTR_GUI_MSG_SkinBitmapPngReadError, fname);
break;
case -8:
- skin_error(MSGTR_SKIN_BITMAP_ConversionError, fname);
+ skin_error(MSGTR_GUI_MSG_SkinBitmapConversionError, fname);
break;
}
@@ -1053,7 +1053,7 @@ int skinRead(char *sname)
skinfname = setname(skinDirInData, sname);
if ((skinfile = fopen(skinfname, "rt")) == NULL) {
- mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_SkinFileNotFound, skinfname);
+ mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_GUI_MSG_SkinFileNotFound, skinfname);
return -1;
}
}
@@ -1091,7 +1091,7 @@ int skinRead(char *sname)
}
if (i == FF_ARRAY_ELEMS(skinItem)) {
- skin_error(MSGTR_SKIN_UNKNOWN_ITEM, item);
+ skin_error(MSGTR_GUI_MSG_SkinUnknownItem, item);
fclose(skinfile);
return -2;
}
@@ -1100,7 +1100,7 @@ int skinRead(char *sname)
fclose(skinfile);
if (linenumber == 0) {
- mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_SkinFileNotReadable, skinfname);
+ mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_GUI_MSG_SkinFileNotReadable, skinfname);
return -1;
}
Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/ui/actions.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -606,7 +606,7 @@ void uiChangeSkin(char *name)
if (skinRead(name) != 0) {
if (skinRead(skinName) != 0) {
- gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinCfgError, skinName);
+ gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_SkinCfgError, skinName);
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
}
Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/ui/main.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -322,7 +322,7 @@ static void uiMainDND(int num,char** fil
}
listMgr(PLAYLIST_ITEM_APPEND,item);
} else {
- mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_NotAFile,str );
+ mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_GUI_MSG_NotAFile1,str );
}
free( str );
}
@@ -345,7 +345,7 @@ void uiMainInit (void)
if (!mainDrawBuffer)
{
- gmp_msg(MSGT_GPLAYER, MSGL_FATAL, "[main] " MSGTR_NEMDB);
+ gmp_msg(MSGT_GPLAYER, MSGL_FATAL, "[main] " MSGTR_GUI_MSG_MemoryErrorWindow);
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
Modified: trunk/gui/ui/menu.c
==============================================================================
--- trunk/gui/ui/menu.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/ui/menu.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -107,8 +107,8 @@ void uiMenuInit( void )
if ( ( menuDrawBuffer = calloc( 1,guiApp.menu.Bitmap.ImageSize ) ) == NULL )
{
- mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[menu] " MSGTR_NEMDB );
- gtkMessageBox( MSGBOX_FATAL,"[menu] " MSGTR_NEMDB );
+ mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[menu] " MSGTR_GUI_MSG_MemoryErrorWindow );
+ gtkMessageBox( MSGBOX_FATAL,"[menu] " MSGTR_GUI_MSG_MemoryErrorWindow );
return;
}
Modified: trunk/gui/ui/playbar.c
==============================================================================
--- trunk/gui/ui/playbar.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/ui/playbar.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -238,7 +238,7 @@ void uiPlaybarInit( void )
if ( ( playbarDrawBuffer = malloc( guiApp.playbar.Bitmap.ImageSize ) ) == NULL )
{
- gmp_msg( MSGT_GPLAYER,MSGL_FATAL,"[playbar] " MSGTR_NEMDB );
+ gmp_msg( MSGT_GPLAYER,MSGL_FATAL,"[playbar] " MSGTR_GUI_MSG_MemoryErrorWindow );
mplayer( MPLAYER_EXIT_GUI, EXIT_ERROR, 0 );
}
Modified: trunk/gui/util/string.c
==============================================================================
--- trunk/gui/util/string.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/util/string.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -299,7 +299,7 @@ char *TranslateFilename(int how, char *f
else if (len > 5 && fname[len - 5] == '.')
fname[len - 5] = 0;
} else
- av_strlcpy(fname, MSGTR_NoFileLoaded, maxlen);
+ av_strlcpy(fname, MSGTR_GUI_MSG_NoFileLoaded, maxlen);
break;
@@ -310,27 +310,27 @@ char *TranslateFilename(int how, char *f
case STREAMTYPE_CDDA:
- snprintf(fname, maxlen, MSGTR_Title, guiInfo.Track);
+ snprintf(fname, maxlen, MSGTR_GUI_TitleN, guiInfo.Track);
break;
case STREAMTYPE_VCD:
- snprintf(fname, maxlen, MSGTR_Title, guiInfo.Track - 1);
+ snprintf(fname, maxlen, MSGTR_GUI_TitleN, guiInfo.Track - 1);
break;
case STREAMTYPE_DVD:
if (guiInfo.Chapter)
- snprintf(fname, maxlen, MSGTR_Chapter, guiInfo.Chapter);
+ snprintf(fname, maxlen, MSGTR_GUI_ChapterN, guiInfo.Chapter);
else
- av_strlcpy(fname, MSGTR_NoChapter, maxlen);
+ av_strlcpy(fname, MSGTR_GUI_NoChapter, maxlen);
break;
case STREAMTYPE_TV:
case STREAMTYPE_DVB:
- p = MSGTR_NoChannelName;
+ p = MSGTR_GUI_NoChannelName;
stream = mpctx_get_stream(guiInfo.mpcontext);
if (stream)
@@ -341,7 +341,7 @@ char *TranslateFilename(int how, char *f
default:
- av_strlcpy(fname, MSGTR_NoMediaOpened, maxlen);
+ av_strlcpy(fname, MSGTR_GUI_MSG_NoMediaOpened, maxlen);
break;
}
Modified: trunk/gui/win32/dialogs.c
==============================================================================
--- trunk/gui/win32/dialogs.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/win32/dialogs.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -51,7 +51,7 @@ void mplayerLoadSubtitle(const char *nam
if (subdata)
{
- mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_DeletingSubtitles);
+ mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_RemovingSubtitle);
sub_free(subdata);
subdata = NULL;
vo_sub = NULL;
@@ -75,7 +75,7 @@ void mplayerLoadSubtitle(const char *nam
if (name)
{
- mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_LoadingSubtitles, name);
+ mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_LoadingSubtitle, name);
subdata = sub_read_file(strdup(name), (guiInfo.sh_video ? guiInfo.sh_video->fps : 0));
if (!subdata) mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadSub,name);
sub_name = (malloc(2 * sizeof(char*))); /* when mplayer will be restarted */
@@ -110,7 +110,7 @@ int display_openfilewindow(gui_t *gui, i
"Avisynth Scripts (*.avs)\0*.avs\0"
"Audio Files (*.mp3;*.wav;*.ra)\0*.mp3;*.wav;*.ra\000";
fileopen.nFilterIndex = 0;
- fileopen.lpstrTitle = acp(MSGTR_FileSelect);
+ fileopen.lpstrTitle = acp(MSGTR_GUI_SelectFile);
fileopen.Flags = OFN_ALLOWMULTISELECT | OFN_FILEMUSTEXIST| OFN_LONGNAMES | OFN_EXPLORER| OFN_READONLY | OFN_HIDEREADONLY;
fileopen.lpstrFile = filelist;
fileopen.lpstrCustomFilter = NULL;
@@ -171,7 +171,7 @@ void display_opensubtitlewindow(gui_t *g
subtitleopen.lpstrFilter = "All Files (*.*)\0*.*\0"
"Subtitle Files (*.srt;*.txt;*.vob)\0*.srt;*.txt;*.vob\0";
subtitleopen.nFilterIndex = 0;
- subtitleopen.lpstrTitle = acp(MSGTR_SubtitleSelect);
+ subtitleopen.lpstrTitle = acp(MSGTR_GUI_SelectSubtitle);
subtitleopen.Flags = OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_EXPLORER | OFN_READONLY | OFN_HIDEREADONLY;
subtitleopen.lpstrFile = subtitlefile;
subtitleopen.lpstrCustomFilter = NULL;
@@ -195,7 +195,7 @@ static void display_loadplaylistwindow(g
playlistopen.lpstrFilter = "All Files (*.*)\0*.*\0"
"Playlist Files (*.m3u;*.pls;*.txt)\0*.m3u;*.pls;*.txt\0";
playlistopen.nFilterIndex = 0;
- playlistopen.lpstrTitle = acp(MSGTR_PlaylistSelect);
+ playlistopen.lpstrTitle = acp(MSGTR_GUI_WIN32_SelectPlaylist);
playlistopen.Flags = OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_EXPLORER | OFN_READONLY | OFN_HIDEREADONLY;
playlistopen.lpstrFile = playlistfile;
playlistopen.lpstrCustomFilter = NULL;
@@ -222,7 +222,7 @@ static void display_saveplaylistwindow(g
playlistsave.hInstance = GetModuleHandle(NULL);
playlistsave.lpstrFilter = "Playlist Files (*.pls)\0*.pls\0";
playlistsave.nFilterIndex = 0;
- playlistsave.lpstrTitle = acp(MSGTR_PlaylistSave);
+ playlistsave.lpstrTitle = acp(MSGTR_GUI_WIN32_SavePlaylist);
playlistsave.Flags = OFN_LONGNAMES | OFN_EXPLORER | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY;
playlistsave.lpstrFile = playlistname;
playlistsave.lpstrCustomFilter = NULL;
@@ -270,7 +270,7 @@ static LRESULT CALLBACK OpenUrlWndProc(H
switch (iMsg)
{
case WM_CREATE:
- wdg = CreateWindow("button", acp(MSGTR_Ok),
+ wdg = CreateWindow("button", acp(MSGTR_GUI_Ok),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
4, 43, 80, 25, hwnd,
(HMENU) ID_OK,
@@ -278,7 +278,7 @@ static LRESULT CALLBACK OpenUrlWndProc(H
NULL);
SendMessage(wdg, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- wdg = CreateWindow("button", acp(MSGTR_Cancel),
+ wdg = CreateWindow("button", acp(MSGTR_GUI_Cancel),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
90, 43, 80, 25, hwnd,
(HMENU) ID_CANCEL,
@@ -360,7 +360,7 @@ LRESULT CALLBACK SubUrlWndProc(HWND hwnd
switch (LOWORD(wParam))
{
case VK_RETURN:
- SendMessage(FindWindow(NULL, acp(MSGTR_Network)), WM_COMMAND, (WPARAM) ID_OK, 0);
+ SendMessage(FindWindow(NULL, acp(MSGTR_GUI_NetworkStreaming)), WM_COMMAND, (WPARAM) ID_OK, 0);
break;
}
}
@@ -375,7 +375,7 @@ void display_openurlwindow(gui_t *gui, i
int x, y;
if(add) addurl = TRUE;
- if(FindWindow(NULL, acp(MSGTR_Network))) return;
+ if(FindWindow(NULL, acp(MSGTR_GUI_NetworkStreaming))) return;
wc.style = CS_HREDRAW | CS_VREDRAW;
wc.lpfnWndProc = OpenUrlWndProc;
wc.cbClsExtra = 0;
@@ -384,13 +384,13 @@ void display_openurlwindow(gui_t *gui, i
wc.hCursor = LoadCursor(NULL,IDC_ARROW);
wc.hIcon = gui->icon;
wc.hbrBackground = SOLID_GREY2;
- wc.lpszClassName = acp(MSGTR_Network);
+ wc.lpszClassName = acp(MSGTR_GUI_NetworkStreaming);
wc.lpszMenuName = NULL;
RegisterClass(&wc);
x = (GetSystemMetrics(SM_CXSCREEN) / 2) - (320 / 2);
y = (GetSystemMetrics(SM_CYSCREEN) / 2) - (100 / 2);
- hWnd = CreateWindow(acp(MSGTR_Network),
- acp(MSGTR_Network),
+ hWnd = CreateWindow(acp(MSGTR_GUI_NetworkStreaming),
+ acp(MSGTR_GUI_NetworkStreaming),
WS_POPUPWINDOW | WS_CAPTION,
x,
y,
@@ -408,13 +408,13 @@ void display_openurlwindow(gui_t *gui, i
static void create_playlistmenu(gui_t *gui)
{
gui->playlistmenu = CreatePopupMenu();
- AppendMenu(gui->playlistmenu, MF_STRING, ID_ADDFILE, acp(MSGTR_PLAYLIST_AddFile"..."));
- AppendMenu(gui->playlistmenu, MF_STRING, ID_ADDURL, acp(MSGTR_PLAYLIST_AddURL"..."));
+ AppendMenu(gui->playlistmenu, MF_STRING, ID_ADDFILE, acp(MSGTR_GUI_WIN32_AddFile"..."));
+ AppendMenu(gui->playlistmenu, MF_STRING, ID_ADDURL, acp(MSGTR_GUI_WIN32_AddURL"..."));
AppendMenu(gui->playlistmenu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->playlistmenu, MF_STRING, ID_REMOVE, acp(MSGTR_Remove));
- AppendMenu(gui->playlistmenu, MF_STRING, ID_CLEAR, acp(MSGTR_Clear));
+ AppendMenu(gui->playlistmenu, MF_STRING, ID_REMOVE, acp(MSGTR_GUI_Remove));
+ AppendMenu(gui->playlistmenu, MF_STRING, ID_CLEAR, acp(MSGTR_GUI_Clear));
AppendMenu(gui->playlistmenu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->playlistmenu, MF_STRING, ID_CLOSE, acp(MSGTR_Close));
+ AppendMenu(gui->playlistmenu, MF_STRING, ID_CLOSE, acp(MSGTR_GUI_WIN32_Close));
}
static void updatetracklist(HWND hwnd)
@@ -440,7 +440,7 @@ static LRESULT CALLBACK PlayListWndProc(
{
case WM_CREATE:
{
- wdg = CreateWindow("button", acp(MSGTR_MENU_Play),
+ wdg = CreateWindow("button", acp(MSGTR_GUI_Play),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
4, 10, 80, 25, hwnd,
(HMENU) ID_PLAY,
@@ -448,7 +448,7 @@ static LRESULT CALLBACK PlayListWndProc(
NULL);
SendMessage(wdg, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- wdg = CreateWindow ("button", acp(MSGTR_Up),
+ wdg = CreateWindow ("button", acp(MSGTR_GUI_WIN32_Up),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
4, 37, 80, 25, hwnd,
(HMENU) ID_UP,
@@ -456,7 +456,7 @@ static LRESULT CALLBACK PlayListWndProc(
NULL);
SendMessage(wdg, WM_SETFONT,(WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- wdg = CreateWindow ("button", acp(MSGTR_Down),
+ wdg = CreateWindow ("button", acp(MSGTR_GUI_WIN32_Down),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
4, 64, 80, 25, hwnd,
(HMENU) ID_DOWN,
@@ -464,7 +464,7 @@ static LRESULT CALLBACK PlayListWndProc(
NULL);
SendMessage(wdg, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT),0);
- wdg = CreateWindow ("button", acp(MSGTR_Remove),
+ wdg = CreateWindow ("button", acp(MSGTR_GUI_Remove),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
4, 91, 80, 25, hwnd,
(HMENU) ID_REMOVE,
@@ -472,7 +472,7 @@ static LRESULT CALLBACK PlayListWndProc(
NULL);
SendMessage(wdg, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT),0);
- wdg = CreateWindow ("button", acp(MSGTR_Load),
+ wdg = CreateWindow ("button", acp(MSGTR_GUI_WIN32_Load),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
4, 118, 80, 25, hwnd,
(HMENU) ID_PLAYLISTLOAD,
@@ -480,7 +480,7 @@ static LRESULT CALLBACK PlayListWndProc(
NULL);
SendMessage(wdg, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT),0);
- wdg = CreateWindow ("button", acp(MSGTR_Save),
+ wdg = CreateWindow ("button", acp(MSGTR_GUI_WIN32_Save),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
4, 145, 80, 25, hwnd,
(HMENU) ID_PLAYLISTSAVE,
@@ -488,7 +488,7 @@ static LRESULT CALLBACK PlayListWndProc(
NULL);
SendMessage(wdg, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT),0);
- wdg = CreateWindow ("button", acp(MSGTR_Close),
+ wdg = CreateWindow ("button", acp(MSGTR_GUI_WIN32_Close),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
4, 193, 80, 25, hwnd,
(HMENU) ID_CLOSE,
@@ -610,13 +610,13 @@ static LRESULT CALLBACK PlayListWndProc(
void update_playlistwindow(void)
{
- HWND hWnd = FindWindow(NULL, acp(MSGTR_PlayList));
+ HWND hWnd = FindWindow(NULL, acp(MSGTR_GUI_Playlist));
if (hWnd) updatetracklist(hWnd);
}
void display_playlistwindow(gui_t *gui)
{
- HWND hWnd = FindWindow(NULL, acp(MSGTR_PlayList));
+ HWND hWnd = FindWindow(NULL, acp(MSGTR_GUI_Playlist));
HINSTANCE hInstance = GetModuleHandle(NULL);
WNDCLASS wc;
int x, y;
@@ -635,14 +635,14 @@ void display_playlistwindow(gui_t *gui)
wc.hCursor = LoadCursor(NULL,IDC_ARROW);
wc.hIcon = gui->icon;
wc.hbrBackground = SOLID_GREY2;
- wc.lpszClassName = acp(MSGTR_PlayList);
+ wc.lpszClassName = acp(MSGTR_GUI_Playlist);
wc.lpszMenuName = NULL;
RegisterClass(&wc);
create_playlistmenu(gui);
x = (GetSystemMetrics(SM_CXSCREEN) / 2) - (400 / 2); /* Erik: center popup window on screen */
y = (GetSystemMetrics(SM_CYSCREEN) / 2) - (254 / 2);
- hWnd = CreateWindow(acp(MSGTR_PlayList),
- acp(MSGTR_PlayList),
+ hWnd = CreateWindow(acp(MSGTR_GUI_Playlist),
+ acp(MSGTR_GUI_Playlist),
WS_POPUPWINDOW | WS_CAPTION | WS_MINIMIZEBOX,
x,
y,
@@ -734,7 +734,7 @@ static LRESULT CALLBACK SkinBrowserWndPr
void display_skinbrowser(gui_t* gui)
{
- HWND hWnd = FindWindow(NULL, acp(MSGTR_SkinBrowser));
+ HWND hWnd = FindWindow(NULL, acp(MSGTR_GUI_SkinBrowser));
HINSTANCE hInstance = GetModuleHandle(NULL);
WNDCLASS wc;
int x, y;
@@ -753,13 +753,13 @@ void display_skinbrowser(gui_t* gui)
wc.hCursor = LoadCursor(NULL, IDC_ARROW);
wc.hIcon = gui->icon;
wc.hbrBackground = SOLID_GREY2;
- wc.lpszClassName = acp(MSGTR_SkinBrowser);
+ wc.lpszClassName = acp(MSGTR_GUI_SkinBrowser);
wc.lpszMenuName = NULL;
RegisterClass(&wc);
x = (GetSystemMetrics(SM_CXSCREEN) / 2) - (180 / 2);
y = (GetSystemMetrics(SM_CYSCREEN) / 2) - (102 / 2);
- hWnd = CreateWindow(acp(MSGTR_SkinBrowser),
- acp(MSGTR_SkinBrowser),
+ hWnd = CreateWindow(acp(MSGTR_GUI_SkinBrowser),
+ acp(MSGTR_GUI_SkinBrowser),
WS_POPUPWINDOW |WS_CAPTION,
x,
y,
@@ -786,7 +786,7 @@ static LRESULT CALLBACK TitleChapterWndP
switch (iMsg)
{
case WM_CREATE:
- wdg = CreateWindow("button", acp(MSGTR_Ok),
+ wdg = CreateWindow("button", acp(MSGTR_GUI_Ok),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
4, 43, 80, 25, hwnd,
(HMENU) ID_OK,
@@ -794,7 +794,7 @@ static LRESULT CALLBACK TitleChapterWndP
NULL);
SendMessage(wdg, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- wdg = CreateWindow("button", acp(MSGTR_Cancel),
+ wdg = CreateWindow("button", acp(MSGTR_GUI_Cancel),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
90, 43, 80, 25, hwnd,
(HMENU) ID_CANCEL,
@@ -871,7 +871,7 @@ void display_chapterselwindow(gui_t *gui
int x, y;
if (guiInfo.StreamType != STREAMTYPE_DVD) return;
- if (FindWindow(NULL, acp(MSGTR_SelectTitleChapter"..."))) return;
+ if (FindWindow(NULL, acp(MSGTR_GUI_WIN32_SelectTitleChapter"..."))) return;
wc.style = CS_HREDRAW | CS_VREDRAW;
wc.lpfnWndProc = TitleChapterWndProc;
@@ -881,13 +881,13 @@ void display_chapterselwindow(gui_t *gui
wc.hCursor = LoadCursor(NULL,IDC_ARROW);
wc.hIcon = gui->icon;
wc.hbrBackground = SOLID_GREY2;
- wc.lpszClassName = acp(MSGTR_SelectTitleChapter"...");
+ wc.lpszClassName = acp(MSGTR_GUI_WIN32_SelectTitleChapter"...");
wc.lpszMenuName = NULL;
RegisterClass(&wc);
x = (GetSystemMetrics(SM_CXSCREEN) / 2) - (180 / 2);
y = (GetSystemMetrics(SM_CYSCREEN) / 2) - (100 / 2);
- hWnd = CreateWindow(acp(MSGTR_SelectTitleChapter"..."),
- acp(MSGTR_SelectTitleChapter"..."),
+ hWnd = CreateWindow(acp(MSGTR_GUI_WIN32_SelectTitleChapter"..."),
+ acp(MSGTR_GUI_WIN32_SelectTitleChapter"..."),
WS_POPUPWINDOW | WS_CAPTION,
x,
y,
@@ -910,7 +910,7 @@ static LRESULT CALLBACK EqWndProc(HWND h
{
case WM_CREATE:
{
- btn = CreateWindow("button", acp(MSGTR_Clear),
+ btn = CreateWindow("button", acp(MSGTR_GUI_Clear),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
157, 143, 80, 25, hwnd,
(HMENU) ID_DEFAULTS,
@@ -918,7 +918,7 @@ static LRESULT CALLBACK EqWndProc(HWND h
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_Close),
+ btn = CreateWindow("button", acp(MSGTR_GUI_WIN32_Close),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
243, 143, 80, 25, hwnd,
(HMENU) ID_CLOSE,
@@ -926,7 +926,7 @@ static LRESULT CALLBACK EqWndProc(HWND h
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- label = CreateWindow("static", acp(MSGTR_EQU_Brightness":"),
+ label = CreateWindow("static", acp(MSGTR_GUI_Brightness":"),
WS_CHILD | WS_VISIBLE,
12, 122, 70, 15, hwnd,
NULL,
@@ -934,7 +934,7 @@ static LRESULT CALLBACK EqWndProc(HWND h
NULL);
SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- label = CreateWindow("static", acp(MSGTR_EQU_Contrast":"),
+ label = CreateWindow("static", acp(MSGTR_GUI_Contrast":"),
WS_CHILD | WS_VISIBLE,
99, 122, 70, 15, hwnd,
NULL,
@@ -942,14 +942,14 @@ static LRESULT CALLBACK EqWndProc(HWND h
NULL);
SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- label = CreateWindow("static", acp(MSGTR_EQU_Hue":"),
+ label = CreateWindow("static", acp(MSGTR_GUI_Hue":"),
WS_CHILD | WS_VISIBLE,
191, 122, 70, 15, hwnd,
NULL,
((LPCREATESTRUCT) lParam) -> hInstance, NULL);
SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- label = CreateWindow("static", acp(MSGTR_EQU_Saturation":"),
+ label = CreateWindow("static", acp(MSGTR_GUI_Saturation":"),
WS_CHILD | WS_VISIBLE,
260, 122, 70, 15, hwnd,
NULL,
@@ -1085,7 +1085,7 @@ void display_eqwindow(gui_t *gui)
int x, y;
if(!guiInfo.sh_video) return;
- if(FindWindow(NULL, acp(MSGTR_Equalizer))) return;
+ if(FindWindow(NULL, acp(MSGTR_GUI_Equalizer))) return;
wc.style = CS_HREDRAW | CS_VREDRAW;
wc.lpfnWndProc = EqWndProc;
wc.cbClsExtra = 0;
@@ -1094,13 +1094,13 @@ void display_eqwindow(gui_t *gui)
wc.hCursor = LoadCursor(NULL,IDC_ARROW);
wc.hIcon = gui->icon;
wc.hbrBackground = SOLID_GREY2;
- wc.lpszClassName = acp(MSGTR_Equalizer);
+ wc.lpszClassName = acp(MSGTR_GUI_Equalizer);
wc.lpszMenuName = NULL;
RegisterClass(&wc);
x = (GetSystemMetrics(SM_CXSCREEN) / 2) - (332 / 2);
y = (GetSystemMetrics(SM_CYSCREEN) / 2) - (200 / 2);
- hWnd = CreateWindow(acp(MSGTR_Equalizer),
- acp(MSGTR_Equalizer),
+ hWnd = CreateWindow(acp(MSGTR_GUI_Equalizer),
+ acp(MSGTR_GUI_Equalizer),
WS_POPUPWINDOW | WS_CAPTION,
x,
y,
Modified: trunk/gui/win32/gui.c
==============================================================================
--- trunk/gui/win32/gui.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/win32/gui.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -187,7 +187,7 @@ static void display_about_box(HWND hWnd)
{
char about_msg[512];
snprintf(about_msg, sizeof(about_msg), MP_TITLE "\n" COPYRIGHT, MPlayer);
- MessageBox(hWnd, about_msg, acp(MSGTR_MENU_AboutMPlayer), MB_OK);
+ MessageBox(hWnd, about_msg, acp(MSGTR_GUI_AboutMPlayer), MB_OK);
}
static image *get_drawground(HWND hwnd)
@@ -432,7 +432,7 @@ static LRESULT CALLBACK VideoProc(HWND h
BROWSEINFO bi;
LPITEMIDLIST pidl;
memset(&bi, 0, sizeof(BROWSEINFO));
- bi.lpszTitle = acp(MSGTR_DirectorySelect":");
+ bi.lpszTitle = acp(MSGTR_GUI_WIN32_DirectoryList":");
pidl = SHBrowseForFolder(&bi);
if (SHGetPathFromIDList(pidl, path))
{
@@ -986,7 +986,7 @@ static LRESULT CALLBACK EventProc(HWND h
BROWSEINFO bi;
LPITEMIDLIST pidl;
memset(&bi, 0, sizeof(BROWSEINFO));
- bi.lpszTitle = acp(MSGTR_DirectorySelect":");
+ bi.lpszTitle = acp(MSGTR_GUI_WIN32_DirectoryList":");
pidl = SHBrowseForFolder(&bi);
if (SHGetPathFromIDList(pidl, path))
{
@@ -1198,51 +1198,51 @@ static void create_menu(gui_t *gui)
gui->diskmenu = CreatePopupMenu();
gui->menu=CreatePopupMenu();
gui->trayplaymenu = CreatePopupMenu();
- AppendMenu(gui->menu, MF_STRING | MF_POPUP, (UINT_PTR) gui->trayplaymenu, acp(MSGTR_MENU_Open));
- AppendMenu(gui->trayplaymenu, MF_STRING, IDFILE_OPEN, acp(MSGTR_MENU_PlayFile"..."));
- AppendMenu(gui->trayplaymenu, MF_STRING, IDURL_OPEN, acp(MSGTR_MENU_PlayURL"..."));
- AppendMenu(gui->trayplaymenu, MF_STRING, IDDIR_OPEN, acp(MSGTR_MENU_PlayDirectory"..."));
+ AppendMenu(gui->menu, MF_STRING | MF_POPUP, (UINT_PTR) gui->trayplaymenu, acp(MSGTR_GUI_Open));
+ AppendMenu(gui->trayplaymenu, MF_STRING, IDFILE_OPEN, acp(MSGTR_GUI_File"..."));
+ AppendMenu(gui->trayplaymenu, MF_STRING, IDURL_OPEN, acp(MSGTR_GUI_URL"..."));
+ AppendMenu(gui->trayplaymenu, MF_STRING, IDDIR_OPEN, acp(MSGTR_GUI_Directory"..."));
AppendMenu(gui->menu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->menu, MF_STRING | MF_POPUP, (UINT_PTR) gui->diskmenu, acp(MSGTR_MENU_PlayDisc));
+ AppendMenu(gui->menu, MF_STRING | MF_POPUP, (UINT_PTR) gui->diskmenu, acp(MSGTR_GUI_Play));
AppendMenu(gui->menu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->menu, MF_STRING, IDSUBTITLE_OPEN, acp(MSGTR_MENU_LoadSubtitle"..."));
- AppendMenu(gui->menu, MF_STRING, ID_SKINBROWSER, acp(MSGTR_MENU_SkinBrowser));
+ AppendMenu(gui->menu, MF_STRING, IDSUBTITLE_OPEN, acp(MSGTR_GUI_Subtitle"..."));
+ AppendMenu(gui->menu, MF_STRING, ID_SKINBROWSER, acp(MSGTR_GUI_SkinBrowser));
AppendMenu(gui->menu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->menu, MF_STRING, ID_PREFS, acp(MSGTR_MENU_Preferences));
- AppendMenu(gui->menu, MF_STRING, ID_CONSOLE, acp(MSGTR_MENU_DebugConsole));
- AppendMenu(gui->menu, MF_STRING, ID_ONLINEHELP, acp(MSGTR_MENU_OnlineHelp));
- AppendMenu(gui->menu, MF_STRING, IDHELP_ABOUT, acp(MSGTR_MENU_AboutMPlayer));
+ AppendMenu(gui->menu, MF_STRING, ID_PREFS, acp(MSGTR_GUI_Preferences));
+ AppendMenu(gui->menu, MF_STRING, ID_CONSOLE, acp(MSGTR_GUI_WIN32_DebugConsole));
+ AppendMenu(gui->menu, MF_STRING, ID_ONLINEHELP, acp(MSGTR_GUI_WIN32_OnlineHelp));
+ AppendMenu(gui->menu, MF_STRING, IDHELP_ABOUT, acp(MSGTR_GUI_AboutMPlayer));
AppendMenu(gui->menu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->menu, MF_STRING, IDEXIT, acp(MSGTR_MENU_Exit));
+ AppendMenu(gui->menu, MF_STRING, IDEXIT, acp(MSGTR_GUI_Quit));
}
static void create_traymenu(gui_t *gui)
{
gui->traymenu = CreatePopupMenu();
gui->trayplaybackmenu = CreatePopupMenu();
- AppendMenu(gui->traymenu, MF_STRING | MF_POPUP, (UINT_PTR) gui->trayplaymenu, acp(MSGTR_MENU_Open));
+ AppendMenu(gui->traymenu, MF_STRING | MF_POPUP, (UINT_PTR) gui->trayplaymenu, acp(MSGTR_GUI_Open));
AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->traymenu, MF_STRING | MF_POPUP, (UINT_PTR) gui->trayplaybackmenu, acp(MSGTR_MENU_Playing));
- AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_SEEKB, acp(MSGTR_MENU_SeekBack));
- AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_PTRACK, acp(MSGTR_MENU_PrevStream));
- AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_PLAY, acp(MSGTR_MENU_Play "/" MSGTR_MENU_Pause));
- AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_STOP, acp(MSGTR_MENU_Stop));
- AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_NTRACK, acp(MSGTR_MENU_NextStream));
- AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_SEEKF, acp(MSGTR_MENU_SeekForw));
+ AppendMenu(gui->traymenu, MF_STRING | MF_POPUP, (UINT_PTR) gui->trayplaybackmenu, acp(MSGTR_GUI_Playback));
+ AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_SEEKB, acp(MSGTR_GUI_WIN32_SeekBackwards));
+ AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_PTRACK, acp(MSGTR_GUI_Previous));
+ AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_PLAY, acp(MSGTR_GUI_Play "/" MSGTR_GUI_Pause));
+ AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_STOP, acp(MSGTR_GUI_Stop));
+ AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_NTRACK, acp(MSGTR_GUI_Next));
+ AppendMenu(gui->trayplaybackmenu, MF_STRING, ID_SEEKF, acp(MSGTR_GUI_WIN32_SeekForwards));
AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->traymenu, MF_STRING, ID_MUTE, acp(MSGTR_MENU_Mute));
+ AppendMenu(gui->traymenu, MF_STRING, ID_MUTE, acp(MSGTR_GUI_Mute));
AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->traymenu, MF_STRING, IDSUBTITLE_OPEN, acp(MSGTR_MENU_LoadSubtitle));
- AppendMenu(gui->traymenu, MF_STRING, ID_PLAYLIST, acp(MSGTR_MENU_PlayList));
+ AppendMenu(gui->traymenu, MF_STRING, IDSUBTITLE_OPEN, acp(MSGTR_GUI_Subtitle));
+ AppendMenu(gui->traymenu, MF_STRING, ID_PLAYLIST, acp(MSGTR_GUI_Playlist));
AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->traymenu, MF_STRING, ID_SHOWHIDE, acp(MSGTR_MENU_ShowHide));
+ AppendMenu(gui->traymenu, MF_STRING, ID_SHOWHIDE, acp(MSGTR_GUI_WIN32_ShowHide));
AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->traymenu, MF_STRING, ID_PREFS, acp(MSGTR_MENU_Preferences));
- AppendMenu(gui->traymenu, MF_STRING, ID_CONSOLE, acp(MSGTR_MENU_DebugConsole));
- AppendMenu(gui->traymenu, MF_STRING, ID_ONLINEHELP, acp(MSGTR_MENU_OnlineHelp));
- AppendMenu(gui->traymenu, MF_STRING, IDHELP_ABOUT, acp(MSGTR_MENU_AboutMPlayer));
+ AppendMenu(gui->traymenu, MF_STRING, ID_PREFS, acp(MSGTR_GUI_Preferences));
+ AppendMenu(gui->traymenu, MF_STRING, ID_CONSOLE, acp(MSGTR_GUI_WIN32_DebugConsole));
+ AppendMenu(gui->traymenu, MF_STRING, ID_ONLINEHELP, acp(MSGTR_GUI_WIN32_OnlineHelp));
+ AppendMenu(gui->traymenu, MF_STRING, IDHELP_ABOUT, acp(MSGTR_GUI_AboutMPlayer));
AppendMenu(gui->traymenu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->traymenu, MF_STRING, IDEXIT, acp(MSGTR_MENU_Exit));
+ AppendMenu(gui->traymenu, MF_STRING, IDEXIT, acp(MSGTR_GUI_Quit));
}
static void create_videomenu(gui_t *gui)
@@ -1251,33 +1251,33 @@ static void create_videomenu(gui_t *gui)
gui->dvdmenu = CreatePopupMenu();
gui->aspectmenu = CreatePopupMenu();
gui->subtitlemenu = CreatePopupMenu();
- AppendMenu(gui->videomenu, MF_STRING | MF_POPUP, (UINT_PTR) gui->trayplaymenu, acp(MSGTR_MENU_Open));
+ AppendMenu(gui->videomenu, MF_STRING | MF_POPUP, (UINT_PTR) gui->trayplaymenu, acp(MSGTR_GUI_Open));
AppendMenu(gui->videomenu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->videomenu, MF_STRING, ID_SEEKB, acp(MSGTR_MENU_SeekBack));
- AppendMenu(gui->videomenu, MF_STRING, ID_PTRACK, acp(MSGTR_MENU_PrevStream));
- AppendMenu(gui->videomenu, MF_STRING, ID_PLAY, acp(MSGTR_MENU_Play "/" MSGTR_MENU_Pause));
- AppendMenu(gui->videomenu, MF_STRING, ID_STOP, acp(MSGTR_MENU_Stop));
- AppendMenu(gui->videomenu, MF_STRING, ID_NTRACK, acp(MSGTR_MENU_NextStream));
- AppendMenu(gui->videomenu, MF_STRING, ID_SEEKF, acp(MSGTR_MENU_SeekForw));
+ AppendMenu(gui->videomenu, MF_STRING, ID_SEEKB, acp(MSGTR_GUI_WIN32_SeekBackwards));
+ AppendMenu(gui->videomenu, MF_STRING, ID_PTRACK, acp(MSGTR_GUI_Previous));
+ AppendMenu(gui->videomenu, MF_STRING, ID_PLAY, acp(MSGTR_GUI_Play "/" MSGTR_GUI_Pause));
+ AppendMenu(gui->videomenu, MF_STRING, ID_STOP, acp(MSGTR_GUI_Stop));
+ AppendMenu(gui->videomenu, MF_STRING, ID_NTRACK, acp(MSGTR_GUI_Next));
+ AppendMenu(gui->videomenu, MF_STRING, ID_SEEKF, acp(MSGTR_GUI_WIN32_SeekForwards));
AppendMenu(gui->videomenu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->videomenu, MF_STRING, ID_FULLSCREEN, acp(MSGTR_MENU_FullScreen));
- AppendMenu(gui->videomenu, MF_STRING, ID_MUTE, acp(MSGTR_MENU_Mute));
+ AppendMenu(gui->videomenu, MF_STRING, ID_FULLSCREEN, acp(MSGTR_GUI_SizeFullscreen));
+ AppendMenu(gui->videomenu, MF_STRING, ID_MUTE, acp(MSGTR_GUI_Mute));
AppendMenu(gui->videomenu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->videomenu, MF_STRING | MF_POPUP, (UINT_PTR) gui->aspectmenu, acp(MSGTR_MENU_AspectRatio));
- AppendMenu(gui->videomenu, MF_STRING | MF_POPUP, (UINT_PTR) gui->subtitlemenu, acp(MSGTR_MENU_Subtitles));
+ AppendMenu(gui->videomenu, MF_STRING | MF_POPUP, (UINT_PTR) gui->aspectmenu, acp(MSGTR_GUI_AspectRatio));
+ AppendMenu(gui->videomenu, MF_STRING | MF_POPUP, (UINT_PTR) gui->subtitlemenu, acp(MSGTR_GUI_Subtitles));
#ifdef CONFIG_DVDREAD
- AppendMenu(gui->videomenu, MF_STRING | MF_POPUP, (UINT_PTR) gui->dvdmenu, acp(MSGTR_MENU_DVD));
- AppendMenu(gui->dvdmenu, MF_STRING | MF_GRAYED, ID_CHAPTERSEL, acp(MSGTR_SelectTitleChapter"..."));
+ AppendMenu(gui->videomenu, MF_STRING | MF_POPUP, (UINT_PTR) gui->dvdmenu, acp(MSGTR_GUI_DVD));
+ AppendMenu(gui->dvdmenu, MF_STRING | MF_GRAYED, ID_CHAPTERSEL, acp(MSGTR_GUI_WIN32_SelectTitleChapter"..."));
#endif
- AppendMenu(gui->subtitlemenu, MF_STRING, IDSUB_TOGGLE, acp(MSGTR_MENU_SubtitlesOnOff));
- AppendMenu(gui->subtitlemenu, MF_STRING, IDSUB_CYCLE, acp(MSGTR_MENU_SubtitleLanguages));
+ AppendMenu(gui->subtitlemenu, MF_STRING, IDSUB_TOGGLE, acp(MSGTR_GUI_WIN32_SubtitleOnOff));
+ AppendMenu(gui->subtitlemenu, MF_STRING, IDSUB_CYCLE, acp(MSGTR_GUI_Subtitles));
AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT1, "16:9");
AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT2, "4:3");
- AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT3, acp(MSGTR_MENU_235));
+ AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT3, acp(MSGTR_GUI_235To1));
AppendMenu(gui->aspectmenu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT4, acp(MSGTR_MENU_Original));
+ AppendMenu(gui->aspectmenu, MF_STRING, ID_ASPECT4, acp(MSGTR_GUI_Original));
AppendMenu(gui->videomenu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->videomenu, MF_STRING, IDEXIT, acp(MSGTR_MENU_Exit));
+ AppendMenu(gui->videomenu, MF_STRING, IDEXIT, acp(MSGTR_GUI_Quit));
}
static void maketransparent(HWND hwnd, COLORREF crTransparent)
Modified: trunk/gui/win32/preferences.c
==============================================================================
--- trunk/gui/win32/preferences.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/win32/preferences.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -74,42 +74,42 @@ static LRESULT CALLBACK PrefsWndProc(HWN
case WM_CREATE:
{
/* video and audio drivers */
- label = CreateWindow("static", acp(MSGTR_PREFERENCES_Video),
+ label = CreateWindow("static", acp(MSGTR_GUI_Video),
WS_CHILD | WS_VISIBLE | SS_RIGHT,
10, 14, 60, 15, hwnd,
NULL, ((LPCREATESTRUCT) lParam) -> hInstance,
NULL);
SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- label = CreateWindow("static", acp(MSGTR_PREFERENCES_Audio),
+ label = CreateWindow("static", acp(MSGTR_GUI_Audio),
WS_CHILD | WS_VISIBLE | SS_RIGHT,
205, 14, 60, 15, hwnd,
NULL, ((LPCREATESTRUCT) lParam) -> hInstance,
NULL);
SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- label = CreateWindow("static", acp(MSGTR_PREFERENCES_Coefficient":"),
+ label = CreateWindow("static", acp(MSGTR_GUI_Coefficient":"),
WS_CHILD | WS_VISIBLE | SS_RIGHT,
10, 148, 140, 15, hwnd,
NULL, ((LPCREATESTRUCT) lParam) -> hInstance,
NULL);
SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- label = CreateWindow("static", acp(MSGTR_PREFERENCES_AudioDelay":"),
+ label = CreateWindow("static", acp(MSGTR_GUI_AudioDelay":"),
WS_CHILD | WS_VISIBLE | SS_RIGHT,
10, 187, 140, 15, hwnd,
NULL, ((LPCREATESTRUCT) lParam) -> hInstance,
NULL);
SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- label = CreateWindow("static", acp(MSGTR_PREFERENCES_FRAME_OSD_Level),
+ label = CreateWindow("static", acp(MSGTR_GUI_OsdLevel),
WS_CHILD | WS_VISIBLE,
10, 286, 115, 15, hwnd,
NULL, ((LPCREATESTRUCT) lParam) -> hInstance,
NULL);
SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- label = CreateWindow("static", acp(MSGTR_PREFERENCES_Priority),
+ label = CreateWindow("static", acp(MSGTR_GUI_WIN32_Priority),
WS_CHILD | WS_VISIBLE | SS_RIGHT,
200, 286, 100, 15, hwnd,
NULL, ((LPCREATESTRUCT) lParam) -> hInstance,
@@ -147,7 +147,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
/* checkboxes */
- btn = CreateWindow("button", acp(MSGTR_PREFERENCES_DoubleBuffer),
+ btn = CreateWindow("button", acp(MSGTR_GUI_EnableDoubleBuffering),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
10, 35, 205, 25,
hwnd, (HMENU) ID_DOUBLE,
@@ -155,7 +155,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_PREFERENCES_DirectRender),
+ btn = CreateWindow("button", acp(MSGTR_GUI_EnableDirectRendering),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
10, 57, 205, 25,
hwnd, (HMENU) ID_DIRECT,
@@ -163,7 +163,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_PREFERENCES_FrameDrop),
+ btn = CreateWindow("button", acp(MSGTR_GUI_EnableFrameDropping),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
10, 79, 205, 25,
hwnd, (HMENU) ID_FRAMEDROP,
@@ -171,7 +171,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_PREFERENCES_NoIdle),
+ btn = CreateWindow("button", acp(MSGTR_GUI_QuitAfterPlaying),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
10, 101, 225, 25,
hwnd, (HMENU) ID_IDLE,
@@ -179,7 +179,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_PREFERENCES_NormalizeSound),
+ btn = CreateWindow("button", acp(MSGTR_GUI_NormalizeSound),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
220, 35, 190, 25,
hwnd, (HMENU) ID_NORMALIZE,
@@ -187,7 +187,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_PREFERENCES_SoftwareMixer),
+ btn = CreateWindow("button", acp(MSGTR_GUI_EnableSoftwareMixer),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
220, 57, 190, 25,
hwnd, (HMENU) ID_SOFTMIX,
@@ -195,7 +195,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_PREFERENCES_ExtraStereo),
+ btn = CreateWindow("button", acp(MSGTR_GUI_EnableExtraStereo),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
220, 79, 190, 25,
hwnd, (HMENU) ID_EXTRASTEREO,
@@ -203,7 +203,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_PREFERENCES_Cache),
+ btn = CreateWindow("button", acp(MSGTR_GUI_EnableCache),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
10, 222, 100, 25,
hwnd, (HMENU) ID_CACHE,
@@ -211,7 +211,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_PREFERENCES_AutoSync),
+ btn = CreateWindow("button", acp(MSGTR_GUI_EnableAutomaticAVSync),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
225, 222, 185, 25, hwnd,
(HMENU) ID_AUTOSYNC,
@@ -219,7 +219,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_PREFERENCES_ShowInVideoWin),
+ btn = CreateWindow("button", acp(MSGTR_GUI_WIN32_DisplayInVideoWindow),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
10, 249, 250, 25,
hwnd, (HMENU) ID_VIDEOWINDOW,
@@ -228,7 +228,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
/* osd level */
- btn = CreateWindow("button", acp(MSGTR_PREFERENCES_OSD_LEVEL0),
+ btn = CreateWindow("button", acp(MSGTR_GUI_OsdLevel0),
WS_CHILD | WS_VISIBLE | BS_AUTORADIOBUTTON,
15, 297, 200, 25, hwnd,
(HMENU) ID_NONE,
@@ -236,7 +236,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_PREFERENCES_OSD_LEVEL1),
+ btn = CreateWindow("button", acp(MSGTR_GUI_OsdLevel1),
WS_CHILD | WS_VISIBLE | BS_AUTORADIOBUTTON,
15, 317, 395, 25, hwnd,
(HMENU) ID_OSD1,
@@ -244,7 +244,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_PREFERENCES_OSD_LEVEL2),
+ btn = CreateWindow("button", acp(MSGTR_GUI_OsdLevel2),
WS_CHILD | WS_VISIBLE | BS_AUTORADIOBUTTON,
15, 337, 395, 25, hwnd,
(HMENU) ID_OSD2,
@@ -252,7 +252,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_PREFERENCES_OSD_LEVEL3),
+ btn = CreateWindow("button", acp(MSGTR_GUI_OsdLevel3),
WS_CHILD | WS_VISIBLE | BS_AUTORADIOBUTTON,
15, 357, 395, 25, hwnd,
(HMENU) ID_OSD3,
@@ -260,7 +260,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_Ok),
+ btn = CreateWindow("button", acp(MSGTR_GUI_Ok),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
248, 417, 80, 25, hwnd,
(HMENU) ID_APPLY,
@@ -268,7 +268,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_Cancel),
+ btn = CreateWindow("button", acp(MSGTR_GUI_Cancel),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
334, 417, 80, 25, hwnd,
(HMENU) ID_CANCEL,
@@ -276,7 +276,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- btn = CreateWindow("button", acp(MSGTR_Default),
+ btn = CreateWindow("button", acp(MSGTR_GUI_WIN32_Defaults),
WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
5, 417, 80, 25, hwnd,
(HMENU) ID_DEFAULTS,
@@ -368,11 +368,11 @@ static LRESULT CALLBACK PrefsWndProc(HWN
SendMessage(ao_driver, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
/* priority list, i'm leaving out realtime for safety's sake */
- SendDlgItemMessage(hwnd, ID_PRIO, CB_INSERTSTRING, 0, (LPARAM) acp(MSGTR_PREFERENCES_PriorityLow));
- SendDlgItemMessage(hwnd, ID_PRIO, CB_INSERTSTRING, 0, (LPARAM) acp(MSGTR_PREFERENCES_PriorityNormalBelow));
- SendDlgItemMessage(hwnd, ID_PRIO, CB_INSERTSTRING, 0, (LPARAM) acp(MSGTR_PREFERENCES_PriorityNormal));
- SendDlgItemMessage(hwnd, ID_PRIO, CB_INSERTSTRING, 0, (LPARAM) acp(MSGTR_PREFERENCES_PriorityNormalAbove));
- SendDlgItemMessage(hwnd, ID_PRIO, CB_INSERTSTRING, 0, (LPARAM) acp(MSGTR_PREFERENCES_PriorityHigh));
+ SendDlgItemMessage(hwnd, ID_PRIO, CB_INSERTSTRING, 0, (LPARAM) acp(MSGTR_GUI_WIN32_PriorityLow));
+ SendDlgItemMessage(hwnd, ID_PRIO, CB_INSERTSTRING, 0, (LPARAM) acp(MSGTR_GUI_WIN32_PriorityBelowNormal));
+ SendDlgItemMessage(hwnd, ID_PRIO, CB_INSERTSTRING, 0, (LPARAM) acp(MSGTR_GUI_WIN32_PriorityNormal));
+ SendDlgItemMessage(hwnd, ID_PRIO, CB_INSERTSTRING, 0, (LPARAM) acp(MSGTR_GUI_WIN32_PriorityAboveNormal));
+ SendDlgItemMessage(hwnd, ID_PRIO, CB_INSERTSTRING, 0, (LPARAM) acp(MSGTR_GUI_WIN32_PriorityHigh));
SendMessage(prio, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
/* set our preferences on what we already have */
@@ -632,7 +632,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
else if(SendDlgItemMessage(hwnd, ID_OSD3, BM_GETCHECK, 0, 0) == BST_CHECKED)
osd_level = 3;
- MessageBox(hwnd, acp(MSGTR_PREFERENCES_Message), acp(MSGTR_MSGBOX_LABEL_Warning), MB_OK);
+ MessageBox(hwnd, acp(MSGTR_GUI_MSG_PlaybackNeedsRestart), acp(MSGTR_GUI_Warning), MB_OK);
DestroyWindow(hwnd);
break;
}
@@ -649,7 +649,7 @@ void display_prefswindow(gui_t *gui)
HINSTANCE hInstance = GetModuleHandle(NULL);
WNDCLASS wc;
int x, y;
- if(FindWindow(NULL, acp(MSGTR_Preferences))) return;
+ if(FindWindow(NULL, acp(MSGTR_GUI_Preferences))) return;
wc.style = CS_HREDRAW | CS_VREDRAW;
wc.lpfnWndProc = PrefsWndProc;
wc.cbClsExtra = 0;
@@ -658,13 +658,13 @@ void display_prefswindow(gui_t *gui)
wc.hCursor = LoadCursor(NULL,IDC_ARROW);
wc.hIcon = gui->icon;
wc.hbrBackground = SOLID_GREY;
- wc.lpszClassName = acp(MSGTR_Preferences);
+ wc.lpszClassName = acp(MSGTR_GUI_Preferences);
wc.lpszMenuName = NULL;
RegisterClass(&wc);
x = (GetSystemMetrics(SM_CXSCREEN) / 2) - (425 / 2);
y = (GetSystemMetrics(SM_CYSCREEN) / 2) - (474 / 2);
- hWnd = CreateWindow(acp(MSGTR_Preferences),
- acp(MSGTR_Preferences),
+ hWnd = CreateWindow(acp(MSGTR_GUI_Preferences),
+ acp(MSGTR_GUI_Preferences),
WS_POPUPWINDOW | WS_CAPTION,
x,
y,
Modified: trunk/gui/win32/wincfg.c
==============================================================================
--- trunk/gui/win32/wincfg.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/win32/wincfg.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -123,7 +123,7 @@ void cfg_write(void)
{
char *v = m_option_print(&gui_opts[i], gui_opts[i].p);
if(v == (char *)-1) {
- mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_UnableToSaveOption, gui_opts[i].name);
+ mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_UnableToSaveOption, gui_opts[i].name);
v = NULL;
}
if(v)
Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/wm/ws.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -200,7 +200,7 @@ void wsInit(Display *display)
mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] display name: %s => %s display.\n", dispname, localdisp ? "local" : "REMOTE");
if (!localdisp)
- mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_WS_RemoteDisplay);
+ mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_RemoteDisplay);
}
#ifdef HAVE_SHM
@@ -209,7 +209,7 @@ void wsInit(Display *display)
wsUseXShm = False;
if (!wsUseXShm)
- mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_WS_NoXshm);
+ mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_XSharedMemoryUnavailable);
#ifdef CONFIG_XSHAPE
if (!XShapeQueryExtension(wsDisplay, &eventbase, &errorbase))
@@ -217,7 +217,7 @@ void wsInit(Display *display)
wsUseXShape = False;
if (!wsUseXShape)
- mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_WS_NoXshape);
+ mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_XShapeError);
wsScreen = DefaultScreen(wsDisplay);
wsRootWin = RootWindow(wsDisplay, wsScreen);
@@ -312,7 +312,7 @@ static int wsErrorHandler(Display *displ
XGetErrorText(display, event->error_code, type, sizeof(type));
- mp_msg(MSGT_GPLAYER, MSGL_ERR, "[ws] " MSGTR_WS_XError);
+ mp_msg(MSGT_GPLAYER, MSGL_ERR, "[ws] " MSGTR_GUI_MSG_X11Error);
mp_msg(MSGT_GPLAYER, MSGL_ERR, "[ws] Error code: %d - %s\n", event->error_code, type);
mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] Request code: %d (minor code: %d)\n", event->request_code, event->minor_code);
mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] MPlayer module: %s\n", current_module ? current_module : "(none)");
@@ -770,7 +770,7 @@ void wsWindowCreate(wsWindow *win, int x
break;
if (i == wsWLCount) {
- mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_TooManyOpenWindows);
+ mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_TooManyWindows);
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
@@ -801,7 +801,7 @@ void wsWindowCreate(wsWindow *win, int x
depth = vo_find_depth_from_visuals(wsDisplay, wsScreen, NULL);
if (depth < 15) {
- mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_ColorDepthTooLow);
+ mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_ColorDepthTooLow);
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
@@ -1295,7 +1295,7 @@ void wsImageCreate(wsWindow *win, int w,
win->VisualInfo.depth, ZPixmap, NULL, &win->Shminfo, w, h);
if (win->xImage == NULL) {
- mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_ShmError);
+ mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_XSharedMemoryError);
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
@@ -1303,7 +1303,7 @@ void wsImageCreate(wsWindow *win, int w,
if (win->Shminfo.shmid < 0) {
XDestroyImage(win->xImage);
- mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_ShmError);
+ mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_XSharedMemoryError);
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
@@ -1315,7 +1315,7 @@ void wsImageCreate(wsWindow *win, int w,
if (win->Shminfo.shmaddr != ((char *)-1))
shmdt(win->Shminfo.shmaddr);
- mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_ShmError);
+ mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_XSharedMemoryError);
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
@@ -1332,7 +1332,7 @@ void wsImageCreate(wsWindow *win, int w,
0);
if ((win->xImage->data = malloc(win->xImage->bytes_per_line * win->xImage->height)) == NULL) {
- mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_WS_NotEnoughMemoryDrawBuffer);
+ mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MSG_MemoryErrorImage);
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
}
Modified: trunk/gui/wm/wsxdnd.c
==============================================================================
--- trunk/gui/wm/wsxdnd.c Wed Feb 5 17:03:44 2014 (r36789)
+++ trunk/gui/wm/wsxdnd.c Wed Feb 5 17:39:38 2014 (r36790)
@@ -101,7 +101,7 @@ wsXDNDProcessSelection(wsWindow* win, XE
XSendEvent(wsDisplay, selowner, 0, 0, &xevent);
if (!delme){
- mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_WS_DDNothing );
+ mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_GUI_MSG_DragAndDropNothing );
return False;
}
@@ -171,7 +171,7 @@ wsXDNDProcessClientMessage(XClientMessag
}
}
if (atom_support == None) {
- mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_WS_NotAFile );
+ mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_GUI_MSG_NotAFile0 );
}
} else {
/* need to check the whole list here */
More information about the MPlayer-cvslog
mailing list