diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h index d4cdaf84c96362d4048ae100262b577a4a9c9bed..84efcb63dd13a08590c808c65ba8405d7e389891 100644 --- a/include/vlc_config_cat.h +++ b/include/vlc_config_cat.h @@ -118,7 +118,6 @@ #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..." ) /* Sout */ diff --git a/include/vlc_intf_strings.h b/include/vlc_intf_strings.h index e52c5a8c8fdcf988bee4344a9fb59de445206b75..3815e17586836e0d99a2367931e0f3e39d8afbf1 100644 --- a/include/vlc_intf_strings.h +++ b/include/vlc_intf_strings.h @@ -43,7 +43,7 @@ /*************** Open dialogs **************/ -#define I_OP_OPF N_("Quick &Open File...") +#define I_OP_OPF N_("&Open File...") #define I_OP_ADVOP N_("&Advanced Open...") #define I_OP_OPDIR I_DIR_OR_FOLDER( N_("Open D&irectory..."), \ N_("Open &Folder...") ) @@ -56,17 +56,15 @@ #define I_MENU_CODECINFO N_("&Codec Information") #define I_MENU_MSG N_("&Messages") #define I_MENU_GOTOTIME N_("Jump to Specific &Time") -#define I_MENU_BOOKMARK N_("&Bookmarks") +#define I_MENU_BOOKMARK N_("Custom &Bookmarks") #define I_MENU_VLM N_("&VLM Configuration") #define I_MENU_ABOUT N_("&About") /* Playlist popup */ #define I_POP_PLAY N_("Play") -#define I_POP_PREPARSE N_("Fetch Information") #define I_POP_DEL N_("Remove Selected") #define I_POP_INFO N_("Information...") -#define I_POP_SORT N_("Sort") #define I_POP_NEWFOLDER I_DIR_OR_FOLDER( N_("Create Directory..."), \ N_("Create Folder...") ) #define I_POP_EXPLORE I_DIR_OR_FOLDER( N_("Show Containing Directory..."), \ @@ -74,65 +72,29 @@ #define I_POP_STREAM N_("Stream...") #define I_POP_SAVE N_("Save...") - /*************** Playlist *************/ #define I_PL_LOOP N_("Repeat All") #define I_PL_REPEAT N_("Repeat One") -#define I_PL_NOREPEAT N_("No Repeat") - #define I_PL_RANDOM N_("Random") #define I_PL_NORANDOM N_("Random Off") - #define I_PL_ADDPL N_("Add to Playlist") -#define I_PL_ADDML N_("Add to Media Library") #define I_PL_ADDF N_("Add File...") -#define I_PL_ADVADD N_("Advanced Open...") #define I_PL_ADDDIR I_DIR_OR_FOLDER( N_("Add Directory..."), \ N_("Add Folder...") ) #define I_PL_SAVE N_("Save Playlist to &File...") -#define I_PL_LOAD N_("Open Play&list...") #define I_PL_SEARCH N_("Search") -#define I_PL_FILTER N_("Search Filter") -#define I_PL_SD N_("&Services Discovery" ) /*************** Preferences *************/ -#define I_HIDDEN_ADV N_( "Some options are available but hidden. "\ - "Check \"Advanced options\" to see them." ) /*************** Video filters **************/ -#define I_CLONE N_("Image clone") -#define I_CLONE_TIP N_("Clone the image") - -#define I_MAGNIFY N_("Magnification") -#define I_MAGNIFY_TIP N_("Magnify a part of the video. You can select " \ - "which part of the image should be magnified." ) - #define I_WAVE N_("Waves") -#define I_WAVE_TIP N_("\"Waves\" video distortion effect") - -#define I_RIPPLE_TIP N_("\"Water surface\" video distortion effect") - -#define I_INVERT_TIP N_("Image colors inversion") - -#define I_WALL_TIP N_("Split the image to make an image wall") - -#define I_PUZZLE_TIP N_("Create a \"puzzle game\" with the video.\n" \ - "The video gets split in parts that you must sort.") - -#define I_GRADIENT_TIP N_("\"Edge detection\" video distortion effect.\n" \ - "Try changing the various settings for different effects" ) - -#define I_COLORTHRES_TIP N_("\"Color detection\" effect. The whole image " \ - "will be turned to black and white, except the parts that "\ - "are of the color that you select in the settings.") - #define I_LONGHELP N_("" \ "

