Commit 7b885b9b authored by Antoine Cellerier's avatar Antoine Cellerier

Put licensing terms instead of description in about boxes

parent fdaab7f5
......@@ -572,4 +572,10 @@ int VLC_FullScreen( int );
}
# endif
#define LICENSE_MSG \
_("This program comes with NO WARRANTY, to the extent permitted by " \
"law.\nYou may redistribute it under the terms of the GNU General " \
"Public License;\nsee the file named COPYING for details.\n" \
"Written by the VideoLAN team; see the AUTHORS file.\n")
#endif /* <vlc/vlc.h> */
......@@ -163,12 +163,4 @@ VLC_EXPORT( void, intf_Destroy, ( intf_thread_t * ) );
#define INTF_DIALOG_EXIT 99
/* Useful text messages shared by interfaces */
#define INTF_ABOUT_MSG \
_( "VLC is an open-source and cross-platform multimedia " \
"player for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, " \
"DivX, mp3, Ogg, etc.) as well as DVDs, VCDs, CD audio, and various " \
"streaming protocols.\n\n" \
"VLC is also a streaming server with transcoding capabilities " \
"(UDP unicast and multicast, HTTP, etc.) mainly designed for " \
"high-bandwidth networks.\n\n"\
"For more information, have a look at the web site." )
#define INTF_ABOUT_MSG LICENSE_MSG
......@@ -952,9 +952,9 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
wxU(_("Compiler: "))+ wxU(VLC_Compiler())+wxT( ".\n") +
wxU(_("Based on SVN revision: "))+wxU(VLC_Changeset())+wxT(".\n\n") +
#ifdef __WXMSW__
wxU( vlc_wraptext(INTF_ABOUT_MSG,WRAPCOUNT,VLC_TRUE) ) + wxT("\n\n") +
wxU( vlc_wraptext(LICENSE_MSG,WRAPCOUNT,VLC_TRUE) ) + wxT("\n\n") +
#else
wxU( INTF_ABOUT_MSG ) + wxT("\n\n") +
wxU( LICENSE_MSG ) + wxT("\n\n") +
#endif
wxU(_("The VideoLAN team <videolan@videolan.org>\n"
"http://www.videolan.org/\n\n")) );
......
......@@ -2433,11 +2433,7 @@ static void Version( void )
if( strcmp( VLC_Changeset(), "exported" ) )
fprintf( stdout, _("Based upon svn changeset [%s]\n"),
VLC_Changeset() );
fprintf( stdout,
_("This program comes with NO WARRANTY, to the extent permitted by "
"law.\nYou may redistribute it under the terms of the GNU General "
"Public License;\nsee the file named COPYING for details.\n"
"Written by the VideoLAN team; see the AUTHORS file.\n") );
fprintf( stdout, LICENSE_MSG );
#ifdef WIN32 /* Pause the console because it's destroyed when we exit */
PauseConsole();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment