From 223419069363b3eab712cff2d0ac671a94d8fc65 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Wed, 9 Jul 2008 12:59:21 -0700 Subject: [PATCH] Various strings change and capitalisation changes to match the guidelines. Capitalization fixes --- include/vlc_intf_strings.h | 16 ++++++++-------- .../gui/qt4/components/interface_widgets.cpp | 6 +++--- .../gui/qt4/components/playlist/playlist.cpp | 2 +- .../gui/qt4/components/simple_preferences.cpp | 2 +- modules/gui/qt4/dialogs/extended.cpp | 2 +- modules/gui/qt4/dialogs/help.cpp | 7 ++++--- modules/gui/qt4/dialogs/interaction.cpp | 2 +- modules/gui/qt4/dialogs/messages.cpp | 2 +- modules/gui/qt4/dialogs/vlm.cpp | 2 +- modules/gui/qt4/menus.cpp | 6 +++--- modules/gui/qt4/pixmaps/extended_16px.png | Bin 0 -> 322 bytes modules/gui/qt4/qt4.cpp | 10 +++++----- modules/gui/qt4/ui/open_capture.ui | 2 +- modules/gui/qt4/ui/open_disk.ui | 6 +++--- modules/gui/qt4/ui/sprefs_input.ui | 12 ++++++------ modules/gui/qt4/ui/sprefs_interface.ui | 6 +++--- modules/gui/qt4/ui/sprefs_subtitles.ui | 4 ++-- modules/gui/qt4/ui/sprefs_video.ui | 6 +++--- 18 files changed, 47 insertions(+), 46 deletions(-) create mode 100644 modules/gui/qt4/pixmaps/extended_16px.png diff --git a/include/vlc_intf_strings.h b/include/vlc_intf_strings.h index 2131ab2327..01e7c3a4cf 100644 --- a/include/vlc_intf_strings.h +++ b/include/vlc_intf_strings.h @@ -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 *************/ diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp index 42c8b3c9be..1c74011225 100644 --- a/modules/gui/qt4/components/interface_widgets.cpp +++ b/modules/gui/qt4/components/interface_widgets.cpp @@ -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 ); diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp index de0373f179..fcc6d2df72 100644 --- a/modules/gui/qt4/components/playlist/playlist.cpp +++ b/modules/gui/qt4/components/playlist/playlist.cpp @@ -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 ); diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 314fab40bc..25a88e4f15 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -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 ); diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp index ee166fcde7..b9cb954812 100644 --- a/modules/gui/qt4/dialogs/extended.cpp +++ b/modules/gui/qt4/dialogs/extended.cpp @@ -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() ); diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp index 4b0012f9ce..1b135bab2a 100644 --- a/modules/gui/qt4/dialogs/help.cpp +++ b/modules/gui/qt4/dialogs/help.cpp @@ -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 ); diff --git a/modules/gui/qt4/dialogs/interaction.cpp b/modules/gui/qt4/dialogs/interaction.cpp index 887cd5ef18..45e33516ff 100644 --- a/modules/gui/qt4/dialogs/interaction.cpp +++ b/modules/gui/qt4/dialogs/interaction.cpp @@ -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() diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp index 9aaed613ec..941e438a54 100644 --- a/modules/gui/qt4/dialogs/messages.cpp +++ b/modules/gui/qt4/dialogs/messages.cpp @@ -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 (*.*) ") ); diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp index 70a3934523..afb1c7f66a 100644 --- a/modules/gui/qt4/dialogs/vlm.cpp +++ b/modules/gui/qt4/dialogs/vlm.cpp @@ -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 ); diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 9a724c6b28..5962c192d2 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -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(); diff --git a/modules/gui/qt4/pixmaps/extended_16px.png b/modules/gui/qt4/pixmaps/extended_16px.png new file mode 100644 index 0000000000000000000000000000000000000000..e0ff70e1245c30e185f161e887f9180bd29c5a0f GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(?lOI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<@@pN$vskoJN#n>=;0gHj-%S?wq z@?ORhl-P_FjJ3|l`zULwdG&Cn-MYWOeqwH-gK+WzRW>69W0eEKI*f}Z`l?@Rc$saM zlm6rLbAILywvUOE6bwrm^ngmZkNo)i+uTQo`p(_TJH;T2=P zXs~`#(t$6rzx$ewI+&bUUBF!T_mByLuMRg5&F9|mOMJF>q2z?j6|4DxicbV~UuM|y zVrJdHPre%@I*y5N^|2805StYtwy%X{+rwLH*)_}rwU2pZma%adFnpac{lbA=_Mkvv N@O1TaS?83{1OR_gbpHSV literal 0 HcmV?d00001 diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 6da852041a..2794999145 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -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%" ) diff --git a/modules/gui/qt4/ui/open_capture.ui b/modules/gui/qt4/ui/open_capture.ui index 94af00bbeb..b9aa20a1d2 100644 --- a/modules/gui/qt4/ui/open_capture.ui +++ b/modules/gui/qt4/ui/open_capture.ui @@ -14,7 +14,7 @@ - _("Capture Mode") + _("Capture mode") diff --git a/modules/gui/qt4/ui/open_disk.ui b/modules/gui/qt4/ui/open_disk.ui index c311eb9ab4..b5d160e264 100644 --- a/modules/gui/qt4/ui/open_disk.ui +++ b/modules/gui/qt4/ui/open_disk.ui @@ -17,7 +17,7 @@ - _("Disc selection") + _("Disc Selection") @@ -105,7 +105,7 @@ _("Disable DVD Menus (for compatibility)") - _("No DVD Menus") + _("No DVD menus") @@ -168,7 +168,7 @@ - _("Starting position") + _("Starting Position") diff --git a/modules/gui/qt4/ui/sprefs_input.ui b/modules/gui/qt4/ui/sprefs_input.ui index 139c8c5e0d..235d7a6382 100644 --- a/modules/gui/qt4/ui/sprefs_input.ui +++ b/modules/gui/qt4/ui/sprefs_input.ui @@ -6,8 +6,8 @@ 0 0 - 508 - 514 + 512 + 516 @@ -23,7 +23,7 @@ - _("Disk Device") + _("Default disc device") DVDDevice @@ -52,7 +52,7 @@ - _("Server Default Port") + _("Server default port") UDPPort @@ -78,7 +78,7 @@ - _("HTTP Proxy") + _("HTTP proxy") proxy @@ -122,7 +122,7 @@ - _("Post-Processing Quality") + _("Post-Processing quality") PostProcLevel diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui index 4d4bbf416f..3598580868 100644 --- a/modules/gui/qt4/ui/sprefs_interface.ui +++ b/modules/gui/qt4/ui/sprefs_interface.ui @@ -32,7 +32,7 @@ - _("Native or Skins") + _("Interface Type") @@ -70,7 +70,7 @@ - _("Display Mode") + _("Display mode") @@ -155,7 +155,7 @@ - _("Skin File") + _("Skin file") fileSkin diff --git a/modules/gui/qt4/ui/sprefs_subtitles.ui b/modules/gui/qt4/ui/sprefs_subtitles.ui index 1c56e0971e..bec2fd0e9e 100644 --- a/modules/gui/qt4/ui/sprefs_subtitles.ui +++ b/modules/gui/qt4/ui/sprefs_subtitles.ui @@ -47,7 +47,7 @@ - _("Subtitles languages") + _("Subtitles Language") @@ -76,7 +76,7 @@ - _("Default Encoding") + _("Default encoding") encoding diff --git a/modules/gui/qt4/ui/sprefs_video.ui b/modules/gui/qt4/ui/sprefs_video.ui index 9fee06281b..bcb785368b 100644 --- a/modules/gui/qt4/ui/sprefs_video.ui +++ b/modules/gui/qt4/ui/sprefs_video.ui @@ -98,7 +98,7 @@ - _("Skip Frames") + _("Skip frames") true @@ -126,7 +126,7 @@ - _("Display Device") + _("Display device") dXdisplayDevice @@ -136,7 +136,7 @@ - _("Enable Wallpaper Mode") + _("Enable wallpaper mode") -- 2.39.2