From 50b018487bf50dec3d80fc583a2b896d6a990c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Stenac?= Date: Sat, 25 Mar 2006 10:57:34 +0000 Subject: [PATCH] Strings review in stream_out (Refs:#438). Please review these once more as I changed some quite heavily --- modules/stream_out/es.c | 24 +++---- modules/stream_out/gather.c | 2 - modules/stream_out/mosaic_bridge.c | 4 +- modules/stream_out/rtp.c | 37 +++++----- modules/stream_out/standard.c | 15 ++-- modules/stream_out/transcode.c | 110 ++++++++++++++--------------- 6 files changed, 93 insertions(+), 99 deletions(-) diff --git a/modules/stream_out/es.c b/modules/stream_out/es.c index 8788ca66c2..c700471a29 100644 --- a/modules/stream_out/es.c +++ b/modules/stream_out/es.c @@ -36,38 +36,34 @@ *****************************************************************************/ #define ACCESS_TEXT N_("Output access method") #define ACCESS_LONGTEXT N_( \ - "Allows you to specify the output access method used for the streaming " \ - "output." ) + "This is the default output access method that will be used." ) + #define ACCESSA_TEXT N_("Audio output access method") #define ACCESSA_LONGTEXT N_( \ - "Allows you to specify the output access method used for the audio " \ - "streaming output." ) + "This is the output access method that will be used for audio." ) #define ACCESSV_TEXT N_("Video output access method") #define ACCESSV_LONGTEXT N_( \ - "Allows you to specify the output access method used for the video " \ - "streaming output." ) + "This is the output access method that will be used for video." ) #define MUX_TEXT N_("Output muxer") #define MUX_LONGTEXT N_( \ - "Allows you to specify the muxer used for the streaming output." ) + "This is the default muxer method that will be used." ) #define MUXA_TEXT N_("Audio output muxer") #define MUXA_LONGTEXT N_( \ - "Allows you to specify the muxer used for the audio streaming output." ) + "This is the muxer that will be used for audio." ) #define MUXV_TEXT N_("Video output muxer") #define MUXV_LONGTEXT N_( \ - "Allows you to specify the muxer used for the video streaming output." ) + "This is the muxer that will be used for video." ) #define DEST_TEXT N_("Output URL") #define DEST_LONGTEXT N_( \ - "Allows you to specify the output URL used for the streaming output." ) + "This is the default output URI." ) #define DESTA_TEXT N_("Audio output URL") #define DESTA_LONGTEXT N_( \ - "Allows you to specify the output URL used for the audio streaming " \ - "output." ) + "This is the output URI that will be used for audio." ) #define DESTV_TEXT N_("Video output URL") #define DESTV_LONGTEXT N_( \ - "Allows you to specify the output URL used for the video streaming " \ - "output." ) + "This is the output URI that will be used for video." ) static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); diff --git a/modules/stream_out/gather.c b/modules/stream_out/gather.c index 7656801bd4..1cd22c393a 100644 --- a/modules/stream_out/gather.c +++ b/modules/stream_out/gather.c @@ -40,8 +40,6 @@ vlc_module_begin(); set_description( _("Gathering stream output") ); set_capability( "sout stream", 50 ); add_shortcut( "gather" ); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_STREAM ); set_callbacks( Open, Close ); vlc_module_end(); diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c index 3a4fc71a7a..d5c78973ec 100644 --- a/modules/stream_out/mosaic_bridge.c +++ b/modules/stream_out/mosaic_bridge.c @@ -106,10 +106,10 @@ static void video_unlink_picture_decoder( decoder_t *, picture_t * ); #define WIDTH_TEXT N_("Video width") #define WIDTH_LONGTEXT N_( \ - "Allows you to specify the output video width." ) + "Output video width." ) #define HEIGHT_TEXT N_("Video height") #define HEIGHT_LONGTEXT N_( \ - "Allows you to specify the output video height." ) + "Output video height." ) #define RATIO_TEXT N_("Sample aspect ratio") #define RATIO_LONGTEXT N_( \ "Sample aspect ratio of the destination (1:1, 3:4, 2:3)." ) diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index 3dee93dbbc..112df4b551 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -45,47 +45,52 @@ #define DST_TEXT N_("Destination") #define DST_LONGTEXT N_( \ - "Allows you to specify the output URL used for the streaming output." ) + "This is the output URL that will be used." ) #define SDP_TEXT N_("SDP") #define SDP_LONGTEXT N_( \ - "Allows you to specify the SDP used for the streaming output. " \ - "You must use an url: http://location to access the SDP via HTTP, " \ - "rtsp://location for RTSP access, and sap:// for the SDP to be " \ - "announced via SAP." ) + "This allows you to specify how the SDP (Session Descriptor) for this RTP "\ + "session will be made available. You must use an url: http://location to " \ + "access the SDP via HTTP, rtsp://location for RTSP access, and sap:// " \ + "for the SDP to be announced via SAP." ) #define MUX_TEXT N_("Muxer") #define MUX_LONGTEXT N_( \ - "Allows you to specify the muxer used for the streaming output." ) + "This allows you to specify the muxer used for the streaming output. " \ + "Default is to use no muxer (standard RTP stream)." ) #define NAME_TEXT N_("Session name") #define NAME_LONGTEXT N_( \ - "Allows you to specify the session name used for the streaming output." ) + "This is the name of the session that will be announced in the SDP " \ + "(Session Descriptor)." ) #define DESC_TEXT N_("Session description") #define DESC_LONGTEXT N_( \ - "Allows you to give a broader description of the stream." ) + "This allows you to give a broader description of the stream, that will " \ + "be announced in the SDP (Session Descriptor)." ) #define URL_TEXT N_("Session URL") #define URL_LONGTEXT N_( \ - "Allows you to specify a URL with additional information on the stream." ) + "This allows you to give an URL with more details about the stream " \ + "(often the website of the streaming organization), that will " \ + "be announced in the SDP (Session Descriptor)." ) #define EMAIL_TEXT N_("Session email") #define EMAIL_LONGTEXT N_( \ - "Allows you to specify contact e-mail address for this session." ) - + "This allows you to give a contact mail address for the stream, that will " \ + "be announced in the SDP (Session Descriptor)." ) #define PORT_TEXT N_("Port") #define PORT_LONGTEXT N_( \ - "Allows you to specify the base port used for the RTP streaming." ) + "This allows you to specify the base port for the RTP streaming." ) #define PORT_AUDIO_TEXT N_("Audio port") #define PORT_AUDIO_LONGTEXT N_( \ - "Allows you to specify the default audio port used for the RTP streaming." ) + "This allows you to specify the default audio port for the RTP streaming." ) #define PORT_VIDEO_TEXT N_("Video port") #define PORT_VIDEO_LONGTEXT N_( \ - "Allows you to specify the default video port used for the RTP streaming." ) + "This allows you to specify the default video port for the RTP streaming." ) #define TTL_TEXT N_("Time-To-Live (TTL)") #define TTL_LONGTEXT N_( \ - "Allows you to specify the Time-To-Live for the output stream." ) + "This allows you to specify the Time-To-Live for the output stream." ) #define RFC3016_TEXT N_("MP4A LATM") #define RFC3016_LONGTEXT N_( \ - "Allows you to specify using RFC3016 for MPEG4 LATM audio streaming." ) + "This allows you to stream MPEG4 LATM audio streams (see RFC3016)." ) static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index 62e83b7a20..9a31da68fb 100644 --- a/modules/stream_out/standard.c +++ b/modules/stream_out/standard.c @@ -38,23 +38,22 @@ *****************************************************************************/ #define ACCESS_TEXT N_("Output access method") #define ACCESS_LONGTEXT N_( \ - "Allows you to specify the output access method used for the streaming " \ - "output." ) + "This is the output access method that will be used." ) #define MUX_TEXT N_("Output muxer") #define MUX_LONGTEXT N_( \ - "Allows you to specify the output muxer method used for the streaming " \ - "output." ) + "This is the muxer that will be used." ) #define DST_TEXT N_("Output destination") #define DST_LONGTEXT N_( \ - "Allows you to specify the output destination used for the streaming output." ) - + "This is the destination (URL) that will be used for the stream." ) #define NAME_TEXT N_("Session name") #define NAME_LONGTEXT N_( \ - "Name of the session that will be announced with SAP." ) + "This allows you to specify a name for the session, that will be announced "\ + "if you choose to use SAP." ) #define GROUP_TEXT N_("Session groupname") #define GROUP_LONGTEXT N_( \ - "Name of the group that will be announced for the session." ) + "This allows you to specify a group for the session, that will be announced "\ + "if you choose to use SAP." ) #define SAP_TEXT N_("SAP announcing") #define SAP_LONGTEXT N_("Announce this session with SAP.") diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c index 6acd33a768..469d403eb7 100644 --- a/modules/stream_out/transcode.c +++ b/modules/stream_out/transcode.c @@ -45,123 +45,119 @@ *****************************************************************************/ #define VENC_TEXT N_("Video encoder") #define VENC_LONGTEXT N_( \ - "Allows you to specify the video encoder to use and its associated " \ - "options." ) + "This is the video encoder module that will be used (and its associated "\ + "options).") #define VCODEC_TEXT N_("Destination video codec") #define VCODEC_LONGTEXT N_( \ - "Allows you to specify the destination video codec used for the " \ - "streaming output." ) + "This is the video codec that will be used.") #define VB_TEXT N_("Video bitrate") #define VB_LONGTEXT N_( \ - "Allows you to specify the video bitrate used for the streaming " \ - "output." ) + "Target bitrate of the transcoded video stream." ) #define SCALE_TEXT N_("Video scaling") #define SCALE_LONGTEXT N_( \ - "Allows you to scale the video before encoding." ) + "Scale factor to apply to the video while transcoding (eg: 0.25)") #define FPS_TEXT N_("Video frame-rate") #define FPS_LONGTEXT N_( \ - "Allows you to specify an output frame rate for the video." ) + "Target output frame rate for the video stream." ) #define DEINTERLACE_TEXT N_("Deinterlace video") #define DEINTERLACE_LONGTEXT N_( \ - "Allows you to deinterlace the video before encoding." ) + "Deinterlace the video before encoding." ) #define DEINTERLACE_MODULE_TEXT N_("Deinterlace module") #define DEINTERLACE_MODULE_LONGTEXT N_( \ - "Specifies the deinterlace module to use." ) + "Specify the deinterlace module to use." ) #define WIDTH_TEXT N_("Video width") #define WIDTH_LONGTEXT N_( \ - "Allows you to specify the output video width." ) + "Output video width." ) #define HEIGHT_TEXT N_("Video height") #define HEIGHT_LONGTEXT N_( \ - "Allows you to specify the output video height." ) + "Output video height." ) #define MAXWIDTH_TEXT N_("Maximum video width") #define MAXWIDTH_LONGTEXT N_( \ - "Allows you to specify a maximum output video width." ) + "Maximum output video width." ) #define MAXHEIGHT_TEXT N_("Maximum video height") #define MAXHEIGHT_LONGTEXT N_( \ - "Allows you to specify a maximum output video height." ) + "Maximum output video height." ) #define VFILTER_TEXT N_("Video filter") #define VFILTER_LONGTEXT N_( \ - "Allows you to specify video filters used after the video " \ - "transcoding and subpictures overlaying." ) + "Video filters will be applied to the video streams (after overlays " \ + "are applied). You must enter a comma-separated list of filters." ) -#define CROPTOP_TEXT N_("Video crop top") +#define CROPTOP_TEXT N_("Video crop (top)") #define CROPTOP_LONGTEXT N_( \ - "Allows you to specify the top coordinate for the video cropping." ) -#define CROPLEFT_TEXT N_("Video crop left") + "Number of pixels to crop at the top of the video." ) +#define CROPLEFT_TEXT N_("Video crop (left)") #define CROPLEFT_LONGTEXT N_( \ - "Allows you to specify the left coordinate for the video cropping." ) -#define CROPBOTTOM_TEXT N_("Video crop bottom") + "Number of pixels to crop at the left of the video." ) +#define CROPBOTTOM_TEXT N_("Video crop (bottom)") #define CROPBOTTOM_LONGTEXT N_( \ - "Allows you to specify the bottom coordinate for the video cropping." ) -#define CROPRIGHT_TEXT N_("Video crop right") + "Number of pixels to crop at the bottom of the video." ) +#define CROPRIGHT_TEXT N_("Video crop (right)") #define CROPRIGHT_LONGTEXT N_( \ - "Allows you to specify the right coordinate for the video cropping." ) + "Number of pixels to crop at the right of the video." ) -#define PADDTOP_TEXT N_("Video padd top") +#define PADDTOP_TEXT N_("Video padding (top)") #define PADDTOP_LONGTEXT N_( \ - "Allows you to specify padding of black lines at the top." ) -#define PADDLEFT_TEXT N_("Video padd left") + "Size of the black border to add at the top of the video." ) +#define PADDLEFT_TEXT N_("Video padding (left)") #define PADDLEFT_LONGTEXT N_( \ - "Allows you to specify padding of black lines on the left." ) -#define PADDBOTTOM_TEXT N_("Video padd bottom") + "Size of the black border to add at the left of the video." ) +#define PADDBOTTOM_TEXT N_("Video padding (bottom)") #define PADDBOTTOM_LONGTEXT N_( \ - "Allows you to specify padding of black lines at the top." ) -#define PADDRIGHT_TEXT N_("Video padd right") + "Size of the black border to add at the bottom of the video." ) +#define PADDRIGHT_TEXT N_("Video padding (right)") #define PADDRIGHT_LONGTEXT N_( \ - "Allows you to specify padding of black lines on the right." ) + "Size of the black border to add at the right of the video." ) #define CANVAS_WIDTH_TEXT N_("Video canvas width") #define CANVAS_WIDTH_LONGTEXT N_( \ - "Allows to padd or crop the frame to a specified width." ) + "This will automatically crod and pad the video to a specified width." ) #define CANVAS_HEIGHT_TEXT N_("Video canvas height") #define CANVAS_HEIGHT_LONGTEXT N_( \ - "Allows to padd or crop the frame to a specified height." ) + "This will automatically crod and pad the video to a specified height." ) #define CANVAS_ASPECT_TEXT N_("Video canvas aspect ratio") #define CANVAS_ASPECT_LONGTEXT N_( \ - "Set aspect (like 4:3) of video canvas and letterbox accordingly." ) + "This sets aspect (like 4:3) of the video canvas and letterbox the video "\ + "accordingly." ) #define AENC_TEXT N_("Audio encoder") #define AENC_LONGTEXT N_( \ - "Allows you to specify the audio encoder to use and its associated " \ - "options." ) + "This is the audio encoder module that will be used (and its associated "\ + "options).") #define ACODEC_TEXT N_("Destination audio codec") #define ACODEC_LONGTEXT N_( \ - "Allows you to specify the destination audio codec used for the " \ - "streaming output." ) + "This is the audio codec that will be used.") #define AB_TEXT N_("Audio bitrate") #define AB_LONGTEXT N_( \ - "Allows you to specify the audio bitrate used for the streaming " \ - "output." ) + "Target bitrate of the transcoded audio stream." ) #define ARATE_TEXT N_("Audio sample rate") #define ARATE_LONGTEXT N_( \ - "Allows you to specify the audio sample rate used for the streaming " \ - "output." ) + "Sample rate of the transcoded audio stream (11250, 22500, 44100 or 48000).") #define ACHANS_TEXT N_("Audio channels") #define ACHANS_LONGTEXT N_( \ - "Allows you to specify the number of audio channels used for the " \ - "streaming output." ) + "Number of audio channels in the transcoded streams." ) #define SENC_TEXT N_("Subtitles encoder") #define SENC_LONGTEXT N_( \ - "Allows you to specify the subtitles encoder to use and its associated " \ - "options." ) + "This is the subtitles encoder module that will be used (and its " \ + "associated options)." ) #define SCODEC_TEXT N_("Destination subtitles codec") #define SCODEC_LONGTEXT N_( \ - "Allows you to specify the destination subtitles codec used for the " \ - "streaming output." ) -#define SFILTER_TEXT N_("Subpictures filter") + "This is the subtitles coded that will be used." ) + +#define SFILTER_TEXT N_("Overlays") #define SFILTER_LONGTEXT N_( \ - "Allows you to specify subpictures filters used during the video " \ - "transcoding. The subpictures produced by the filters will be overlayed " \ - "directly onto the video." ) + "This allows you to add overlays (also known as \"subpictures\" on the "\ + "transcoded video stream. The subpictures produced by the filters will "\ + "be overlayed directly onto the video. You must specify a comma-separated "\ + "list of subpicture modules" ) #define OSD_TEXT N_("OSD menu") #define OSD_LONGTEXT N_(\ - "Enable streaming of the On Screen Display. It uses the osdmenu subfilter." ) + "Stream the On Screen Display menu (using the osdmenu subpicture module)." ) #define THREADS_TEXT N_("Number of threads") #define THREADS_LONGTEXT N_( \ - "Allows you to specify the number of threads used for the transcoding." ) + "Number of threads used for the transcoding." ) #define HP_TEXT N_("High priority") #define HP_LONGTEXT N_( \ "Runs the optional encoder thread at the OUTPUT priority instead of " \ @@ -173,8 +169,8 @@ "track on the audio track." ) #define HURRYUP_TEXT N_( "Hurry up" ) -#define HURRYUP_LONGTEXT N_( "Allows you to specify if the transcoder " \ - "should drop frames if your CPU can't keep up with the encoding rate." ) +#define HURRYUP_LONGTEXT N_( "The transcoder will drop frames if your CPU " \ + "can't keep up with the encoding rate." ) static char *ppsz_deinterlace_type[] = {