Welcome to VLC media player Help

" \ "

Documentation

" \ diff --git a/modules/access_output/livehttp.c b/modules/access_output/livehttp.c index 5ac802df8be1f1ae92e8d69404b3ba41c3f3f962..4a45cfd7160be9adf4dad6e8ba43584f779fdac0 100644 --- a/modules/access_output/livehttp.c +++ b/modules/access_output/livehttp.c @@ -92,7 +92,6 @@ static void Close( vlc_object_t * ); #define RATECONTROL_TEXT N_("Use muxers rate control mechanism") #define KEYURI_TEXT N_("AES key URI to place in playlist") -#define KEYURI_LONGTEXT N_("Location from where client will retrieve the stream decryption key") #define KEYFILE_TEXT N_("AES key file") #define KEYFILE_LONGTEXT N_("File containing the 16 bytes encryption key") diff --git a/modules/audio_filter/chorus_flanger.c b/modules/audio_filter/chorus_flanger.c index 2f4f734d761abb8db85cf6b5076d256c913fa8ff..4d2251181738cfbd05f47d1b596860b3030c25e0 100644 --- a/modules/audio_filter/chorus_flanger.c +++ b/modules/audio_filter/chorus_flanger.c @@ -86,7 +86,7 @@ vlc_module_begin () N_("Rate of change of sweep depth in milliseconds shift per second " "of play"), true ) add_float_with_range( "feedback-gain", 0.5, -0.9, 0.9, - N_("Feedback Gain"), N_("Gain on Feedback loop"), true ) + N_("Feedback gain"), N_("Gain on Feedback loop"), true ) add_float_with_range( "wet-mix", 0.4, -0.999, 0.999, N_("Wet mix"), N_("Level of delayed signal"), true ) add_float_with_range( "dry-mix", 0.4, -0.999, 0.999, diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c index aa2a8f4a77d0110adfdb958ccd3999c516b3b00f..0156f16ca4c194751c0d032e29a28c1b7ab0340d 100644 --- a/modules/audio_output/waveout.c +++ b/modules/audio_output/waveout.c @@ -137,7 +137,6 @@ struct aout_sys_t #define DEVICE_LONG N_("Select special Audio device, or let windows "\ "decide (default), change needs VLC restart "\ "to apply.") -#define DEFAULT_AUDIO_DEVICE N_("Default Audio Device") #define AUDIO_CHAN_TEXT N_("Audio output channels") #define AUDIO_CHAN_LONGTEXT N_("Channels available for audio output. " \ diff --git a/modules/codec/x264.c b/modules/codec/x264.c index 163fd361197e33e20be5a830ef0638216a81e29c..7dd23c9d84094d3294972f3f0879d8d3b7b0a591 100644 --- a/modules/codec/x264.c +++ b/modules/codec/x264.c @@ -321,7 +321,6 @@ static void x264_log( void *, int i_level, const char *psz, va_list ); "tradeoffs involved in the motion estimation decision process " \ "(lower = quicker and higher = better quality). Range 1 to 9." ) -#define B_RDO_TEXT N_("RD based mode decision for B-frames") #define B_RDO_LONGTEXT N_( "RD based mode decision for B-frames. This " \ "requires subme 6 (or higher).") @@ -334,7 +333,6 @@ static void x264_log( void *, int i_level, const char *psz, va_list ); #define CHROMA_ME_LONGTEXT N_( "Chroma ME for subpel and mode decision in " \ "P-frames.") -#define BIME_TEXT N_("Jointly optimize both MVs in B-frames") #define BIME_LONGTEXT N_( "Joint bidirectional motion refinement.") #define TRANSFORM_8X8DCT_TEXT N_("Adaptive spatial transform size") diff --git a/modules/demux/ts.c b/modules/demux/ts.c index 5ba2f040212dc54b75afcb9c248675df45996ff9..0c83422f9ecbf0da8a4109f625d2377958f43463 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -117,8 +117,6 @@ static void Close ( vlc_object_t * ); #define SILENT_TEXT N_("Silent mode") #define SILENT_LONGTEXT N_("Do not complain on encrypted PES.") -#define CAPMT_SYSID_TEXT N_("CAPMT System ID") -#define CAPMT_SYSID_LONGTEXT N_("Only forward descriptors from this SysID to the CAM.") #define CPKT_TEXT N_("Packet size in bytes to decrypt") #define CPKT_LONGTEXT N_("Specify the size of the TS packet to decrypt. " \ diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m index 2c57585ab8cef52ca3d2d420fe4246aab6047ec3..13cfc400118ef2e03606bad876ee71e8acbdfa06 100644 --- a/modules/gui/macosx/MainMenu.m +++ b/modules/gui/macosx/MainMenu.m @@ -392,8 +392,8 @@ static VLCMainMenu *_o_sharedInstance = nil; [o_mi_snapshot setTitle: _NS("Snapshot")]; [o_mi_videotrack setTitle: _NS("Video Track")]; [o_mu_videotrack setTitle: _NS("Video Track")]; - [o_mi_aspect_ratio setTitle: _NS("Aspect-ratio")]; - [o_mu_aspect_ratio setTitle: _NS("Aspect-ratio")]; + [o_mi_aspect_ratio setTitle: _NS("Aspect ratio")]; + [o_mu_aspect_ratio setTitle: _NS("Aspect ratio")]; [o_mi_crop setTitle: _NS("Crop")]; [o_mu_crop setTitle: _NS("Crop")]; [o_mi_screen setTitle: _NS("Fullscreen Video Device")]; @@ -1307,7 +1307,7 @@ static VLCMainMenu *_o_sharedInstance = nil; [o_parent setEnabled:NO]; /* Aspect Ratio */ - if ([[o_parent title] isEqualToString: _NS("Aspect-ratio")] == YES) { + if ([[o_parent title] isEqualToString: _NS("Aspect ratio")] == YES) { NSMenuItem *o_lmi_tmp2; o_lmi_tmp2 = [o_menu addItemWithTitle: _NS("Lock Aspect Ratio") action: @selector(lockVideosAspectRatio:) keyEquivalent: @""]; [o_lmi_tmp2 setTarget: [[VLCMain sharedInstance] controls]]; diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index 6cac894f7f63388ca54ea3ee752a91d5f8f9c1f3..3c21bc2e567f50654184da0d80420e8e39872336 100644 --- a/modules/gui/qt4/menus.cpp +++ b/modules/gui/qt4/menus.cpp @@ -709,8 +709,7 @@ QMenu *VLCMenuBar::NavigMenu( intf_thread_t *p_intf, QMenu *menu ) submenu->setTearOffEnabled( true ); addActionWithSubmenu( menu, "program", qtr( "&Program" ) ); - /* FixMe: sync I_MENU_BOOKMARK string */ - submenu = new QMenu( qtr( "Custom &Bookmarks" ), menu ); + submenu = new QMenu( qtr( I_MENU_BOOKMARK ), menu ); submenu->setTearOffEnabled( true ); addDPStaticEntry( submenu, qtr( "&Manage" ), "", SLOT( bookmarksDialog() ), "Ctrl+B" ); @@ -913,7 +912,7 @@ void VLCMenuBar::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf, void VLCMenuBar::PopupMenuStaticEntries( QMenu *menu ) { QMenu *openmenu = new QMenu( qtr( "Open Media" ), menu ); - addDPStaticEntry( openmenu, qtr( "&Open File..." ), + addDPStaticEntry( openmenu, qtr( I_OP_OPF ), ":/type/file-asym", SLOT( openFileDialog() ) ); addDPStaticEntry( openmenu, qtr( I_OP_OPDIR ), ":/type/folder-grey", SLOT( PLOpenDir() ) ); diff --git a/modules/gui/qt4/ui/video_effects.ui b/modules/gui/qt4/ui/video_effects.ui index 2d21e43c8fcf6fe0925c229dbfaf12bb632a60b4..88a231c5216652e63f7e21e9d1b9203cc6aed5db 100644 --- a/modules/gui/qt4/ui/video_effects.ui +++ b/modules/gui/qt4/ui/video_effects.ui @@ -931,7 +931,7 @@ - Black slot + Black Slot diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c index 899802053190ba8432cac3acba3fee3bf05d1951..b4ff11be4ced4807b164a5b4a0e188d5e68ce0ad 100644 --- a/modules/stream_out/transcode/transcode.c +++ b/modules/stream_out/transcode/transcode.c @@ -93,7 +93,7 @@ #define ARATE_TEXT N_("Audio sample rate") #define ARATE_LONGTEXT N_( \ "Sample rate of the transcoded audio stream (11250, 22500, 44100 or 48000).") -#define ALANG_TEXT N_("Audio Language") +#define ALANG_TEXT N_("Audio language") #define ALANG_LONGTEXT N_( \ "This is the language of the audio stream.") #define ACHANS_TEXT N_("Audio channels") diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp index 56603aa5eaf9103a0d3451dfefe08388699f3a82..27e0f867bd495f51d4529aacbcd70069dffc9c96 100644 --- a/modules/video_filter/atmo/atmo.cpp +++ b/modules/video_filter/atmo/atmo.cpp @@ -257,12 +257,12 @@ static const char *const ppsz_device_type_descriptions[] = { "On Windows usually something like COM1 or " \ "COM2. On Linux /dev/ttyS01 f.e.") -#define EDGE_TEXT N_("Edge Weightning") +#define EDGE_TEXT N_("Edge weightning") #define EDGE_LONGTEXT N_("Increasing this value will result in color "\ "more depending on the border of the frame.") #define BRIGHTNESS_TEXT N_("Brightness") #define BRIGHTNESS_LONGTEXT N_("Overall brightness of your LED stripes") -#define DARKNESS_TEXT N_("Darkness Limit") +#define DARKNESS_TEXT N_("Darkness limit") #define DARKNESS_LONGTEXT N_("Pixels with a saturation lower than this will "\ "be ignored. Should be greater than one for "\ "letterboxed videos.") @@ -277,7 +277,7 @@ static const char *const ppsz_device_type_descriptions[] = { #define MEANTHRESHOLD_TEXT N_("Filter threshold") #define MEANTHRESHOLD_LONGTEXT N_("How much a color has to be changed for an "\ "immediate color change.") -#define MEANPERCENTNEW_TEXT N_("Filter Smoothness (in %)") +#define MEANPERCENTNEW_TEXT N_("Filter smoothness (%)") #define MEANPERCENTNEW_LONGTEXT N_("Filter Smoothness") #define FILTERMODE_TEXT N_("Output Color filter mode") diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c index adf2b334fd087da22dfc1fa436903b18acd42ffd..94ef0a0babb818a93de8b5cfb970d11a98e1da34 100644 --- a/modules/video_output/msw/direct3d.c +++ b/modules/video_output/msw/direct3d.c @@ -52,7 +52,6 @@ static int Open(vlc_object_t *); static void Close(vlc_object_t *); -#define DESKTOP_TEXT N_("Enable desktop mode ") #define DESKTOP_LONGTEXT N_(\ "The desktop mode allows you to display the video on the desktop.") diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 39bbe19289f0fbd36d13bb93b984796e16025f75..83983bc61ddb2938674a787d2ecf5f468f7ccf48 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -135,11 +135,6 @@ static const char *const ppsz_snap_formats[] = "You can completely disable the audio output. The audio " \ "decoding stage will not take place, thus saving some processing power.") -#if 0 -#define MONO_TEXT N_("Force mono audio") -#define MONO_LONGTEXT N_("This will force a mono audio output.") -#endif - #define GAIN_TEXT N_("Audio gain") #define GAIN_LONGTEXT N_( \ "This linear gain will be applied to outputted audio.") @@ -163,7 +158,6 @@ static const char *const ppsz_snap_formats[] = #define AUDIO_RESAMPLER_LONGTEXT N_( \ "This selects which plugin to use for audio resampling." ) -#define MULTICHA_TEXT N_("Audio output channels mode") #define MULTICHA_LONGTEXT N_( \ "This sets the audio output channels mode that will " \ "be used by default when possible (ie. if your hardware supports it as " \ @@ -973,7 +967,6 @@ static const char *const ppsz_prefres[] = { #define ACCESS_OUTPUT_LONGTEXT N_( \ "This is a legacy entry to let you configure access output modules") -#define ANN_SAPCTRL_TEXT N_("Control SAP flow") #define ANN_SAPCTRL_LONGTEXT N_( \ "If this option is enabled, the flow on " \ "the SAP multicast address will be controlled. This is needed if you " \ @@ -1029,12 +1022,10 @@ static const char *const ppsz_prefres[] = { "priorities. You can use it to tune VLC priority against other " \ "programs, or against other VLC instances.") -#define USE_STREAM_IMMEDIATE N_("(Experimental) Don't do caching at the access level.") #define USE_STREAM_IMMEDIATE_LONGTEXT N_( \ "This option is useful if you want to lower the latency when " \ "reading a stream") -#define PLUGIN_PATH_TEXT N_("Modules search path") #define PLUGIN_PATH_LONGTEXT N_( \ "Additional path for VLC to look for its modules. You can add " \ "several paths by concatenating them using \" PATH_SEP \" as separator") @@ -1393,10 +1384,6 @@ static const char *const mouse_wheel_texts[] = #define DEINTERLACE_MODE_KEY_TEXT N_("Cycle deinterlace modes") #define DEINTERLACE_MODE_KEY_LONGTEXT N_("Cycle through available deinterlace modes.") #define INTF_TOGGLE_FSC_KEY_TEXT N_("Show controller in fullscreen") -#define INTF_SHOW_KEY_TEXT N_("Show interface") -#define INTF_SHOW_KEY_LONGTEXT N_("Raise the interface above all other windows.") -#define INTF_HIDE_KEY_TEXT N_("Hide interface") -#define INTF_HIDE_KEY_LONGTEXT N_("Lower the interface below all other windows.") #define INTF_BOSS_KEY_TEXT N_("Boss key") #define INTF_BOSS_KEY_LONGTEXT N_("Hide the interface and pause playback.") #define INTF_POPUP_MENU_KEY_TEXT N_("Context menu") diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c index 919348734d5857bdc654d44b0571ced2cc2178ad..c4c9f00891907f5c9c71df55aa4ac3614ea80e27 100644 --- a/src/video_output/vout_intf.c +++ b/src/video_output/vout_intf.c @@ -237,7 +237,7 @@ void vout_IntfInit( vout_thread_t *p_vout ) var_Create( p_vout, "aspect-ratio", VLC_VAR_STRING | VLC_VAR_ISCOMMAND | VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT ); - text.psz_string = _("Aspect-ratio"); + text.psz_string = _("Aspect ratio"); var_Change( p_vout, "aspect-ratio", VLC_VAR_SETTEXT, &text, NULL ); val.psz_string = (char*)"";