Commit 9cd6df73 authored by Edward Wang's avatar Edward Wang Committed by Felix Paul Kühne
Browse files

Correct widespread misuse of the word 'subtitle'



Subtitle is the adjective describing what kind of text. So "subtitle text" is an adjective phrase describing what kind of encoding.

For example, we don't listen to "audios tracks", program "videos codecs", or open "playlists files". Therefore, use the correct form of the word subtitle for the context.
Signed-off-by: Felix Paul Kühne's avatarFelix Paul Kühne <fkuehne@videolan.org>
parent 25fe96d2
......@@ -113,7 +113,7 @@ Simply drag VLC from the place where you had installed it, to the Trash. If you
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qj
\b0 \cf0 \ulnone - VLC will autodetect subtitle files when they are in the same directory as your movie and contain the movie's filename.\
- DVD and autodetected subtitles can be enabled trough the Video -> Subtitles Track menu-item.\
- DVD and autodetected subtitles can be enabled through the Video -> Subtitle Track menu item.\
- Only Vobsub, MicroDVD, SubRIP, SSA1-4. SAMI and vplayer subtitle files are supported at the moment.\
- You cannot change anything about DVD and Vobsub subtitles.\
- You can add any subtitle files to a video file via the Open.. dialog.\
......@@ -165,4 +165,4 @@ An editable wiki is available at \ul http://wiki.videolan.org\ulnone .\
For additional information and support, please see: \ul http://www.videolan.org/support\ulnone \
-- \
Derk-Jan Hartman & Felix Paul K\'fchne for the VideoLAN team.\
}
\ No newline at end of file
}
......@@ -2287,7 +2287,7 @@
</object>
<object class="NSMenuItem" id="897405414">
<reference key="NSMenu" ref="598695780"/>
<string key="NSTitle">Subtitles track</string>
<string key="NSTitle">Subtitle track</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
......@@ -2295,7 +2295,7 @@
<reference key="NSMixedImage" ref="100133332"/>
<string key="NSAction">submenuAction:</string>
<object class="NSMenu" key="NSSubmenu" id="451511994">
<string key="NSTitle">Subtitles track</string>
<string key="NSTitle">Subtitle track</string>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="582837384">
......
......@@ -214,7 +214,7 @@
<object class="NSButtonCell" key="NSCell" id="505386145">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Load subtitles file:</string>
<string key="NSContents">Load subtitle file:</string>
<reference key="NSSupport" ref="725567486"/>
<reference key="NSControlView" ref="895203276"/>
<int key="NSButtonFlags">1211912703</int>
......@@ -1339,7 +1339,7 @@ c3ViX2FsaWduX2xibDsKCg</string>
<object class="NSTextFieldCell" key="NSCell" id="16061800">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">4194304</int>
<string key="NSContents">Subtitles justification</string>
<string key="NSContents">Subtitle justification</string>
<reference key="NSSupport" ref="725567486"/>
<reference key="NSControlView" ref="1062804181"/>
<reference key="NSBackgroundColor" ref="227735768"/>
......
......@@ -390,7 +390,7 @@
<object class="NSTextFieldCell" key="NSCell" id="432856306">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272761856</int>
<string key="NSContents">Subtitles speed:</string>
<string key="NSContents">Subtitle speed:</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="1031205444"/>
<reference key="NSBackgroundColor" ref="592262308"/>
......@@ -485,7 +485,7 @@
<object class="NSTextFieldCell" key="NSCell" id="888222676">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272761856</int>
<string key="NSContents">Subtitles duration factor:</string>
<string key="NSContents">Subtitle duration factor:</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="934030007"/>
<reference key="NSBackgroundColor" ref="592262308"/>
......
......@@ -115,8 +115,8 @@
#define ADEC_TITLE N_( "Audio codecs" )
#define ADEC_HELP N_( "Settings for the audio-only decoders and encoders." )
#define SDEC_TITLE N_( "Subtitles codecs")
#define SDEC_HELP N_( "Settings for subtitles, teletext and CC decoders and encoders." )
#define SDEC_TITLE N_( "Subtitle codecs")
#define SDEC_HELP N_( "Settings for subtitle, teletext and CC decoders and encoders." )
#define ADVANCED_TITLE N_("General Input" )
#define ADVANCED_HELP N_( "General input settings. Use with care..." )
......@@ -200,7 +200,7 @@
#define ENCODER_TITLE N_("Encoders settings")
#define ENCODER_HELP N_( \
"These are general settings for video/audio/subtitles encoding modules.")
"These are general settings for video/audio/subtitle encoding modules.")
#define DIALOGS_TITLE N_("Dialog providers settings")
......@@ -210,7 +210,7 @@
#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 subtitles type or file name.")
"for example by setting the subtitle type or file name.")
/*
* A little help for modules with unknown capabilities
......
/*****************************************************************************
* subsdec.c : text subtitles decoder
* subsdec.c : text subtitle decoder
*****************************************************************************
* Copyright (C) 2000-2006 VLC authors and VideoLAN
* $Id$
......@@ -163,13 +163,13 @@ static const int pi_justification[] = { 0, 1, 2 };
static const char *const ppsz_justification_text[] = {
N_("Center"),N_("Left"),N_("Right")};
#define ENCODING_TEXT N_("Subtitles text encoding")
#define ENCODING_TEXT N_("Subtitle text encoding")
#define ENCODING_LONGTEXT N_("Set the encoding used in text subtitles")
#define ALIGN_TEXT N_("Subtitles justification")
#define ALIGN_TEXT N_("Subtitle justification")
#define ALIGN_LONGTEXT N_("Set the justification of subtitles")
#define AUTODETECT_UTF8_TEXT N_("UTF-8 subtitles autodetection")
#define AUTODETECT_UTF8_TEXT N_("UTF-8 subtitle autodetection")
#define AUTODETECT_UTF8_LONGTEXT N_("This enables automatic detection of " \
"UTF-8 encoding within subtitles files.")
"UTF-8 encoding within subtitle files.")
#define FORMAT_TEXT N_("Formatted Subtitles")
#define FORMAT_LONGTEXT N_("Some subtitle formats allow for text formatting. " \
"VLC partly implements this, but you can choose to disable all formatting.")
......@@ -179,7 +179,7 @@ static void CloseDecoder ( vlc_object_t * );
vlc_module_begin ()
set_shortname( N_("Subtitles"))
set_description( N_("Text subtitles decoder") )
set_description( N_("Text subtitle decoder") )
set_capability( "decoder", 50 )
set_callbacks( OpenDecoder, CloseDecoder )
set_category( CAT_INPUT )
......
......@@ -853,7 +853,7 @@ static void Help( intf_thread_t *p_intf, bool b_longhelp)
msg_rc("%s", _("| vcrop [X] . . . . . . . . . . . set/get video crop"));
msg_rc("%s", _("| vzoom [X] . . . . . . . . . . . set/get video zoom"));
msg_rc("%s", _("| snapshot . . . . . . . . . . . . take video snapshot"));
msg_rc("%s", _("| strack [X] . . . . . . . . . set/get subtitles track"));
msg_rc("%s", _("| strack [X] . . . . . . . . . set/get subtitle track"));
msg_rc("%s", _("| key [hotkey name] . . . . . . simulate hotkey press"));
msg_rc("%s", _("| menu . . [on|off|up|down|left|right|select] use menu"));
msg_rc( "| ");
......
......@@ -1487,7 +1487,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux )
/* We need to get rid of the header packet */
ogg_stream_packetout( &p_stream->os, &oggpacket );
msg_Dbg( p_demux, "found text subtitles header" );
msg_Dbg( p_demux, "found text subtitle header" );
p_stream->fmt.i_cat = SPU_ES;
p_stream->fmt.i_codec = VLC_CODEC_SUBT;
p_stream->f_rate = 1000; /* granulepos is in millisec */
......
......@@ -67,7 +67,7 @@ static const char *const ppsz_sub_type[] =
vlc_module_begin ()
set_shortname( N_("Subtitles"))
set_description( N_("Text subtitles parser") )
set_description( N_("Text subtitle parser") )
set_capability( "demux", 0 )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX )
......@@ -75,12 +75,12 @@ vlc_module_begin ()
N_("Frames per second"),
SUB_FPS_LONGTEXT, true )
add_integer( "sub-delay", 0,
N_("Subtitles delay"),
N_("Subtitle delay"),
SUB_DELAY_LONGTEXT, true )
add_string( "sub-type", "auto", N_("Subtitles format"),
add_string( "sub-type", "auto", N_("Subtitle format"),
SUB_TYPE_LONGTEXT, true )
change_string_list( ppsz_sub_type, ppsz_sub_type )
add_string( "sub-description", NULL, N_("Subtitles description"),
add_string( "sub-description", NULL, N_("Subtitle description"),
SUB_DESCRIPTION_LONGTEXT, true )
set_callbacks( Open, Close )
......
......@@ -391,8 +391,8 @@ static VLCMainMenu *_o_sharedInstance = nil;
[o_mu_crop setTitle: _NS("Crop")];
[o_mi_screen setTitle: _NS("Fullscreen Video Device")];
[o_mu_screen setTitle: _NS("Fullscreen Video Device")];
[o_mi_subtitle setTitle: _NS("Subtitles Track")];
[o_mu_subtitle setTitle: _NS("Subtitles Track")];
[o_mi_subtitle setTitle: _NS("Subtitle Track")];
[o_mu_subtitle setTitle: _NS("Subtitle Track")];
[o_mi_addSub setTitle: _NS("Open File...")];
[o_mi_deinterlace setTitle: _NS("Deinterlace")];
[o_mu_deinterlace setTitle: _NS("Deinterlace")];
......@@ -1174,7 +1174,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
}
/* special case for the subtitles item */
if ([[o_parent title] isEqualToString: _NS("Subtitles Track")] == YES) {
if ([[o_parent title] isEqualToString: _NS("Subtitle Track")] == YES) {
NSMenuItem * o_lmi_tmp;
o_lmi_tmp = [o_menu addItemWithTitle: _NS("Open File...") action: @selector(addSubtitleFile:) keyEquivalent: @""];
[o_lmi_tmp setTarget: [[VLCMain sharedInstance] controls]];
......@@ -1222,7 +1222,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
[o_parent setEnabled: (val_list.p_list->i_count > 1)];
/* another special case for the subtitles item */
if ([[o_parent title] isEqualToString: _NS("Subtitles Track")] == YES)
if ([[o_parent title] isEqualToString: _NS("Subtitle Track")] == YES)
[o_menu addItem: [NSMenuItem separatorItem]];
for (i = 0; i < val_list.p_list->i_count; i++) {
......@@ -1268,7 +1268,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
/* special case for the subtitles sub-menu
* In case that we don't have any subs, we don't want a separator item at the end */
if ([[o_parent title] isEqualToString: _NS("Subtitles Track")] == YES) {
if ([[o_parent title] isEqualToString: _NS("Subtitle Track")] == YES) {
if ([o_menu numberOfItems] == 2)
[o_menu removeItemAtIndex: 1];
}
......
......@@ -66,9 +66,9 @@ static VLCTrackSynchronization *_o_sharedInstance = nil;
[o_sv_advance_lbl setStringValue: _NS("Subtitle track syncronization:")];
[[o_sv_advance_value_fld formatter] setFormat:[NSString stringWithFormat:@"#,##0.000 %@", _NS("s")]];
[o_sv_advance_value_fld setToolTip: _NS("A positive value means that the subtitles are ahead of the video")];
[o_sv_speed_lbl setStringValue: _NS("Subtitles speed:")];
[o_sv_speed_lbl setStringValue: _NS("Subtitle speed:")];
[[o_sv_speed_value_fld formatter] setFormat:[NSString stringWithFormat:@"#,##0.000 %@", _NS("fps")]];
[o_sv_dur_lbl setStringValue: _NS("Subtitles duration factor:")];
[o_sv_dur_lbl setStringValue: _NS("Subtitle duration factor:")];
int i_mode = var_InheritInteger(p_intf, SUBSDELAY_CFG_MODE);
NSString * o_toolTip, * o_suffix;
......@@ -76,15 +76,15 @@ static VLCTrackSynchronization *_o_sharedInstance = nil;
switch (i_mode) {
default:
case SUBSDELAY_MODE_ABSOLUTE:
o_toolTip = _NS("Extend subtitles duration by this value.\nSet 0 to disable.");
o_toolTip = _NS("Extend subtitle duration by this value.\nSet 0 to disable.");
o_suffix = @" s";
break;
case SUBSDELAY_MODE_RELATIVE_SOURCE_DELAY:
o_toolTip = _NS("Multiply subtitles duration by this value.\nSet 0 to disable.");
o_toolTip = _NS("Multiply subtitle duration by this value.\nSet 0 to disable.");
o_suffix = @"";
break;
case SUBSDELAY_MODE_RELATIVE_SOURCE_CONTENT:
o_toolTip = _NS("Recalculate subtitles duration according\nto their content and this value.\nSet 0 to disable.");
o_toolTip = _NS("Recalculate subtitle duration according\nto their content and this value.\nSet 0 to disable.");
o_suffix = @"";
break;
}
......
......@@ -348,7 +348,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
module_config_t * p_item;
intf_thread_t * p_intf = VLCIntf;
[o_file_sub_ckbox setTitle: _NS("Load subtitles file:")];
[o_file_sub_ckbox setTitle: _NS("Load subtitle file:")];
[o_file_sub_path_lbl setStringValue: _NS("Choose a file")];
[o_file_sub_path_lbl setHidden: NO];
[o_file_sub_path_fld setStringValue: @""];
......@@ -361,11 +361,11 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_file_sub_delay_stp setEnabled: NO];
[o_file_sub_fps_lbl setStringValue: _NS("FPS")];
[o_file_sub_fps_stp setEnabled: NO];
[o_file_sub_encoding_lbl setStringValue: _NS("Subtitles encoding")];
[o_file_sub_encoding_lbl setStringValue: _NS("Subtitle encoding")];
[o_file_sub_encoding_pop removeAllItems];
[o_file_sub_size_lbl setStringValue: _NS("Font size")];
[o_file_sub_size_pop removeAllItems];
[o_file_sub_align_lbl setStringValue: _NS("Subtitles alignment")];
[o_file_sub_align_lbl setStringValue: _NS("Subtitle alignment")];
[o_file_sub_align_pop removeAllItems];
[o_file_sub_ok_btn setStringValue: _NS("OK")];
[[o_file_sub_ok_btn cell] accessibilitySetOverrideValue:_NS("Click to dismiss the subtitle setup dialog.") forAttribute:NSAccessibilityDescriptionAttribute];
......
......@@ -143,7 +143,7 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
} else if ([o_itemIdent isEqual: VLCVideoSettingToolbarIdentifier]) {
CreateToolbarItem(_NS("Video"), _NS("General Video Settings"), @"spref_cone_Video_64", showVideoSettings);
} else if ([o_itemIdent isEqual: VLCOSDSettingToolbarIdentifier]) {
CreateToolbarItem(_NS(SUBPIC_TITLE), _NS("Subtitles & On Screen Display Settings"), @"spref_cone_Subtitles_64", showOSDSettings);
CreateToolbarItem(_NS(SUBPIC_TITLE), _NS("Subtitle & On Screen Display Settings"), @"spref_cone_Subtitles_64", showOSDSettings);
} else if ([o_itemIdent isEqual: VLCInputSettingToolbarIdentifier]) {
CreateToolbarItem(_NS(INPUT_TITLE), _NS("Input & Codec settings"), @"spref_cone_Input_64", showInputSettings);
} else if ([o_itemIdent isEqual: VLCHotkeysSettingToolbarIdentifier]) {
......
......@@ -131,7 +131,7 @@ static const char* const tooltipL[BUTTON_MAX] = { I_PLAY_TOOLTIP,
N_("Reverse"), N_("Step backward"), N_("Step forward"), N_("Quit"),
N_("Random"), N_("Change the loop and repeat modes"), N_("Information"),
N_("Previous media in the playlist"), N_("Next media in the playlist"),
N_("Open subtitles file"),
N_("Open subtitle file"),
N_("Dock/undock fullscreen controller to/from bottom of screen")
};
static const QString iconL[BUTTON_MAX] ={ ":/toolbar/play_b", ":/toolbar/stop_b",
......
......@@ -1483,7 +1483,7 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) :
subsLayout->addWidget( subsSpin, 0, 2, 1, 1 );
QLabel *subSpeedLabel = new QLabel;
subSpeedLabel->setText( qtr( "Subtitles speed:" ) );
subSpeedLabel->setText( qtr( "Subtitle speed:" ) );
subsLayout->addWidget( subSpeedLabel, 1, 0, 1, 1 );
subSpeedSpin = new QDoubleSpinBox;
......@@ -1497,7 +1497,7 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) :
subsLayout->addWidget( subSpeedSpin, 1, 2, 1, 1 );
QLabel *subDurationLabel = new QLabel;
subDurationLabel->setText( qtr( "Subtitles duration factor:" ) );
subDurationLabel->setText( qtr( "Subtitle duration factor:" ) );
subsLayout->addWidget( subDurationLabel, 2, 0, 1, 1 );
subDurationSpin = new QDoubleSpinBox;
......@@ -1608,17 +1608,17 @@ void SyncControls::initSubsDuration()
{
default:
case SUBSDELAY_MODE_ABSOLUTE:
subDurationSpin->setToolTip( qtr( "Extend subtitles duration by this value.\n"
subDurationSpin->setToolTip( qtr( "Extend subtitle duration by this value.\n"
"Set 0 to disable." ) );
subDurationSpin->setSuffix( " s" );
break;
case SUBSDELAY_MODE_RELATIVE_SOURCE_DELAY:
subDurationSpin->setToolTip( qtr( "Multiply subtitles duration by this value.\n"
subDurationSpin->setToolTip( qtr( "Multiply subtitle duration by this value.\n"
"Set 0 to disable." ) );
subDurationSpin->setSuffix( "" );
break;
case SUBSDELAY_MODE_RELATIVE_SOURCE_CONTENT:
subDurationSpin->setToolTip( qtr( "Recalculate subtitles duration according\n"
subDurationSpin->setToolTip( qtr( "Recalculate subtitle duration according\n"
"to their content and this value.\n"
"Set 0 to disable." ) );
subDurationSpin->setSuffix( "" );
......
......@@ -249,7 +249,7 @@ void FileOpenPanel::removeFile()
void FileOpenPanel::browseFileSub()
{
// TODO Handle selection of more than one subtitles file
QStringList files = THEDP->showSimpleOpen( qtr("Open subtitles file"),
QStringList files = THEDP->showSimpleOpen( qtr("Open subtitle file"),
EXT_FILTER_SUBTITLE, p_intf->p_sys->filepath );
if( files.isEmpty() ) return;
......
......@@ -88,7 +88,7 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent, bool sma
cone_audio_64, 1 );
ADD_CATEGORY( SPrefsVideo, qtr("Video"), qtr("Video Settings"),
cone_video_64, 2 );
ADD_CATEGORY( SPrefsSubtitles, SUBPIC_TITLE, qtr("Subtitles & On Screen Display Settings"),
ADD_CATEGORY( SPrefsSubtitles, SUBPIC_TITLE, qtr("Subtitle & On Screen Display Settings"),
cone_subtitles_64, 3 );
ADD_CATEGORY( SPrefsInputAndCodecs, INPUT_TITLE, qtr("Input & Codecs Settings"),
cone_input_64, 4 );
......@@ -636,7 +636,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
END_SPREFS_CAT;
START_SPREFS_CAT( Subtitles,
qtr("Subtitles & On Screen Display Settings") );
qtr("Subtitle & On Screen Display Settings") );
CONFIG_BOOL( "osd", OSDBox);
CONFIG_BOOL( "video-title-show", OSDTitleBox);
CONFIG_GENERIC( "video-title-position", IntegerList,
......
......@@ -41,7 +41,7 @@
#define TITLE_EXTENSIONS_VIDEO qtr( "Video Files" )
#define TITLE_EXTENSIONS_AUDIO qtr( "Audio Files" )
#define TITLE_EXTENSIONS_PLAYLIST qtr( "Playlist Files" )
#define TITLE_EXTENSIONS_SUBTITLE qtr( "Subtitles Files" )
#define TITLE_EXTENSIONS_SUBTITLE qtr( "Subtitle Files" )
#define TITLE_EXTENSIONS_ALL qtr( "All Files" )
#define EXTENSIONS_ALL "*"
#define ADD_EXT_FILTER( string, type ) \
......
......@@ -621,7 +621,7 @@ QMenu *VLCMenuBar::AudioMenu( intf_thread_t *p_intf, QMenu * current )
QMenu *VLCMenuBar::SubtitleMenu( QMenu *current )
{
QAction *action;
QMenu *submenu = new QMenu( qtr( "&Subtitles Track" ), current );
QMenu *submenu = new QMenu( qtr( "&Subtitle Track" ), current );
action = current->addMenu( submenu );
action->setData( "spu-es" );
addDPStaticEntry( submenu, qtr( "Open File..." ), "",
......
......@@ -323,7 +323,7 @@
<item row="0" column="3">
<widget class="QLabel" name="subtitlesLabel">
<property name="text">
<string>Subtitles track</string>
<string>Subtitle track</string>
</property>
<property name="buddy">
<cstring>subtitlesSpin</cstring>
......
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