Skip to content

V
vlc-2-2
Commit 22341906 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Various strings change and capitalisation changes to match the guidelines. 

Capitalization fixes
parent 62557bba
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 46 deletions
include/vlc_intf_strings.h
View file @ 22341906
......@@ -37,8 +37,8 @@
#define I_MENU_INFO N_("Media Information...")
#define I_MENU_CODECINFO N_("Codec Information...")
#define I_MENU_MSG N_("Messages...")
#define I_MENU_EXT N_("Extended settings...")
#define I_MENU_GOTOTIME N_("Go to specific time...")
#define I_MENU_EXT N_("Extended Settings...")
#define I_MENU_GOTOTIME N_("Go to Specific Time...")
#define I_MENU_BOOKMARK N_("Bookmarks...")
#define I_MENU_VLM N_("VLM Configuration...")
......@@ -46,11 +46,11 @@
/* Playlist popup */
#define I_POP_PLAY N_("Play")
#define I_POP_PREPARSE N_("Fetch information")
#define I_POP_PREPARSE N_("Fetch Information")
#define I_POP_DEL N_("Delete")
#define I_POP_INFO N_("Information...")
#define I_POP_SORT N_("Sort")
#define I_POP_ADD N_("Add node")
#define I_POP_ADD N_("Add Node")
#define I_POP_STREAM N_("Stream...")
#define I_POP_SAVE N_("Save...")
#define I_POP_EXPLORE N_("Open Folder...")
......@@ -71,13 +71,13 @@
#define I_PL_ADVADD N_("Advanced open...")
#define I_PL_ADDDIR N_("Add directory...")
#define I_PL_SAVE N_("Save playlist to file...")
#define I_PL_LOAD N_("Load playlist file...")
#define I_PL_SAVE N_("Save Playlist to File...")
#define I_PL_LOAD N_("Load Playlist File...")
#define I_PL_SEARCH N_("Search")
#define I_PL_FILTER N_("Search filter")
#define I_PL_FILTER N_("Search Filter")
#define I_PL_SD N_("Additional sources")
#define I_PL_SD N_("Additional Sources")
/*************** Preferences *************/
......
modules/gui/qt4/components/interface_widgets.cpp
View file @ 22341906
......@@ -251,7 +251,7 @@ VisualSelector::VisualSelector( intf_thread_t *_p_i ) :
layout->addItem( new QSpacerItem( 40,20,
QSizePolicy::Expanding, QSizePolicy::Minimum ) );
layout->addWidget( new QLabel( qtr( "Current visualization:" ) ) );
layout->addWidget( new QLabel( qtr( "Current visualization" ) ) );
current = new QLabel( qtr( "None" ) );
layout->addWidget( current );
......@@ -316,7 +316,7 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) :
frameButton->setMaximumSize( QSize( 26, 26 ) );
frameButton->setIconSize( QSize( 20, 20 ) );
advLayout->addWidget( frameButton );
BUTTON_SET_ACT( frameButton, "Fr", qtr( "Frame by Frame" ), frame() );
BUTTON_SET_ACT( frameButton, "Fr", qtr( "Frame by frame" ), frame() );
#endif
recordButton = new QPushButton( "R" );
......@@ -616,7 +616,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
/** extended Settings **/
extSettingsButton = new QPushButton;
BUTTON_SET_ACT( extSettingsButton, "Ex", qtr( "Extended Settings" ),
BUTTON_SET_ACT( extSettingsButton, "Ex", qtr( "Extended settings" ),
extSettings() );
setupSmallButton( extSettingsButton );
controlLayout->addWidget( extSettingsButton, 3, 12, Qt::AlignBottom );
......
modules/gui/qt4/components/playlist/playlist.cpp
View file @ 22341906
......@@ -72,7 +72,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i,
art->setMaximumWidth( 128 );
art->setScaledContents( true );
art->setPixmap( QPixmap( ":/noart.png" ) );
art->setToolTip( qtr( "Double click to get media informations" ) );
art->setToolTip( qtr( "Double click to get media information" ) );
artContLay->addWidget( art, 1 );
......
modules/gui/qt4/components/simple_preferences.cpp
View file @ 22341906
......@@ -77,7 +77,7 @@ SPrefsCatList::SPrefsCatList( intf_thread_t *_p_intf, QWidget *_parent ) :
ADD_CATEGORY( SPrefsVideo, qtr("Video"), spref_cone_Video_64.png, 2 );
ADD_CATEGORY( SPrefsSubtitles, qtr("Subtitles & OSD"),
spref_cone_Subtitles_64.png, 3 );
ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input and Codecs"),
ADD_CATEGORY( SPrefsInputAndCodecs, qtr("Input & Codecs"),
spref_cone_Input_64.png, 4 );
ADD_CATEGORY( SPrefsHotkeys, qtr("Hotkeys"), spref_cone_Hotkeys_64.png, 5 );
......
modules/gui/qt4/dialogs/extended.cpp
View file @ 22341906
......@@ -82,7 +82,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
layout->addWidget( mainTabW, 0, 0, 1, 5 );
QPushButton *closeButton = new QPushButton( qtr( "Close" ) );
QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
layout->addWidget( closeButton, 1, 4, 1, 1 );
CONNECT( closeButton, clicked(), this, close() );
......
modules/gui/qt4/dialogs/help.cpp
View file @ 22341906
......@@ -117,7 +117,8 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf)
qtr( "VLC media player is a free media player, "
"encoder and streamer that can read from files, "
"CDs, DVDs, network streams, capture cards and even more!\n"
"Also, VLC works on essentially every popular platform.\n\n" )
"VLC uses its internal codecs and works on essentially every "
"popular platform.\n\n" )
+ qtr( "This version of VLC was compiled by:\n " )
+ qfu( VLC_CompileBy() )+ "@" + qfu( VLC_CompileHost() ) + "."
+ qfu( VLC_CompileDomain() ) + ".\n"
......@@ -146,9 +147,9 @@ AboutDialog::AboutDialog( QWidget *parent, intf_thread_t *_p_intf)
QVBoxLayout *thanksLayout = new QVBoxLayout( thanksWidget );
QLabel *thanksLabel = new QLabel( qtr( "We would like to thank the whole "
"community, the testers, our users and the following people "
"VLC community, the testers, our users and the following people "
"(and the missing ones...) for their collaboration to "
"provide the best software." ) );
"create the best free software." ) );
thanksLabel->setWordWrap( true );
thanksLayout->addWidget( thanksLabel );
QTextEdit *thanksEdit = new QTextEdit( this );
......
modules/gui/qt4/dialogs/interaction.cpp
View file @ 22341906
......@@ -191,7 +191,7 @@ void InteractionDialog::update()
progressBar->hide();
if( ( p_dialog->i_flags & DIALOG_USER_PROGRESS ) &&
( p_dialog->val.f_float >= 100.0 ) )
altButton->setText( qtr( "close" ) );
altButton->setText( qtr( "&Close" ) );
}
InteractionDialog::~InteractionDialog()
......
modules/gui/qt4/dialogs/messages.cpp
View file @ 22341906
......@@ -244,7 +244,7 @@ void MessagesDialog::clear()
bool MessagesDialog::save()
{
QString saveLogFileName = QFileDialog::getSaveFileName(
this, qtr( "Choose a filename to save the logs under..." ),
this, qtr( "Select a name for the logs file" ),
qfu( config_GetHomeDir() ),
qtr( "Texts / Logs (*.log *.txt);; All (*.*) ") );
......
modules/gui/qt4/dialogs/vlm.cpp
View file @ 22341906
......@@ -136,7 +136,7 @@ VLMDialog::VLMDialog( QWidget *parent, intf_thread_t *_p_intf ) : QVLCDialog( pa
QPushButton *exportButton = new QPushButton( qtr( "Export" ) );
ui.buttonBox->addButton( exportButton, QDialogButtonBox::ActionRole );
QPushButton *closeButton = new QPushButton( qtr( "Close" ) );
QPushButton *closeButton = new QPushButton( qtr( "&Close" ) );
ui.buttonBox->addButton( closeButton, QDialogButtonBox::AcceptRole );
......
modules/gui/qt4/menus.cpp
View file @ 22341906
......@@ -328,7 +328,7 @@ QMenu *QVLCMenu::PlaylistMenu( intf_thread_t *p_intf, MainInterface *mi )
addDPStaticEntry( menu, qtr( I_PL_SAVE ), "", "", SLOT( saveAPlaylist() ),
"Ctrl+Y" );
menu->addSeparator();
menu->addAction( qtr( "Undock from interface" ), mi,
menu->addAction( qtr( "Undock from Interface" ), mi,
SLOT( undockPlaylist() ), qtr( "Ctrl+U" ) );
return menu;
}
......@@ -382,7 +382,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
SLOT( toggleFullScreen() ), QString( "F11" ) );
/* Advanced Controls */
action = menu->addAction( qtr( "Advanced controls" ), mi,
action = menu->addAction( qtr( "Advanced Controls" ), mi,
SLOT( toggleAdvanced() ) );
action->setCheckable( true );
if( mi->getControlsVisibilityStatus() & CONTROLS_ADVANCED )
......@@ -612,7 +612,7 @@ QMenu *QVLCMenu::HelpMenu( QMenu *current )
addDPStaticEntry( menu, qtr( "Help..." ) , "",
":/pixmaps/menus_help_16px.png", SLOT( helpDialog() ), "F1" );
#ifdef UPDATE_CHECK
addDPStaticEntry( menu, qtr( "Check for updates..." ) , "", "",
addDPStaticEntry( menu, qtr( "Check for Updates..." ) , "", "",
SLOT( updateDialog() ), "");
#endif
menu->addSeparator();
......
modules/gui/qt4/qt4.cpp
View file @ 22341906
......@@ -63,7 +63,7 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define ADVANCED_PREFS_TEXT N_( "Show advanced prefs over simple ones" )
#define ADVANCED_PREFS_TEXT N_( "Show advanced preferences over simple ones" )
#define ADVANCED_PREFS_LONGTEXT N_( "Show advanced preferences and not simple "\
"preferences when opening the preferences "\
"dialog." )
......@@ -74,9 +74,8 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
"for basic actions." )
#define MINIMIZED_TEXT N_( "Start VLC with only a systray icon" )
#define MINIMIZED_LONGTEXT N_( "When you launch VLC with that option, " \
"VLC will start with just an icon in " \
"your taskbar." )
#define MINIMIZED_LONGTEXT N_( "VLC will start with just an icon in " \
"your taskbar" )
#define TITLE_TEXT N_( "Show playing item name in window title" )
#define TITLE_LONGTEXT N_( "Show the name of the song or video in the " \
......@@ -103,7 +102,8 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
#define UPDATER_TEXT N_( "Activate the updates availability notification" )
#define UPDATER_LONGTEXT N_( "Activate the automatic notification of new " \
"versions of the software. It runs once a week." )
"versions of the software. It runs once every " \
"two weeks." )
#define UPDATER_DAYS_TEXT N_("Number of days between two update checks")
#define COMPLETEVOL_TEXT N_( "Allow the volume to be set to 400%" )
......
modules/gui/qt4/ui/open_capture.ui
View file @ 22341906
......@@ -14,7 +14,7 @@
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>_("Capture Mode")</string>
<string>_("Capture mode")</string>
</property>
</widget>
</item>
......
modules/gui/qt4/ui/open_disk.ui
View file @ 22341906
......@@ -17,7 +17,7 @@
<item>
<widget class="QGroupBox" name="diskGroupBox" >
<property name="title" >
<string>_("Disc selection")</string>
<string>_("Disc Selection")</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
......@@ -105,7 +105,7 @@
<string>_("Disable DVD Menus (for compatibility)")</string>
</property>
<property name="text" >
<string>_("No DVD Menus")</string>
<string>_("No DVD menus")</string>
</property>
</widget>
</item>
......@@ -168,7 +168,7 @@
<item>
<widget class="QGroupBox" name="diskOptionBox" >
<property name="title" >
<string>_("Starting position")</string>
<string>_("Starting Position")</string>
</property>
<layout class="QGridLayout" >
<item row="1" column="0" >
......
modules/gui/qt4/ui/sprefs_input.ui
View file @ 22341906
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>508</width>
<height>514</height>
<width>512</width>
<height>516</height>
</rect>
</property>
<property name="windowTitle" >
......@@ -23,7 +23,7 @@
<item row="0" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string>_("Disk Device")</string>
<string>_("Default disc device")</string>
</property>
<property name="buddy" >
<cstring>DVDDevice</cstring>
......@@ -52,7 +52,7 @@
<item row="0" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>_("Server Default Port")</string>
<string>_("Server default port")</string>
</property>
<property name="buddy" >
<cstring>UDPPort</cstring>
......@@ -78,7 +78,7 @@
<item row="1" column="0" >
<widget class="QLabel" name="label_7" >
<property name="text" >
<string>_("HTTP Proxy")</string>
<string>_("HTTP proxy")</string>
</property>
<property name="buddy" >
<cstring>proxy</cstring>
......@@ -122,7 +122,7 @@
<item row="0" column="0" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>_("Post-Processing Quality")</string>
<string>_("Post-Processing quality")</string>
</property>
<property name="buddy" >
<cstring>PostProcLevel</cstring>
......
modules/gui/qt4/ui/sprefs_interface.ui
View file @ 22341906
......@@ -32,7 +32,7 @@
<item row="1" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>_("Native or Skins")</string>
<string>_("Interface Type")</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
......@@ -70,7 +70,7 @@
</sizepolicy>
</property>
<property name="text" >
<string>_("Display Mode")</string>
<string>_("Display mode")</string>
</property>
</widget>
</item>
......@@ -155,7 +155,7 @@
<item row="6" column="0" >
<widget class="QLabel" name="label_4" >
<property name="text" >
<string>_("Skin File")</string>
<string>_("Skin file")</string>
</property>
<property name="buddy" >
<cstring>fileSkin</cstring>
......
modules/gui/qt4/ui/sprefs_subtitles.ui
View file @ 22341906
......@@ -47,7 +47,7 @@
</sizepolicy>
</property>
<property name="title" >
<string>_("Subtitles languages")</string>
<string>_("Subtitles Language")</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
......@@ -76,7 +76,7 @@
<item row="1" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>_("Default Encoding")</string>
<string>_("Default encoding")</string>
</property>
<property name="buddy" >
<cstring>encoding</cstring>
......
modules/gui/qt4/ui/sprefs_video.ui
View file @ 22341906
......@@ -98,7 +98,7 @@
<item row="2" column="0" colspan="2" >
<widget class="QCheckBox" name="skipFrames" >
<property name="text" >
<string>_("Skip Frames")</string>
<string>_("Skip frames")</string>
</property>
<property name="checked" >
<bool>true</bool>
......@@ -126,7 +126,7 @@
<item row="1" column="0" >
<widget class="QLabel" name="label_5" >
<property name="text" >
<string>_("Display Device")</string>
<string>_("Display device")</string>
</property>
<property name="buddy" >
<cstring>dXdisplayDevice</cstring>
......@@ -136,7 +136,7 @@
<item row="0" column="0" colspan="2" >
<widget class="QCheckBox" name="wallpaperMode" >
<property name="text" >
<string>_("Enable Wallpaper Mode")</string>
<string>_("Enable wallpaper mode")</string>
</property>
</widget>
</item>
......
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