Various spelling fixes.

diff --git a/include/vlc_arrays.h b/include/vlc_arrays.h
index ece3173c3763aac577304a9385db68612000ed15..9757ae48c45b0187dfb09ff30e1771937f3ecf2b 100644 (file)
--- 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 f413462c873c9587c9b038e5ae7cece3bc69e5e6..12f96e344e7a00b5388ccd95ec6d84161a91fe5d 100644 (file)
--- 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 6a6e6cc445838801fea9578b5d70484b430b009b..862c4d17f4f97ea6a7c4d5eee9fc59498e6465aa 100644 (file)
--- 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 a8dc4bff97a1716b1cb7c73330d4b2ee9ce4777d..aa182ea0cade72b15ee2e93a8f9ab250dff5eb8e 100644 (file)
--- 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 c415835ff95e93d70c5ed88f6e621a9655c38ff0..b7c7d1f155199e58f6be0da97d699fa15a5b1995 100644 (file)
--- 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 eb79b385a4e605c85f0bf851a5e2d4ed92598683..0d0e96e95d1c7b01b37f3bf586cd8ceca37daf44 100644 (file)
--- 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 2155a20df11177eee519937eb38cfa3405831a1d..136e44e03e6ae0b0eec156427ae9f8ec8a73b93b 100644 (file)
--- 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 e443e3076a50c170716dd039fd0708e0fe1fdc5b..86e674a9583d8dbb00a6b43e4c146640626bf1ca 100644 (file)
--- 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 110d29e18637e5e3b0bb0a1c7eda8dc2b3e91882..c3ade3bea44e8e72030e7c7e451b27cdd043f280 100644 (file)
--- 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 d0d0066210ab5cc8fe396610287142f3872a8fb0..f962c1def3f02f66900d0b2e635577173d694580 100644 (file)
--- 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];