vlc | branch: master | Christoph Miebach <[email protected]> | Wed May 1 20:22:37 2013 +0200| [dd9a1957a593e5a2a9abf17c2e3c3670f7c2ab27] | committer: Jean-Baptiste Kempf
Remove more unused msgid defines and de-duplication Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dd9a1957a593e5a2a9abf17c2e3c3670f7c2ab27 --- include/vlc_config_cat.h | 11 ----------- modules/access/decklink.cpp | 2 +- modules/access/jack.c | 2 +- modules/access/sftp.c | 2 -- modules/codec/avcodec/avcodec.h | 1 - modules/codec/fdkaac.c | 3 --- modules/gui/qt4/qt4.cpp | 4 ---- modules/video_filter/deinterlace/deinterlace.c | 1 - modules/video_output/decklink.cpp | 2 +- 9 files changed, 3 insertions(+), 25 deletions(-) diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h index 84efcb6..7cb796b 100644 --- a/include/vlc_config_cat.h +++ b/include/vlc_config_cat.h @@ -85,7 +85,6 @@ #define SUBPIC_HELP N_( "Settings related to On-Screen-Display,"\ " subtitles and \"overlay subpictures\"") /* -#define TEXT_TITLE N_("Text rendering") #define TEXT_HELP N_( \ "Use the settings of the \"freetype\" module to choose the font you " \ "want VLC to use for text rendering (to display subtitles for example).") @@ -190,23 +189,15 @@ #define NETWORK_HELP N_( "These modules provide network functions to all " \ "other parts of VLC." ) -#define CHROMA_TITLE N_("Chroma modules settings") -#define CHROMA_HELP N_("These settings affect chroma transformation modules.") - -#define PACKETIZER_TITLE N_("Packetizer modules settings" ) #define PACKETIZER_HELP "These are general settings for the "\ "packetizers used in VLC's stream output subsystem." -#define ENCODER_TITLE N_("Encoders settings") #define ENCODER_HELP N_( \ "These are general settings for video/audio/subtitle encoding modules.") - -#define DIALOGS_TITLE N_("Dialog providers settings") #define DIALOGS_HELP N_( \ "Dialog providers can be configured here.") -#define SUBTITLE_DEMUX_TITLE N_("Subtitle demuxer settings") #define SUBTITLE_DEMUX_HELP N_( \ "In this section you can force the behavior of the subtitle demuxer, " \ "for example by setting the subtitle type or file name.") @@ -215,8 +206,6 @@ * A little help for modules with unknown capabilities */ -#define UNKNOWN_TITLE N_("No help available" ) -#define UNKNOWN_HELP N_("There is no help available for these modules.") #endif /* This function is deprecated and is kept only for compatibility */ diff --git a/modules/access/decklink.cpp b/modules/access/decklink.cpp index c9be327..4cc50db 100644 --- a/modules/access/decklink.cpp +++ b/modules/access/decklink.cpp @@ -58,7 +58,7 @@ static void Close(vlc_object_t *); "Valid choices: embedded, aesebu, analog. " \ "Leave blank for card default.") -#define RATE_TEXT N_("Audio sampling rate in Hz") +#define RATE_TEXT N_("Audio samplerate (Hz)") #define RATE_LONGTEXT N_( \ "Audio sampling rate (in hertz) for DeckLink captures. " \ "0 disables audio input.") diff --git a/modules/access/jack.c b/modules/access/jack.c index c68e632..b0e3026 100644 --- a/modules/access/jack.c +++ b/modules/access/jack.c @@ -59,7 +59,7 @@ static void Close( vlc_object_t * ); #define PACE_TEXT N_( "Pace" ) #define PACE_LONGTEXT N_( \ "Read the audio stream at VLC pace rather than Jack pace." ) -#define AUTO_CONNECT_TEXT N_( "Auto Connection" ) +#define AUTO_CONNECT_TEXT N_( "Auto connection" ) #define AUTO_CONNECT_LONGTEXT N_( \ "Automatically connect VLC input ports to available output ports." ) diff --git a/modules/access/sftp.c b/modules/access/sftp.c index 6f1e8e4..3dd9d0a 100644 --- a/modules/access/sftp.c +++ b/modules/access/sftp.c @@ -48,9 +48,7 @@ static int Open ( vlc_object_t* ); static void Close( vlc_object_t* ); -#define USER_TEXT N_("SFTP user name") #define USER_LONGTEXT N_("User name that will be used for the connection.") -#define PASS_TEXT N_("SFTP password") #define PASS_LONGTEXT N_("Password that will be used for the connection.") #define PORT_TEXT N_("SFTP port") #define PORT_LONGTEXT N_("SFTP port number to use on the server") diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h index 1716733..c26978a 100644 --- a/modules/codec/avcodec/avcodec.h +++ b/modules/codec/avcodec/avcodec.h @@ -69,7 +69,6 @@ int ffmpeg_OpenCodec( decoder_t *p_dec ); *****************************************************************************/ #define DR_TEXT N_("Direct rendering") /* FIXME Does somebody who knows what it does, explain */ -#define DR_LONGTEXT N_("Direct rendering") #define ERROR_TEXT N_("Error resilience") #define ERROR_LONGTEXT N_( \ diff --git a/modules/codec/fdkaac.c b/modules/codec/fdkaac.c index 19a4ca5..7ec31e9 100644 --- a/modules/codec/fdkaac.c +++ b/modules/codec/fdkaac.c @@ -50,9 +50,6 @@ static void CloseEncoder( vlc_object_t * ); #define AFTERBURNER_TEXT N_("Enable afterburner library") #define AFTERBURNER_LONGTEXT N_( "This library will produce higher quality audio at the expense of additional CPU usage (default is enabled)" ) -#define BITRATE_TEXT N_("CBR Bitrate") -#define BITRATE_LONGTEXT N_( "Bitrate of desired stream (in bps)" ) - #define SIGNALING_TEXT N_("Signaling mode of the extension AOT") #define SIGNALING_LONGTEXT N_( "1 is explicit for SBR and implicit for PS (default), 2 is explicit hierarchical" ) diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 11ae967..9ed8de6 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -99,10 +99,6 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * ); "Show a notification popup with the artist and track name when " \ "the current playlist item changes, when VLC is minimized or hidden." ) -#define ADVANCED_OPTIONS_TEXT N_( "Advanced options" ) -#define ADVANCED_OPTIONS_LONGTEXT N_( "Show all the advanced options " \ - "in the dialogs." ) - #define OPACITY_TEXT N_( "Windows opacity between 0.1 and 1" ) #define OPACITY_LONGTEXT N_( "Sets the windows opacity between 0.1 and 1 " \ "for main interface, playlist and extended panel."\ diff --git a/modules/video_filter/deinterlace/deinterlace.c b/modules/video_filter/deinterlace/deinterlace.c index 71953d5..4392a0c 100644 --- a/modules/video_filter/deinterlace/deinterlace.c +++ b/modules/video_filter/deinterlace/deinterlace.c @@ -51,7 +51,6 @@ *****************************************************************************/ #define MODE_TEXT N_("Deinterlace mode") -#define MODE_LONGTEXT N_("Deinterlace method to use for local playback.") #define SOUT_MODE_TEXT N_("Streaming deinterlace mode") #define SOUT_MODE_LONGTEXT N_("Deinterlace method to use for streaming.") diff --git a/modules/video_output/decklink.cpp b/modules/video_output/decklink.cpp index d041779..35bfeca 100644 --- a/modules/video_output/decklink.cpp +++ b/modules/video_output/decklink.cpp @@ -82,7 +82,7 @@ static const int pi_channels_maps[CHANNELS_MAX+1] = "Audio connection for DeckLink output.") -#define RATE_TEXT N_("Audio sampling rate in Hz") +#define RATE_TEXT N_("Audio samplerate (Hz)") #define RATE_LONGTEXT N_(\ "Audio sampling rate (in hertz) for DeckLink output. " \ "0 disables audio output.") _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
