From: Christophe Mutricy <xtophe@videolan.org>
Date: Fri, 23 Mar 2007 21:22:47 +0000 (+0000)
Subject: Fix the strings.
X-Git-Tag: 0.9.0-test0~8048
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=37b0b026bbe92b1bda266e6f30ec37c7ceee767d;p=vlc

Fix the strings.
---

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 3335d9ba25..5285686ccb 100644
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -99,17 +99,16 @@ static const char *ppsz_amtuner_mode_text[] = { N_("Default"),
     "Name of the video device that will be used by the " \
     "DirectShow plugin. If you don't specify anything, the default device " \
     "will be used.")
-/// \bug [String] size stuff should be on video !
 #define ADEV_TEXT N_("Audio device name")
 #define ADEV_LONGTEXT N_( \
     "Name of the audio device that will be used by the " \
     "DirectShow plugin. If you don't specify anything, the default device " \
-    "will be used. You can specify a standard size (cif, d1, ...) or <width>x<height>")
+    "will be used. ")
 #define SIZE_TEXT N_("Video size")
 #define SIZE_LONGTEXT N_( \
     "Size of the video that will be displayed by the " \
     "DirectShow plugin. If you don't specify anything the default size for " \
-    "your device will be used.")
+    "your device will be used. You can specify a standard size (cif, d1, ...) or <width>x<height>.")
 #define CHROMA_TEXT N_("Video input chroma format")
 #define CHROMA_LONGTEXT N_( \
     "Force the DirectShow video input to use a specific chroma format " \
diff --git a/modules/access/http.c b/modules/access/http.c
index a42669589b..e87b8c6df0 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -68,10 +68,9 @@ static void Close( vlc_object_t * );
     "Automatically try to reconnect to the stream in case of a sudden " \
     "disconnect." )
 
-/// \bug missing space before you should
 #define CONTINUOUS_TEXT N_("Continuous stream")
 #define CONTINUOUS_LONGTEXT N_("Read a file that is " \
-    "being constantly updated (for example, a JPG file on a server)." \
+    "being constantly updated (for example, a JPG file on a server). " \
     "You should not globally enable this option as it will break all other " \
     "types of HTTP streams." )
 
diff --git a/modules/access/pvr.c b/modules/access/pvr.c
index bc89100771..41f3c2e4f2 100644
--- a/modules/access/pvr.c
+++ b/modules/access/pvr.c
@@ -87,8 +87,7 @@ static void Close( vlc_object_t * );
 #define BITRATE_PEAK_TEXT N_( "Bitrate peak" )
 #define BITRATE_PEAK_LONGTEXT N_( "Peak bitrate in VBR mode." )
 
-/// \bug extra parenthesis
-#define BITRATE_MODE_TEXT N_( "Bitrate mode)" )
+#define BITRATE_MODE_TEXT N_( "Bitrate mode" )
 #define BITRATE_MODE_LONGTEXT N_( "Bitrate mode to use (VBR or CBR)." )
 
 #define BITMASK_TEXT N_( "Audio bitmask" )
diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index 6de43253c6..04453eb110 100644
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -65,12 +65,9 @@ static void Close( vlc_object_t * );
 #define PASS_TEXT N_("Password")
 #define PASS_LONGTEXT N_("Password that will be " \
                          "requested to access the stream." )
-
-/// \bug [String] missing closing parenthesis
 #define MIME_TEXT N_("Mime")
 #define MIME_LONGTEXT N_("MIME returned by the server (autodetected " \
-                        "if not specified." )
-
+                        "if not specified)." )
 #define CERT_TEXT N_( "Certificate file" )
 #define CERT_LONGTEXT N_( "Path to the x509 PEM certificate file that will "\
                           "be used for HTTPS." )
diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c
index e3cc9056b5..15f24fb2c8 100644
--- a/modules/audio_filter/equalizer.c
+++ b/modules/audio_filter/equalizer.c
@@ -52,11 +52,10 @@ static void Close( vlc_object_t * );
 #define PRESET_LONGTEXT N_("Preset to use for the equalizer." )
 
 #define BANDS_TEXT N_( "Bands gain")
-/// \bug [String] missing dot
 #define BANDS_LONGTEXT N_( \
          "Don't use presets, but manually specified bands. You need to " \
          "provide 10 values between -20dB and 20dB, separated by spaces, " \
-         "e.g. \"0 2 4 2 0 -2 -4 -2 0\"" )
+         "e.g. \"0 2 4 2 0 -2 -4 -2 0\"." )
 
 #define TWOPASS_TEXT N_( "Two pass" )
 #define TWOPASS_LONGTEXT N_( "Filter the audio twice. This provides a more "  \
