[MPlayer-cvslog] r36768 - in trunk: gui/dialog/about.c gui/dialog/equalizer.c gui/dialog/menu.c gui/dialog/preferences.c gui/dialog/skinbrowser.c gui/win32/dialogs.c gui/win32/gui.c gui/win32/preferences.c help/hel...
ib
subversion at mplayerhq.hu
Fri Jan 31 17:37:52 CET 2014
Author: ib
Date: Fri Jan 31 17:37:52 2014
New Revision: 36768
Log:
Revise GUI help message texts.
Remove colons, ellipses and newlines from the end of the texts.
This reduces the amount of texts to be translated, enhances reusability
and harmonizes the visual appearance of the different GUI localizations.
Additionally, make the necessary code changes.
Modified:
trunk/gui/dialog/about.c
trunk/gui/dialog/equalizer.c
trunk/gui/dialog/menu.c
trunk/gui/dialog/preferences.c
trunk/gui/dialog/skinbrowser.c
trunk/gui/win32/dialogs.c
trunk/gui/win32/gui.c
trunk/gui/win32/preferences.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-de.h
trunk/help/help_mp-dk.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/dialog/about.c
==============================================================================
--- trunk/gui/dialog/about.c Fri Jan 31 15:06:25 2014 (r36767)
+++ trunk/gui/dialog/about.c Fri Jan 31 17:37:52 2014 (r36768)
@@ -108,10 +108,10 @@ static GtkWidget * CreateAbout( void )
gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL,
#endif
"\n"
- MSGTR_ABOUT_UHU
+ MSGTR_ABOUT_UHU":\n"
" http://www.uhulinux.hu/\n"
"\n"
- MSGTR_ABOUT_Contributors
+ MSGTR_ABOUT_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
+ MSGTR_ABOUT_Codecs_libs_contributions":\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
+ MSGTR_ABOUT_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
+ MSGTR_ABOUT_Skins":\n"
"\n"
" * Azrael\n"
" * Viktor Bekesi\n"
Modified: trunk/gui/dialog/equalizer.c
==============================================================================
--- trunk/gui/dialog/equalizer.c Fri Jan 31 15:06:25 2014 (r36767)
+++ trunk/gui/dialog/equalizer.c Fri Jan 31 17:37:52 2014 (r36768)
@@ -383,19 +383,19 @@ static GtkWidget * CreateEqualizer( void
gtk_container_add( GTK_CONTAINER( Notebook ),table1 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( MSGTR_EQU_Contrast,NULL ),
+ gtkAddLabel( MSGTR_EQU_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_EQU_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_EQU_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_EQU_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 ) );
@@ -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_EQU_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_EQU_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_EQU_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_EQU_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_EQU_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_EQU_Channel6":",NULL ),
0,1,5,6,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
CBChannel1=gtkAddCombo( NULL );
Modified: trunk/gui/dialog/menu.c
==============================================================================
--- trunk/gui/dialog/menu.c Fri Jan 31 15:06:25 2014 (r36767)
+++ trunk/gui/dialog/menu.c Fri Jan 31 17:37:52 2014 (r36768)
@@ -440,7 +440,7 @@ GtkWidget * CreatePopUpMenu( void )
AddMenuItem( window1, (const char*)about_xpm, Menu,MSGTR_MENU_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 );
+ AddMenuItem( window1, (const char*)file2_xpm, SubMenu,MSGTR_MENU_PlayFile"... ", 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 );
@@ -563,13 +563,13 @@ GtkWidget * CreatePopUpMenu( void )
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_MENU_PlayURL"...", evLoadURL );
#ifdef CONFIG_TV
AddMenuItem( window1, (const char*)tv_xpm, SubMenu,MSGTR_MENU_PlayTV, 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*)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 );
Modified: trunk/gui/dialog/preferences.c
==============================================================================
--- trunk/gui/dialog/preferences.c Fri Jan 31 15:06:25 2014 (r36767)
+++ trunk/gui/dialog/preferences.c Fri Jan 31 17:37:52 2014 (r36768)
@@ -665,14 +665,14 @@ static GtkWidget * CreatePreferences( vo
gtkAddHSeparator( vbox3 );
CBExtraStereo=gtkAddCheckButton( MSGTR_PREFERENCES_ExtraStereo,vbox3 );
hbox8=gtkAddHBox( vbox3,1 );
- /*label=*/gtkAddLabel( MSGTR_PREFERENCES_Coefficient,hbox8 );
+ /*label=*/gtkAddLabel( MSGTR_PREFERENCES_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_PREFERENCES_AudioDelay":",hbox8 );
HSAudioDelayadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-10,10,0.01,0,0 ) );
HSAudioDelay=gtkAddHScale( HSAudioDelayadj,hbox8,2 );
@@ -721,10 +721,10 @@ static GtkWidget * CreatePreferences( vo
gtk_widget_show( table1 );
gtk_box_pack_start( GTK_BOX( vbox5 ),table1,FALSE,FALSE,0 );
- label=gtkAddLabel( MSGTR_PREFERENCES_Panscan,NULL );
+ label=gtkAddLabel( MSGTR_PREFERENCES_Panscan":",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_PREFERENCES_FPS":",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 ) );
@@ -760,7 +760,7 @@ static GtkWidget * CreatePreferences( vo
#if 0
hbox4=gtkAddHBox( vbox7,1 );
- gtkAddLabel( MSGTR_PREFERENCES_Subtitle,hbox4 );
+ gtkAddLabel( MSGTR_PREFERENCES_Subtitle":",hbox4 );
ESubtitleName=gtk_entry_new();
gtk_widget_show( ESubtitleName );
@@ -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_PREFERENCES_SUB_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_PREFERENCES_SUB_POS":",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_PREFERENCES_SUB_FPS":",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_PREFERENCES_FontEncoding":",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 ) );
@@ -860,13 +860,13 @@ static GtkWidget * CreatePreferences( vo
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_PREFERENCES_SUB_ASS_TOP_MARGIN":",
(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_PREFERENCES_SUB_ASS_BOTTOM_MARGIN":",
(GtkAdjustment *)gtk_adjustment_new(0,0,512,1,8,0),hbox92 );
label=gtkAddLabel( MSGTR_PREFERENCES_SubtitleOSD,NULL );
@@ -880,7 +880,7 @@ 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_PREFERENCES_Font":",hbox6 );
prEFontName=gtk_entry_new();
gtk_widget_show( prEFontName );
gtk_box_pack_start( GTK_BOX( hbox6 ),prEFontName,TRUE,TRUE,0 );
@@ -893,7 +893,7 @@ static GtkWidget * CreatePreferences( vo
gtk_widget_show( table1 );
gtk_box_pack_start( GTK_BOX( vbox603 ),table1,FALSE,FALSE,0 );
- label=gtkAddLabel( MSGTR_PREFERENCES_FontAutoScaleMode,NULL );
+ label=gtkAddLabel( MSGTR_PREFERENCES_FontAutoScaleMode":",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 );
@@ -905,7 +905,7 @@ static GtkWidget * CreatePreferences( vo
RBFontAutoScaleWidth=gtkAddRadioButton( MSGTR_PREFERENCES_FontPropWidth,&Font_group,vbox11 );
RBFontAutoScaleDiagonal=gtkAddRadioButton( MSGTR_PREFERENCES_FontPropDiagonal,&Font_group,vbox11 );
- label=gtkAddLabel( MSGTR_PREFERENCES_FontEncoding,NULL );
+ label=gtkAddLabel( MSGTR_PREFERENCES_FontEncoding":",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_PREFERENCES_FontBlur":",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_PREFERENCES_FontOutLine":",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_PREFERENCES_FontTextScale":",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_PREFERENCES_FontOSDScale":",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,7 +971,7 @@ 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_PREFERENCES_FontOutLine":",hbox7 );
HSFontFactoradj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,10,0.05,0,0 ) );
HSFontFactor=gtkAddHScale( HSFontFactoradj,hbox7,2 );
#endif
@@ -996,7 +996,7 @@ static GtkWidget * CreatePreferences( vo
hbox5=gtkAddHBox( vbox604,1 );
- gtkAddLabel( MSGTR_PREFERENCES_VideoCodecFamily,hbox5 );
+ gtkAddLabel( MSGTR_PREFERENCES_VideoCodecFamily":",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_PREFERENCES_AudioCodecFamily":",hbox5 );
CBAFM=gtk_combo_new();
gtk_widget_show( CBAFM );
@@ -1033,7 +1033,7 @@ static GtkWidget * CreatePreferences( vo
hbox5=gtkAddHBox( vbox602,1 );
- gtkAddLabel( MSGTR_PREFERENCES_AutoQuality,hbox5 );
+ gtkAddLabel( MSGTR_PREFERENCES_AutoQuality":",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 ) );
@@ -1047,7 +1047,7 @@ static GtkWidget * CreatePreferences( vo
hbox5=gtkAddHBox( vbox602,1 );
- gtkAddLabel( MSGTR_PREFERENCES_CacheSize,hbox5 );
+ gtkAddLabel( MSGTR_PREFERENCES_CacheSize":",hbox5 );
SBCacheadj=GTK_ADJUSTMENT( gtk_adjustment_new( gtkCacheSize,32,0x7fffffff,1,32,0 ) );
SBCache=gtk_spin_button_new( GTK_ADJUSTMENT( SBCacheadj ),1,0 );
@@ -1070,7 +1070,7 @@ static GtkWidget * CreatePreferences( vo
CBAutoSync=gtkAddCheckButton( MSGTR_PREFERENCES_AutoSync,vbox602 );
hbox5=gtkAddHBox( vbox602,1 );
- gtkAddLabel( MSGTR_PREFERENCES_AutoSyncValue,hbox5 );
+ gtkAddLabel( MSGTR_PREFERENCES_AutoSyncValue":",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_PREFERENCES_DVDDevice":",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_PREFERENCES_CDROMDevice":",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 );
@@ -1661,7 +1661,7 @@ 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_PREFERENCES_Audio_Device":", NULL);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0);
CBAudioDevice = gtkAddCombo(NULL);
@@ -1690,7 +1690,7 @@ static GtkWidget *CreateAudioConfig( voi
CEAudioDevice = GTK_COMBO(CBAudioDevice)->entry;
gtk_widget_show(CEAudioDevice);
- label = gtkAddLabel(MSGTR_PREFERENCES_Audio_Mixer, NULL);
+ label = gtkAddLabel(MSGTR_PREFERENCES_Audio_Mixer":", NULL);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0);
CBAudioMixer = gtkAddCombo(NULL);
@@ -1711,7 +1711,7 @@ static GtkWidget *CreateAudioConfig( voi
CEAudioMixer = GTK_COMBO(CBAudioMixer)->entry;
gtk_widget_show(CEAudioMixer);
- label = gtkAddLabel(MSGTR_PREFERENCES_Audio_MixerChannel, NULL);
+ label = gtkAddLabel(MSGTR_PREFERENCES_Audio_MixerChannel":", NULL);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0);
CBAudioMixerChannel = gtkAddCombo(NULL);
@@ -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_PREFERENCES_Audio_Device":",hbox1 );
CBDevice=gtkAddCombo( hbox1 );
@@ -1869,7 +1869,7 @@ GtkWidget * CreateDXR3Config( void )
gtkAddHSeparator( vbox2 );
vbox3=gtkAddVBox( vbox2,0 );
- gtkAddLabel( MSGTR_PREFERENCES_DXR3_VENC,vbox3 );
+ gtkAddLabel( MSGTR_PREFERENCES_DXR3_VENC":",vbox3 );
RBVNone=gtkAddRadioButton( MSGTR_PREFERENCES_DXR3_NoEnc,&VEncoder_group,vbox3 );
RBVLavc=gtkAddRadioButton( MSGTR_PREFERENCES_DXR3_LAVC,&VEncoder_group,vbox3 );
Modified: trunk/gui/dialog/skinbrowser.c
==============================================================================
--- trunk/gui/dialog/skinbrowser.c Fri Jan 31 15:06:25 2014 (r36767)
+++ trunk/gui/dialog/skinbrowser.c Fri Jan 31 17:37:52 2014 (r36768)
@@ -111,7 +111,7 @@ static GtkWidget * CreateSkinBrowser( vo
gtkAddIcon( SkinBrowser );
vbox5=gtkAddVBox( gtkAddDialogFrame( SkinBrowser ),0 );
- gtkAddLabel( MSGTR_SKIN_LABEL,vbox5 );
+ gtkAddLabel( MSGTR_SKIN_LABEL":",vbox5 );
gtkAddHSeparator( vbox5 );
scrolledwindow1=gtk_scrolled_window_new( NULL,NULL );
Modified: trunk/gui/win32/dialogs.c
==============================================================================
--- trunk/gui/win32/dialogs.c Fri Jan 31 15:06:25 2014 (r36767)
+++ trunk/gui/win32/dialogs.c Fri Jan 31 17:37:52 2014 (r36768)
@@ -408,8 +408,8 @@ 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_PLAYLIST_AddFile"..."));
+ AppendMenu(gui->playlistmenu, MF_STRING, ID_ADDURL, acp(MSGTR_PLAYLIST_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));
@@ -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_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_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_SelectTitleChapter"..."),
+ acp(MSGTR_SelectTitleChapter"..."),
WS_POPUPWINDOW | WS_CAPTION,
x,
y,
@@ -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_EQU_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_EQU_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_EQU_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_EQU_Saturation":"),
WS_CHILD | WS_VISIBLE,
260, 122, 70, 15, hwnd,
NULL,
Modified: trunk/gui/win32/gui.c
==============================================================================
--- trunk/gui/win32/gui.c Fri Jan 31 15:06:25 2014 (r36767)
+++ trunk/gui/win32/gui.c Fri Jan 31 17:37:52 2014 (r36768)
@@ -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_DirectorySelect":");
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_DirectorySelect":");
pidl = SHBrowseForFolder(&bi);
if (SHGetPathFromIDList(pidl, path))
{
@@ -1199,13 +1199,13 @@ static void create_menu(gui_t *gui)
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->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_SEPARATOR, 0, 0);
AppendMenu(gui->menu, MF_STRING | MF_POPUP, (UINT_PTR) gui->diskmenu, acp(MSGTR_MENU_PlayDisc));
AppendMenu(gui->menu, MF_SEPARATOR, 0, 0);
- AppendMenu(gui->menu, MF_STRING, IDSUBTITLE_OPEN, acp(MSGTR_MENU_LoadSubtitle));
+ 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_SEPARATOR, 0, 0);
AppendMenu(gui->menu, MF_STRING, ID_PREFS, acp(MSGTR_MENU_Preferences));
@@ -1267,7 +1267,7 @@ static void create_videomenu(gui_t *gui)
AppendMenu(gui->videomenu, MF_STRING | MF_POPUP, (UINT_PTR) gui->subtitlemenu, acp(MSGTR_MENU_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->dvdmenu, MF_STRING | MF_GRAYED, ID_CHAPTERSEL, acp(MSGTR_SelectTitleChapter"..."));
#endif
AppendMenu(gui->subtitlemenu, MF_STRING, IDSUB_TOGGLE, acp(MSGTR_MENU_SubtitlesOnOff));
AppendMenu(gui->subtitlemenu, MF_STRING, IDSUB_CYCLE, acp(MSGTR_MENU_SubtitleLanguages));
Modified: trunk/gui/win32/preferences.c
==============================================================================
--- trunk/gui/win32/preferences.c Fri Jan 31 15:06:25 2014 (r36767)
+++ trunk/gui/win32/preferences.c Fri Jan 31 17:37:52 2014 (r36768)
@@ -88,14 +88,14 @@ static LRESULT CALLBACK PrefsWndProc(HWN
NULL);
SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
- label = CreateWindow("static", acp(MSGTR_PREFERENCES_Coefficient),
+ label = CreateWindow("static", acp(MSGTR_PREFERENCES_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_PREFERENCES_AudioDelay":"),
WS_CHILD | WS_VISIBLE | SS_RIGHT,
10, 187, 140, 15, hwnd,
NULL, ((LPCREATESTRUCT) lParam) -> hInstance,
More information about the MPlayer-cvslog
mailing list