Commit 5122c9d9 authored by Sam Hocevar's avatar Sam Hocevar

Various spelling fixes.

parent fe22119f
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
/************************************************************************ /************************************************************************
* Dynamic arrays with progressive allocation (Prefered API) * Dynamic arrays with progressive allocation (Preferred API)
************************************************************************/ ************************************************************************/
typedef struct vlc_array_t typedef struct vlc_array_t
{ {
......
...@@ -120,7 +120,7 @@ TYPEDEF_ARRAY(input_item_t*, input_item_array_t); ...@@ -120,7 +120,7 @@ TYPEDEF_ARRAY(input_item_t*, input_item_array_t);
* will maybe become useful again when we merge VLM; * will maybe become useful again when we merge VLM;
* *
* To delete an item, use playlist_DeleteFromInput( input_id ) which will * 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
* *
* @{ * @{
*/ */
......
...@@ -72,7 +72,7 @@ VLC_EXPORT( void, services_discovery_Stop, ( services_discover ...@@ -72,7 +72,7 @@ VLC_EXPORT( void, services_discovery_Stop, ( services_discover
/* Read info from discovery object */ /* Read info from discovery object */
VLC_EXPORT( char *, services_discovery_GetLocalizedName, ( services_discovery_t * p_this ) ); 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 ) ); VLC_EXPORT( vlc_event_manager_t *, services_discovery_EventManager, ( services_discovery_t * p_this ) );
/* Used by services_discovery to post update about their items */ /* Used by services_discovery to post update about their items */
......
...@@ -183,7 +183,7 @@ static void AccessClose( vlc_object_t * ); ...@@ -183,7 +183,7 @@ static void AccessClose( vlc_object_t * );
#else #else
#define AUDIO_METHOD_LONGTEXT N_( \ #define AUDIO_METHOD_LONGTEXT N_( \
"Audio method to use: 0 to disable audio, 1 for OSS, 2 for ALSA, " \ "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 #endif
#define AUDIO_VOLUME_TEXT N_( "Volume" ) #define AUDIO_VOLUME_TEXT N_( "Volume" )
#define AUDIO_VOLUME_LONGTEXT N_( \ #define AUDIO_VOLUME_LONGTEXT N_( \
......
...@@ -1216,7 +1216,7 @@ static int ReloadWaveoutDevices( vlc_object_t *p_this, char const *psz_name, ...@@ -1216,7 +1216,7 @@ static int ReloadWaveoutDevices( vlc_object_t *p_this, char const *psz_name,
/* /*
convert devicename to device ID for output convert devicename to device ID for output
if device not found return WAVE_MAPPER, so let if device not found return WAVE_MAPPER, so let
windows decide which prefered audio device windows decide which preferred audio device
should be used. should be used.
*/ */
static uint32_t findDeviceID(char *psz_device_name) static uint32_t findDeviceID(char *psz_device_name)
......
...@@ -270,7 +270,7 @@ void mpeg2_xxmc_slice( mpeg2dec_t *mpeg2dec, picture_t *picture, ...@@ -270,7 +270,7 @@ void mpeg2_xxmc_slice( mpeg2dec_t *mpeg2dec, picture_t *picture,
else 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); //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);
......
...@@ -484,7 +484,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -484,7 +484,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
if( i != 0 ) 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; i = 0;
} }
...@@ -544,7 +544,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -544,7 +544,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
if( i != 0 ) 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; i = 0;
} }
b_audioSettingChanged = NO; b_audioSettingChanged = NO;
...@@ -575,7 +575,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -575,7 +575,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
if( i != 0 ) 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; i = 0;
} }
b_videoSettingChanged = NO; b_videoSettingChanged = NO;
...@@ -656,7 +656,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -656,7 +656,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
if( i != 0 ) 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; i = 0;
} }
b_inputSettingChanged = NO; b_inputSettingChanged = NO;
...@@ -683,7 +683,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -683,7 +683,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
if( i != 0 ) 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; i = 0;
} }
b_osdSettingChanged = NO; b_osdSettingChanged = NO;
...@@ -708,7 +708,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -708,7 +708,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
if( i != 0 ) 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; i = 0;
} }
b_hotkeyChanged = NO; b_hotkeyChanged = NO;
...@@ -1089,4 +1089,4 @@ static VLCSimplePrefs *_o_sharedInstance = nil; ...@@ -1089,4 +1089,4 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
[o_temp release]; [o_temp release];
} }
@end @end
\ No newline at end of file
...@@ -296,7 +296,7 @@ void UpdateDialog::updateNotify( bool b_result ) ...@@ -296,7 +296,7 @@ void UpdateDialog::updateNotify( bool b_result )
} }
else else
updateLabel->setText( updateLabel->setText(
qtr( "An error occured while checking for updates" ) ); qtr( "An error occurred while checking for updates" ) );
adjustSize(); adjustSize();
updateButton->setEnabled( true ); updateButton->setEnabled( true );
......
...@@ -547,7 +547,7 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi, ...@@ -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 )) ) 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 ); input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S );
vlc_object_release( p_input_thread ); vlc_object_release( p_input_thread );
return; return;
......
...@@ -144,7 +144,7 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] ) ...@@ -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 Retrieve the preferred language as chosen in System Preferences.app
(note that CFLocaleCopyCurrent() is not used because it returns the (note that CFLocaleCopyCurrent() is not used because it returns the
prefered locale not language) preferred locale not language)
*/ */
CFArrayRef all_locales, preferred_locales; CFArrayRef all_locales, preferred_locales;
char psz_locale[50]; char psz_locale[50];
......
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