diff --git a/modules/demux/mod.c b/modules/demux/mod.c
index 12731ac234..1aa49b424f 100644
--- a/modules/demux/mod.c
+++ b/modules/demux/mod.c
@@ -44,8 +44,7 @@
 static int  Open    ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
-/// \bug [String] missing .
-#define NOISE_LONGTEXT N_("Enable noise reduction algorithm")
+#define NOISE_LONGTEXT N_("Enable noise reduction algorithm.")
 #define REVERB_LONGTEXT N_("Enable reverberation" )
 #define REVERB_LEVEL_LONGTEXT N_( "Reverberation level (from 0 " \
                 "to 100, default value is 0)." )
@@ -54,14 +53,13 @@ static void Close  ( vlc_object_t * );
 #define MEGABASS_LONGTEXT N_( "Enable megabass mode" )
 #define MEGABASS_LEVEL_LONGTEXT N_("Megabass mode level (from 0 to 100, " \
                 "default value is 0)." )
-/// \bug [String] Missing space after dot
-#define MEGABASS_RANGE_LONGTEXT N_("Megabass mode cutoff frequency, in Hz." \
+#define MEGABASS_RANGE_LONGTEXT N_("Megabass mode cutoff frequency, in Hz. " \
                 "This is the maximum frequency for which the megabass " \
-                "effect applies. Valid values are from 10 to 100 Hz" )
+                "effect applies. Valid values are from 10 to 100 Hz." )
 #define SURROUND_LEVEL_LONGTEXT N_( "Surround effect level (from 0 to 100, " \
                 "default value is 0)." )
 #define SURROUND_DELAY_LONGTEXT N_("Surround delay, in ms. Usual values are " \
-                "from 5 to 40 ms" )
+                "from 5 to 40 ms." )
 
 vlc_module_begin();
     set_shortname( "MOD");
diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index 7615e59cb6..4add6d98c9 100644
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -34,9 +34,8 @@
  * Module descriptor
  *****************************************************************************/
 #define AUTOSTART_TEXT N_( "Auto start" )
-/// \bug [String] Why \n ?
 #define AUTOSTART_LONGTEXT N_( "Automatically start playing the playlist " \
-                "content once it's loaded.\n" )
+                "content once it's loaded." )
 
 #define SHOW_ADULT_TEXT N_( "Show shoutcast adult content" )
 #define SHOW_ADULT_LONGTEXT N_( "Show NC17 rated video streams when " \
diff --git a/modules/gui/macosx/equalizer.m b/modules/gui/macosx/equalizer.m
index 345412d82b..ed5fe88385 100644
--- a/modules/gui/macosx/equalizer.m
+++ b/modules/gui/macosx/equalizer.m
@@ -138,8 +138,7 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
     int i;
     [o_btn_equalizer setToolTip: _NS("Equalizer")];
     [o_ckb_2pass setTitle: _NS("2 Pass")];
-    [o_ckb_2pass setToolTip: _NS("Apply the"
-/// \bug [String] missing space
+    [o_ckb_2pass setToolTip: _NS("Apply the "
         "equalizer filter twice. The effect will be sharper.")];
     [o_ckb_enable setTitle: _NS("Enable")];
     [o_ckb_enable setToolTip: _NS("Enable the equalizer. Bands can be set "
diff --git a/modules/gui/wxwidgets/dialogs/open.cpp b/modules/gui/wxwidgets/dialogs/open.cpp
index 531a3468a5..59f5bad490 100644
--- a/modules/gui/wxwidgets/dialogs/open.cpp
+++ b/modules/gui/wxwidgets/dialogs/open.cpp
@@ -1666,14 +1666,12 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) )
         disc_audio->SetRange( 0, 7 );  // up to 8 audio channels
         disc_chapter->SetRange( 0, 255 );
         disc_title->SetToolTip( wxU(_("Title number.")) );
-        // \bug [string] needs to be DVDs instead of DVD's
         disc_sub->SetToolTip( wxU(_(
-          "DVD's can have up to 32 subtitles numbered 0..31. "
+          "DVDs can have up to 32 subtitles numbered 0..31. "
           "Note this is not the same thing as a subtitle name (e.g. 'en'). "
           "If a value -1 is used, no subtitle will be shown." )) );
-        // \bug [string] needs to be DVDs instead of DVD's
         disc_audio->SetToolTip( wxU(_("Audio track number. "
-          "DVD's can have up to 8 audio tracks numbered 0..7."
+          "DVDs can have up to 8 audio tracks numbered 0..7."
         )) );
         break;
 
@@ -1709,13 +1707,11 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) )
         disc_title->SetRange( 0, 99 );  // only 100 tracks allowed on VCDs
         disc_sub->SetRange( -1, 3 );    // up to 4 subtitles -1 = no subtitle
         disc_audio->SetRange( 0, 1 );   // up to 2 audio tracks
