[MPlayer-cvslog] r36766 - in trunk: gui/dialog/about.c gui/dialog/equalizer.c gui/dialog/preferences.c gui/ui/main.c gui/ui/menu.c gui/ui/playbar.c gui/win32/gui.c gui/win32/preferences.c help/help_mp-bg.h help/hel...
ib
subversion at mplayerhq.hu
Thu Jan 30 14:26:45 CET 2014
Author: ib
Date: Thu Jan 30 14:26:45 2014
New Revision: 36766
Log:
Revise GUI help message texts.
In particular, revise the English and German translations,
but remove some unused definitions from all language files
as well, and don't define a symbolic constant by an other one.
Additionally, make some necessary code changes.
Modified:
trunk/gui/dialog/about.c
trunk/gui/dialog/equalizer.c
trunk/gui/dialog/preferences.c
trunk/gui/ui/main.c
trunk/gui/ui/menu.c
trunk/gui/ui/playbar.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 Thu Jan 30 13:05:35 2014 (r36765)
+++ trunk/gui/dialog/about.c Thu Jan 30 14:26:45 2014 (r36766)
@@ -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_About );
+ gtk_window_set_title( GTK_WINDOW( About ),MSGTR_MENU_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 );
@@ -109,7 +109,7 @@ static GtkWidget * CreateAbout( void )
#endif
"\n"
MSGTR_ABOUT_UHU
- " (http://www.uhulinux.hu/)\n"
+ " http://www.uhulinux.hu/\n"
"\n"
MSGTR_ABOUT_Contributors
"\n"
Modified: trunk/gui/dialog/equalizer.c
==============================================================================
--- trunk/gui/dialog/equalizer.c Thu Jan 30 13:05:35 2014 (r36765)
+++ trunk/gui/dialog/equalizer.c Thu Jan 30 14:26:45 2014 (r36766)
@@ -336,43 +336,43 @@ 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( "31.25",NULL ),
+ gtkAddLabel( MSGTR_EQU_Frequency0,NULL ),
0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( "62.50",NULL ),
+ gtkAddLabel( MSGTR_EQU_Frequency1,NULL ),
1,2,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( "125",NULL ),
+ gtkAddLabel( MSGTR_EQU_Frequency2,NULL ),
2,3,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( "250",NULL ),
+ gtkAddLabel( MSGTR_EQU_Frequency3,NULL ),
3,4,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( "500",NULL ),
+ gtkAddLabel( MSGTR_EQU_Frequency4,NULL ),
4,5,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( "1000",NULL ),
+ gtkAddLabel( MSGTR_EQU_Frequency5,NULL ),
5,6,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( "2000",NULL ),
+ gtkAddLabel( MSGTR_EQU_Frequency6,NULL ),
6,7,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( "4000",NULL ),
+ gtkAddLabel( MSGTR_EQU_Frequency7,NULL ),
7,8,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( "8000",NULL ),
+ gtkAddLabel( MSGTR_EQU_Frequency8,NULL ),
8,9,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
gtk_table_attach( GTK_TABLE( table1 ),
- gtkAddLabel( "16000",NULL ),
+ gtkAddLabel( MSGTR_EQU_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 ),
Modified: trunk/gui/dialog/preferences.c
==============================================================================
--- trunk/gui/dialog/preferences.c Thu Jan 30 13:05:35 2014 (r36765)
+++ trunk/gui/dialog/preferences.c Thu Jan 30 14:26:45 2014 (r36766)
@@ -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_DefaultEnc ) == 0 ) comment=NULL;
+ if ( strcmp( comment,MSGTR_PREFERENCES_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))) );
@@ -308,7 +308,7 @@ static void prButton( GtkButton * button
/* 3rd page */
suboverlap_enabled=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSubOverlap ) );
- sub_auto=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ) );
+ sub_auto=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ) );
gtkSubDumpMPSub=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ) );
gtkSubDumpSrt=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpSrt ) );
sub_utf8=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSubUtf8 ) );
@@ -368,7 +368,7 @@ static void prButton( GtkButton * button
gtkVfPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) );
gtkLoadFullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) );
gui_save_pos=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ) );
- gtkShowVideoWindow=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) );
+ gtkShowVideoWindow=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) );
stop_xscreensaver=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ) );
gtkEnablePlayBar=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPlayBar ) );
gui_tv_digital=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBTVDigital ) );
@@ -485,7 +485,7 @@ static void prToggled( GtkToggleButton *
// if ( guiInfo.Playing ) gtkMessageBox( MSGBOX_WARNING,"Please remember, this function need restart the playing." );
// break;
case 3:
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) ) )
+ if ( !gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) ) )
{
window=wsShowWindow;
gtkRaise( Preferences );
@@ -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_DefaultEnc );
+ CBSubEncoding_items=g_list_append( CBSubEncoding_items,MSGTR_PREFERENCES_Default );
{
int i, listed=(sub_cp == NULL);
@@ -1253,7 +1253,7 @@ void ShowPreferences( void )
/* 3rd page */
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSubOverlap ),suboverlap_enabled );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ),!sub_auto );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ),sub_auto );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ),gtkSubDumpMPSub );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDumpSrt ),gtkSubDumpSrt );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSubUtf8 ),sub_utf8 );
@@ -1335,7 +1335,7 @@ void ShowPreferences( void )
GList * Items = NULL;
char * name = NULL;
- Items=g_list_append( Items,MSGTR_PREFERENCES_None );
+ Items=g_list_append( Items,MSGTR_PREFERENCES_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_None );
+ Items=g_list_append( Items,MSGTR_PREFERENCES_Default );
for( i=0;mpcodecs_ad_drivers[i];i++ )
{
Items=g_list_append( Items,(char *)mpcodecs_ad_drivers[i]->info->name );
@@ -1366,7 +1366,7 @@ void ShowPreferences( void )
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBPostprocess ),gtkVfPP );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ),gtkLoadFullscreen );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ),gui_save_pos );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ),gtkShowVideoWindow );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ),!gtkShowVideoWindow );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ),stop_xscreensaver );
gtk_adjustment_set_value( HSPPQualityadj,auto_quality );
Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c Thu Jan 30 13:05:35 2014 (r36765)
+++ trunk/gui/ui/main.c Thu Jan 30 14:26:45 2014 (r36766)
@@ -345,7 +345,7 @@ void uiMainInit (void)
if (!mainDrawBuffer)
{
- gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_NEMDB);
+ gmp_msg(MSGT_GPLAYER, MSGL_FATAL, "[main] " MSGTR_NEMDB);
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
Modified: trunk/gui/ui/menu.c
==============================================================================
--- trunk/gui/ui/menu.c Thu Jan 30 13:05:35 2014 (r36765)
+++ trunk/gui/ui/menu.c Thu Jan 30 14:26:45 2014 (r36766)
@@ -107,8 +107,8 @@ void uiMenuInit( void )
if ( ( menuDrawBuffer = calloc( 1,guiApp.menu.Bitmap.ImageSize ) ) == NULL )
{
- mp_msg( MSGT_GPLAYER,MSGL_DBG2,MSGTR_NEMFMR );
- gtkMessageBox( MSGBOX_FATAL,MSGTR_NEMFMR );
+ mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[menu] " MSGTR_NEMDB );
+ gtkMessageBox( MSGBOX_FATAL,"[menu] " MSGTR_NEMDB );
return;
}
Modified: trunk/gui/ui/playbar.c
==============================================================================
--- trunk/gui/ui/playbar.c Thu Jan 30 13:05:35 2014 (r36765)
+++ trunk/gui/ui/playbar.c Thu Jan 30 14:26:45 2014 (r36766)
@@ -238,7 +238,7 @@ void uiPlaybarInit( void )
if ( ( playbarDrawBuffer = malloc( guiApp.playbar.Bitmap.ImageSize ) ) == NULL )
{
- gmp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_NEMDB );
+ gmp_msg( MSGT_GPLAYER,MSGL_FATAL,"[playbar] " MSGTR_NEMDB );
mplayer( MPLAYER_EXIT_GUI, EXIT_ERROR, 0 );
}
Modified: trunk/gui/win32/gui.c
==============================================================================
--- trunk/gui/win32/gui.c Thu Jan 30 13:05:35 2014 (r36765)
+++ trunk/gui/win32/gui.c Thu Jan 30 14:26:45 2014 (r36766)
@@ -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_About), MB_OK);
+ MessageBox(hWnd, about_msg, acp(MSGTR_MENU_AboutMPlayer), MB_OK);
}
static image *get_drawground(HWND hwnd)
Modified: trunk/gui/win32/preferences.c
==============================================================================
--- trunk/gui/win32/preferences.c Thu Jan 30 13:05:35 2014 (r36765)
+++ trunk/gui/win32/preferences.c Thu Jan 30 14:26:45 2014 (r36766)
@@ -149,7 +149,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
/* checkboxes */
btn = CreateWindow("button", acp(MSGTR_PREFERENCES_DoubleBuffer),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
- 10, 35, 160, 25,
+ 10, 35, 205, 25,
hwnd, (HMENU) ID_DOUBLE,
((LPCREATESTRUCT) lParam) -> hInstance,
NULL);
@@ -157,7 +157,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
btn = CreateWindow("button", acp(MSGTR_PREFERENCES_DirectRender),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
- 10, 57, 160, 25,
+ 10, 57, 205, 25,
hwnd, (HMENU) ID_DIRECT,
((LPCREATESTRUCT) lParam) -> hInstance,
NULL);
@@ -165,7 +165,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
btn = CreateWindow("button", acp(MSGTR_PREFERENCES_FrameDrop),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
- 10, 79, 160, 25,
+ 10, 79, 205, 25,
hwnd, (HMENU) ID_FRAMEDROP,
((LPCREATESTRUCT) lParam) -> hInstance,
NULL);
@@ -181,7 +181,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
btn = CreateWindow("button", acp(MSGTR_PREFERENCES_NormalizeSound),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
- 220, 35, 160, 25,
+ 220, 35, 190, 25,
hwnd, (HMENU) ID_NORMALIZE,
((LPCREATESTRUCT) lParam) -> hInstance,
NULL);
@@ -189,7 +189,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
btn = CreateWindow("button", acp(MSGTR_PREFERENCES_SoftwareMixer),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
- 220, 57, 160, 25,
+ 220, 57, 190, 25,
hwnd, (HMENU) ID_SOFTMIX,
((LPCREATESTRUCT) lParam) -> hInstance,
NULL);
@@ -197,7 +197,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
btn = CreateWindow("button", acp(MSGTR_PREFERENCES_ExtraStereo),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
- 220, 79, 160, 25,
+ 220, 79, 190, 25,
hwnd, (HMENU) ID_EXTRASTEREO,
((LPCREATESTRUCT) lParam) -> hInstance,
NULL);
@@ -205,7 +205,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
btn = CreateWindow("button", acp(MSGTR_PREFERENCES_Cache),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
- 10, 222, 90, 25,
+ 10, 222, 100, 25,
hwnd, (HMENU) ID_CACHE,
((LPCREATESTRUCT) lParam) -> hInstance,
NULL);
@@ -213,7 +213,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
btn = CreateWindow("button", acp(MSGTR_PREFERENCES_AutoSync),
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
- 240, 222, 110, 25, hwnd,
+ 225, 222, 185, 25, hwnd,
(HMENU) ID_AUTOSYNC,
((LPCREATESTRUCT) lParam) -> hInstance,
NULL);
@@ -310,7 +310,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
edit1 = CreateWindowEx(WS_EX_CLIENTEDGE, "edit", "cache",
WS_CHILD | WS_VISIBLE | WS_DISABLED |
ES_LEFT | ES_AUTOHSCROLL,
- 105, 225, 60, 20, hwnd,
+ 115, 225, 60, 20, hwnd,
(HMENU) ID_EDIT1,
((LPCREATESTRUCT) lParam) -> hInstance,
NULL);
@@ -329,7 +329,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
edit2 = CreateWindowEx(WS_EX_CLIENTEDGE, "edit", "autosync",
WS_CHILD | WS_VISIBLE | WS_DISABLED |
ES_LEFT | ES_AUTOHSCROLL,
- 355, 225, 40, 20, hwnd,
+ 355, 247, 40, 20, hwnd,
(HMENU) ID_EDIT2,
((LPCREATESTRUCT) lParam) -> hInstance,
NULL);
@@ -338,7 +338,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
updown2 = CreateUpDownControl(WS_CHILD | WS_VISIBLE |
WS_DISABLED | UDS_SETBUDDYINT |
UDS_ARROWKEYS | UDS_NOTHOUSANDS,
- 395, 225, 20, 20, hwnd,
+ 395, 247, 20, 20, hwnd,
ID_UPDOWN2,
((LPCREATESTRUCT) lParam) -> hInstance,
(HWND)edit2, 0, 0, 0);
More information about the MPlayer-cvslog
mailing list