/************************************************************************
- * Dynamic arrays with progressive allocation (Prefered API)
+ * Dynamic arrays with progressive allocation (Preferred API)
************************************************************************/
typedef struct vlc_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
*
* @{
*/
/* 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 */
#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_( \
/*
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)
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);
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;
}
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;
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;
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;
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;
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;
[o_temp release];
}
-@end
\ No newline at end of file
+@end
}
else
updateLabel->setText(
- qtr( "An error occured while checking for updates" ) );
+ qtr( "An error occurred while checking for updates" ) );
adjustSize();
updateButton->setEnabled( true );
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;
/*
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];