[MPlayer-cvslog] r38286 - in trunk: gui/app/cfg.c gui/dialog/menu.c gui/interface.c gui/win32/dialogs.c gui/win32/wincfg.c help/help_mp-bg.h help/help_mp-cs.h help/help_mp-da.h help/help_mp-de.h help/help_mp-el.h h...
ib
subversion at mplayerhq.hu
Mon Mar 1 15:53:24 EET 2021
Author: ib
Date: Mon Mar 1 15:53:24 2021
New Revision: 38286
Log:
Rename some symbolic constants of GUI help message texts.
Add them to the "GUI namespace", i.e. all symbolic constants used in the
GUI should start with MSGTR_GUI.
But since the texts themselves have not changed, simply define the new
macros using the existing old ones.
Modified:
trunk/gui/app/cfg.c
trunk/gui/dialog/menu.c
trunk/gui/interface.c
trunk/gui/win32/dialogs.c
trunk/gui/win32/wincfg.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 Sun Feb 28 23:32:34 2021 (r38285)
+++ trunk/gui/app/cfg.c Mon Mar 1 15:53:24 2021 (r38286)
@@ -278,14 +278,14 @@ void cfg_read(void)
gui_conf = m_config_new();
if (!gui_conf) {
- gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_MemAllocFailed);
+ gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MemAllocFailed);
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
m_config_register_options(gui_conf, gui_opts);
if (!disable_gui_conf && (m_config_parse_config_file(gui_conf, fname, 1) < 0)) {
- gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_ConfigFileError "\n");
+ gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_GUI_ConfigFileError "\n");
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
@@ -306,7 +306,7 @@ void cfg_read(void)
item = calloc(1, sizeof(*item));
if (!item) {
- gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_MemAllocFailed);
+ gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MemAllocFailed);
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
@@ -341,7 +341,7 @@ void cfg_read(void)
item = calloc(1, sizeof(*item));
if (!item) {
- gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_MemAllocFailed);
+ gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_GUI_MemAllocFailed);
mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
}
Modified: trunk/gui/dialog/menu.c
==============================================================================
--- trunk/gui/dialog/menu.c Sun Feb 28 23:32:34 2021 (r38285)
+++ trunk/gui/dialog/menu.c Mon Mar 1 15:53:24 2021 (r38286)
@@ -685,7 +685,7 @@ GtkWidget * CreatePopUpMenu( int wType )
}
AddSeparator( Menu );
- VolumeMenu = AddSubMenu( Menu, volume_png, MSGTR_Volume );
+ VolumeMenu = AddSubMenu( Menu, volume_png, MSGTR_GUI_Volume );
H = AddMenuItem( VolumeMenu, volume_increase_png, MSGTR_GUI_Increase, evIncVolume );
D = AddMenuItem( VolumeMenu, volume_decrease_png, MSGTR_GUI_Decrease, evDecVolume );
Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c Sun Feb 28 23:32:34 2021 (r38285)
+++ trunk/gui/interface.c Mon Mar 1 15:53:24 2021 (r38286)
@@ -1297,7 +1297,7 @@ void mplayer(int what, float value, void
vo_font = read_font_desc(font_name, font_factor, 0);
if (!vo_font)
- gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadFont, font_name);
+ gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_GUI_CantLoadFont, font_name);
} else {
char *fname = get_path("font/font.desc");
@@ -1415,7 +1415,7 @@ void mplayerLoadSubtitle(const char *nam
subdata = sub_read_file(name, guiInfo.sh_video ? guiInfo.sh_video->fps : 25);
if (!subdata) {
- gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadSub, name);
+ gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_GUI_CantLoadSub, name);
return;
}
}
Modified: trunk/gui/win32/dialogs.c
==============================================================================
--- trunk/gui/win32/dialogs.c Sun Feb 28 23:32:34 2021 (r38285)
+++ trunk/gui/win32/dialogs.c Mon Mar 1 15:53:24 2021 (r38286)
@@ -67,7 +67,7 @@ void mplayerLoadSubtitle(const char *nam
subdata = sub_read_file(name, (guiInfo.sh_video ? guiInfo.sh_video->fps : 25));
if (!subdata)
{
- mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadSub,name);
+ mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_GUI_WIN32_CantLoadSub,name);
return;
}
}
Modified: trunk/gui/win32/wincfg.c
==============================================================================
--- trunk/gui/win32/wincfg.c Sun Feb 28 23:32:34 2021 (r38285)
+++ trunk/gui/win32/wincfg.c Mon Mar 1 15:53:24 2021 (r38286)
@@ -106,7 +106,7 @@ void cfg_read(void)
gui_conf = m_config_new();
m_config_register_options(gui_conf, gui_opts);
if (m_config_parse_config_file(gui_conf, cfg, 1) < 0)
- mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_ConfigFileError "\n");
+ mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_GUI_WIN32_ConfigFileError "\n");
free(cfg);
}
More information about the MPlayer-cvslog
mailing list