-        // \bug [string] needs to be SVCDs instead of SVCD's
         disc_sub->SetToolTip( wxU(_(
-          "SVCD's can have up to 4 subtitles numbered 0..3. "
+          "SVCDs can have up to 4 subtitles numbered 0..3. "
           "If a value -1 is used, no subtitle will be shown." )) );
-        // \bug [string] needs to be SVCDs instead of SVCD's
         disc_audio->SetToolTip( wxU(_("Audio track number. "
-          "VCD's can have up to 2 audio tracks numbered 0 or 1. "
+          "VCDs can have up to 2 audio tracks numbered 0 or 1. "
         )) );
         break;
 
diff --git a/modules/misc/notify/growl.c b/modules/misc/notify/growl.c
index 59b38e8eb3..0bbf897185 100644
--- a/modules/misc/notify/growl.c
+++ b/modules/misc/notify/growl.c
@@ -53,19 +53,15 @@ static int CheckAndSend( vlc_object_t *p_this, uint8_t* p_data, int i_offset );
  * Module descriptor
  ****************************************************************************/
 
-/// \bug [String] REmove all "Growl" in short desc
-
 #define SERVER_DEFAULT "127.0.0.1"
-#define SERVER_TEXT N_("Growl server")
+#define SERVER_TEXT N_("Server")
 #define SERVER_LONGTEXT N_("This is the host to which Growl notifications " \
    "will be sent. By default, notifications are sent locally." )
 #define PASS_DEFAULT ""
-#define PASS_TEXT N_("Growl password")
-/// \bug [String] Password on the Growl server.
-#define PASS_LONGTEXT N_("Growl password on the server.")
-#define PORT_TEXT N_("Growl UDP port")
-/// \bug [String] UDP port on the Growl server
-#define PORT_LONGTEXT N_("Growl UDP port on the server.")
+#define PASS_TEXT N_("Password")
+#define PASS_LONGTEXT N_("Growl password on the Growl server.")
+#define PORT_TEXT N_("UDP port")
+#define PORT_LONGTEXT N_("Growl UDP port on the Growl server.")
 
 vlc_module_begin();
     set_category( CAT_INTERFACE );
diff --git a/modules/misc/notify/msn.c b/modules/misc/notify/msn.c
index 6b2edd9dbc..dbb6302462 100644
--- a/modules/misc/notify/msn.c
+++ b/modules/misc/notify/msn.c
@@ -59,8 +59,7 @@ static int SendToMSN( char * psz_msg );
  * You need to enable the "What I'm Listening To" option in MSN.
  *****************************************************************************/
 #define FORMAT_DEFAULT "{0} - {1}"
-/// \bug [String] MSN is useless
-#define FORMAT_TEXT N_("MSN Title format string")
+#define FORMAT_TEXT N_("Title format string")
 #define FORMAT_LONGTEXT N_("Format of the string to send to MSN " \
 "{0} Artist, {1} Title, {2} Album. Defaults to \"Artist - Title\" ({0} - {1}).")
 
diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index 99cd4e5b32..fcb8b32e95 100644
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -48,11 +48,10 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 #define HOST_TEXT N_( "RTSP host address" )
-/// \bug [String] extra space
 #define HOST_LONGTEXT N_( \
     "This defines the address, port and path the RTSP VOD server will listen " \
     "on.\nSyntax is address:port/path. The default is to listen on all "\
-    "interfaces (address 0.0.0.0), on port 554, with no path.\n To listen " \
+    "interfaces (address 0.0.0.0), on port 554, with no path.\nTo listen " \
     "only on the local interface, use \"localhost\" as address." )
 
 #define THROTLE_TEXT N_( "Maximum number of connections" )
diff --git a/modules/misc/win32text.c b/modules/misc/win32text.c
index 5b6fa4c30b..266eb03798 100644
--- a/modules/misc/win32text.c
+++ b/modules/misc/win32text.c
@@ -54,11 +54,10 @@ static int SetFont( filter_t *, int );
 #define FONT_TEXT N_("Font")
 #define FONT_LONGTEXT N_("Filename for the font you want to use")
 #define FONTSIZE_TEXT N_("Font size in pixels")
-/// \bug [String] extra space
 #define FONTSIZE_LONGTEXT N_("This is the default size of the fonts " \
      "that will be rendered on the video. " \
      "If set to something different than 0 this option will override the " \
-     "relative font size. " )
+     "relative font size." )
 #define OPACITY_TEXT N_("Opacity")
 #define OPACITY_LONGTEXT N_("The opacity (inverse of transparency) of the " \
      "text that will be rendered on the video. 0 = transparent, " \
diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index 6ab9275874..33a348e742 100644
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -157,10 +157,9 @@ static void    Close  ( vlc_object_t * );
   "16 char string (8 hexadecimal bytes).")
 
 #define CPKT_TEXT N_("Packet size in bytes to encrypt")
-/// \bug [String] Extra space
 #define CPKT_LONGTEXT N_("Size of the TS packet to encrypt. " \
     "The encryption routines subtract the TS-header from the value before " \
-    "encrypting. " )
+    "encrypting." )
 
 #define SOUT_CFG_PREFIX "sout-ts-"
 #ifdef HAVE_BSEARCH
diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index 04d1a60a04..ba4463932d 100644
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -38,17 +38,14 @@
  * Module descriptor
  *****************************************************************************/
 #define ACCESS_TEXT N_("Output access method")
-/// \bug [String] "Output method to use for the stream." 
 #define ACCESS_LONGTEXT N_( \
-    "This is the output access method that will be used." )
+    "Output method to use for the stream." )
 #define MUX_TEXT N_("Output muxer")
-/// \bug [String] "Muxer to use for the stream." 
 #define MUX_LONGTEXT N_( \
-    "This is the muxer that will be used." )
+    "Muxer to use for the stream." )
 #define DST_TEXT N_("Output destination")
-/// \bug [String] "Destination (URL) to use for the stream." 
 #define DST_LONGTEXT N_( \
-    "This is the destination (URL) that will be used for the stream." )
+    "Destination (URL) to use for the stream." )
 #define NAME_TEXT N_("Session name")
 #define NAME_LONGTEXT N_( \
   "This allows you to specify a name for the session, that will be announced "\
diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index 8b69a17700..ad0b3fb17b 100644
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -122,10 +122,9 @@ struct filter_sys_t
         "fixed: use the user-defined number of rows and columns. " \
         "offsets: use the user-defined offsets for each image." )
 
-/// \bug [String] missing closing parenthesis
 #define ROWS_TEXT N_("Number of rows")
 #define ROWS_LONGTEXT N_("Number of image rows in the mosaic (only used if "\
-        "positionning method is set to \"fixed\"." )
+        "positionning method is set to \"fixed\")." )
 #define COLS_TEXT N_("Number of columns")
 #define COLS_LONGTEXT N_("Number of image columns in the mosaic (only used if "\
         "positionning method is set to \"fixed\"." )
diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c
index 72692e0fb2..3f32e7dab7 100644
--- a/modules/video_filter/osdmenu.c
+++ b/modules/video_filter/osdmenu.c
@@ -38,9 +38,8 @@
 
 /* FIXME: Future extension make the definition file in XML format. */
 #define OSD_FILE_TEXT N_("Configuration file")
-/// \bug [String] missing dot
 #define OSD_FILE_LONGTEXT N_( \
-    "Configuration file for the OSD Menu" )
+    "Configuration file for the OSD Menu." )
 #define OSD_PATH_TEXT N_("Path to OSD menu images")
 #define OSD_PATH_LONGTEXT N_( \
     "Path to the OSD menu images. This will override the path defined in the " \
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 9c308efd93..754d7b2d49 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -381,10 +381,9 @@ static const char *ppsz_align_descriptions[] =
     "pixels (1:1). If you have a 16:9 screen, you might need to change this " \
     "to 4:3 in order to keep proportions.")
 
-/// \bug [String] Remove "this option"
 #define SKIP_FRAMES_TEXT N_("Skip frames")
 #define SKIP_FRAMES_LONGTEXT N_( \
-    "This option enables framedropping on MPEG2 stream. Framedropping " \
+    "Enables framedropping on MPEG2 stream. Framedropping " \
     "occurs when your computer is not powerful enough" )
 
 #define DROP_LATE_FRAMES_TEXT N_("Drop late frames")
@@ -558,11 +557,10 @@ static const char *ppsz_clock_descriptions[] =
 #define TEXTRENDERER_LONGTEXT N_( \
     "VLC normally uses Freetype for rendering, but this allows you to use svg for instance.")
 
-/// \bug typo arbitraty
 #define SUB_FILTER_TEXT N_("Subpictures filter module")
 #define SUB_FILTER_LONGTEXT N_( \
     "This adds so-called \"subpicture filters\". These filters overlay " \
-    "some images or text over the video (like a logo, arbitraty text...)." )
+    "some images or text over the video (like a logo, arbitrary text...)." )
 
 #define SUB_AUTO_TEXT N_("Autodetect subtitle files")
 #define SUB_AUTO_LONGTEXT N_( \