From 5122c9d9e9f5851a84c2b037cc35dbacd3699aef Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Fri, 21 Mar 2008 21:25:30 +0000 Subject: [PATCH] Various spelling fixes. --- include/vlc_arrays.h | 2 +- include/vlc_playlist.h | 2 +- include/vlc_services_discovery.h | 2 +- modules/access/v4l2/v4l2.c | 2 +- modules/audio_output/waveout.c | 2 +- modules/codec/xvmc/slice_xvmc_vld.c | 2 +- modules/gui/macosx/simple_prefs.m | 14 +++++++------- modules/gui/qt4/dialogs/help.cpp | 2 +- src/control/media_instance.c | 2 +- src/misc/darwin_specific.c | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/vlc_arrays.h b/include/vlc_arrays.h index ece3173c37..9757ae48c4 100644 --- a/include/vlc_arrays.h +++ b/include/vlc_arrays.h @@ -282,7 +282,7 @@ /************************************************************************ - * Dynamic arrays with progressive allocation (Prefered API) + * Dynamic arrays with progressive allocation (Preferred API) ************************************************************************/ typedef struct vlc_array_t { diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h index f413462c87..12f96e344e 100644 --- a/include/vlc_playlist.h +++ b/include/vlc_playlist.h @@ -120,7 +120,7 @@ TYPEDEF_ARRAY(input_item_t*, input_item_array_t); * will maybe become useful again when we merge VLM; * * To delete an item, use playlist_DeleteFromInput( input_id ) which will - * remove all occurences of the input in both trees + * remove all occurrences of the input in both trees * * @{ */ diff --git a/include/vlc_services_discovery.h b/include/vlc_services_discovery.h index 6a6e6cc445..862c4d17f4 100644 --- a/include/vlc_services_discovery.h +++ b/include/vlc_services_discovery.h @@ -72,7 +72,7 @@ VLC_EXPORT( void, services_discovery_Stop, ( services_discover /* Read info from discovery object */ VLC_EXPORT( char *, services_discovery_GetLocalizedName, ( services_discovery_t * p_this ) ); -/* Receive event notification (prefered way to get new items) */ +/* Receive event notification (preferred way to get new items) */ VLC_EXPORT( vlc_event_manager_t *, services_discovery_EventManager, ( services_discovery_t * p_this ) ); /* Used by services_discovery to post update about their items */ diff --git a/modules/access/v4l2/v4l2.c b/modules/access/v4l2/v4l2.c index a8dc4bff97..aa182ea0ca 100644 --- a/modules/access/v4l2/v4l2.c +++ b/modules/access/v4l2/v4l2.c @@ -183,7 +183,7 @@ static void AccessClose( vlc_object_t * ); #else #define AUDIO_METHOD_LONGTEXT N_( \ "Audio method to use: 0 to disable audio, 1 for OSS, 2 for ALSA, " \ - "3 for ALSA or OSS (ALSA is prefered)." ) + "3 for ALSA or OSS (ALSA is preferred)." ) #endif #define AUDIO_VOLUME_TEXT N_( "Volume" ) #define AUDIO_VOLUME_LONGTEXT N_( \ diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c index c415835ff9..b7c7d1f155 100644 --- a/modules/audio_output/waveout.c +++ b/modules/audio_output/waveout.c @@ -1216,7 +1216,7 @@ static int ReloadWaveoutDevices( vlc_object_t *p_this, char const *psz_name, /* convert devicename to device ID for output if device not found return WAVE_MAPPER, so let - windows decide which prefered audio device + windows decide which preferred audio device should be used. */ static uint32_t findDeviceID(char *psz_device_name) diff --git a/modules/codec/xvmc/slice_xvmc_vld.c b/modules/codec/xvmc/slice_xvmc_vld.c index eb79b385a4..0d0e96e95d 100644 --- a/modules/codec/xvmc/slice_xvmc_vld.c +++ b/modules/codec/xvmc/slice_xvmc_vld.c @@ -270,7 +270,7 @@ void mpeg2_xxmc_slice( mpeg2dec_t *mpeg2dec, picture_t *picture, else { /* - * An error has occured. + * An error has occurred. */ //printf("VLD XvMC: Slice error: code=%d\tlast slice code=%d\tmb_pic_height=%d\n", code, mpeg2dec->xvmc_last_slice_code,mpeg2dec->xxmc_mb_pic_height); diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index 2155a20df1..136e44e03e 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -484,7 +484,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( i != 0 ) { - msg_Err( p_intf, "An error occured while saving the Interface settings using SimplePrefs" ); + msg_Err( p_intf, "An error occurred while saving the Interface settings using SimplePrefs" ); i = 0; } @@ -544,7 +544,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( i != 0 ) { - msg_Err( p_intf, "An error occured while saving the Audio settings using SimplePrefs" ); + msg_Err( p_intf, "An error occurred while saving the Audio settings using SimplePrefs" ); i = 0; } b_audioSettingChanged = NO; @@ -575,7 +575,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( i != 0 ) { - msg_Err( p_intf, "An error occured while saving the Video settings using SimplePrefs" ); + msg_Err( p_intf, "An error occurred while saving the Video settings using SimplePrefs" ); i = 0; } b_videoSettingChanged = NO; @@ -656,7 +656,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( i != 0 ) { - msg_Err( p_intf, "An error occured while saving the Input settings using SimplePrefs" ); + msg_Err( p_intf, "An error occurred while saving the Input settings using SimplePrefs" ); i = 0; } b_inputSettingChanged = NO; @@ -683,7 +683,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( i != 0 ) { - msg_Err( p_intf, "An error occured while saving the OSD/Subtitle settings using SimplePrefs" ); + msg_Err( p_intf, "An error occurred while saving the OSD/Subtitle settings using SimplePrefs" ); i = 0; } b_osdSettingChanged = NO; @@ -708,7 +708,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; if( i != 0 ) { - msg_Err( p_intf, "An error occured while saving the Hotkey settings using SimplePrefs" ); + msg_Err( p_intf, "An error occurred while saving the Hotkey settings using SimplePrefs" ); i = 0; } b_hotkeyChanged = NO; @@ -1089,4 +1089,4 @@ static VLCSimplePrefs *_o_sharedInstance = nil; [o_temp release]; } -@end \ No newline at end of file +@end diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp index e443e3076a..86e674a958 100644 --- a/modules/gui/qt4/dialogs/help.cpp +++ b/modules/gui/qt4/dialogs/help.cpp @@ -296,7 +296,7 @@ void UpdateDialog::updateNotify( bool b_result ) } else updateLabel->setText( - qtr( "An error occured while checking for updates" ) ); + qtr( "An error occurred while checking for updates" ) ); adjustSize(); updateButton->setEnabled( true ); diff --git a/src/control/media_instance.c b/src/control/media_instance.c index 110d29e186..c3ade3bea4 100644 --- a/src/control/media_instance.c +++ b/src/control/media_instance.c @@ -547,7 +547,7 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi, if( (p_input_thread = libvlc_get_input_thread( p_mi, p_e )) ) { - /* A thread alread exists, send it a play message */ + /* A thread already exists, send it a play message */ input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S ); vlc_object_release( p_input_thread ); return; diff --git a/src/misc/darwin_specific.c b/src/misc/darwin_specific.c index d0d0066210..f962c1def3 100644 --- a/src/misc/darwin_specific.c +++ b/src/misc/darwin_specific.c @@ -144,7 +144,7 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) /* Retrieve the preferred language as chosen in System Preferences.app (note that CFLocaleCopyCurrent() is not used because it returns the - prefered locale not language) + preferred locale not language) */ CFArrayRef all_locales, preferred_locales; char psz_locale[50]; -- 2.39.2