Mercurial > mplayer.hg
diff gui/dialog/preferences.c @ 36694:eed2fb870f43
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.
| author | ib |
|---|---|
| date | Wed, 05 Feb 2014 16:39:38 +0000 |
| parents | c3962450b00b |
| children | d115f34f2f23 |
line wrap: on
line diff
--- a/gui/dialog/preferences.c Wed Feb 05 16:03:44 2014 +0000 +++ b/gui/dialog/preferences.c Wed Feb 05 16:39:38 2014 +0000 @@ -163,42 +163,42 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ // 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ #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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 );