Remove more unused msgid defines and de-duplication

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index 84efcb63dd13a08590c808c65ba8405d7e389891..7cb796b4794b98f1267747d590cdc3922371f742 100644 (file)
--- 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 c9be327c5a9f7a8f5f0d71cd4a2ace131c7935c0..4cc50dba5dab6e7d75dea88628cac261950a99c7 100644 (file)
--- 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 c68e63241c89855a2b83c9e8b2467d349b070036..b0e30262880e524d76e0be063b7620d0170134d7 100644 (file)
--- 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 6f1e8e43a04f35f3ede053fbf52fdc29e4e7ec94..3dd9d0a238db5e049223855b52096d7ea7a90675 100644 (file)
--- 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 17167334d4b197a843f917b4a62144112b0bb904..c26978aaa0bb782753627d12afc6e05b45fe422d 100644 (file)
--- 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 19a4ca5f263e23c0d696de7e8c027fe2b1db643a..7ec31e9fa64d7fe4789df125c19ad25ac92723e0 100644 (file)
--- 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 11ae967653e5f1ca96ebfc90ecbc4616e1644af6..9ed8de6b3bcd85389f4077696dc1dd684bc1295f 100644 (file)
--- 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 71953d5ad1cd4e9eecc1203323f7cdc4ab195d0a..4392a0cd89ef6b070fd0706981b4662a49bcc611 100644 (file)
--- 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 d04177922427448d824a1b8f3f28c860effcc5b8..35bfeca7f427cbc852eef905cf6dd4b899bc3845 100644 (file)
--- 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.")