[vlc-commits] commit: Spell preferred ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Jun 25 03:08:58 2010 +0300| [927b5f97febb81a7fd07eef12f76396dd2e665fb] | committer: Rémi Denis-Courmont 

Spell preferred

(cherry picked from commit 4b85979a1c02a40912226568c815970d178a1ac9)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=927b5f97febb81a7fd07eef12f76396dd2e665fb
---

 include/vlc_picture.h                |    2 +-
 modules/stream_out/record.c          |    2 +-
 modules/video_filter/atmo/README.txt |    2 +-
 modules/video_filter/atmo/atmo.cpp   |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/vlc_picture.h b/include/vlc_picture.h
index 6ff0f53..52c23b2 100644
--- a/include/vlc_picture.h
+++ b/include/vlc_picture.h
@@ -136,7 +136,7 @@ VLC_EXPORT( picture_t *, picture_New, ( vlc_fourcc_t i_chroma, int i_width, int
 /**
  * This function will create a new picture using the given format.
  *
- * When possible, it is prefered to use this function over picture_New
+ * When possible, it is preferred to use this function over picture_New
  * as more information about the format is kept.
  */
 VLC_EXPORT( picture_t *, picture_NewFromFormat, ( const video_format_t *p_fmt ) );
diff --git a/modules/stream_out/record.c b/modules/stream_out/record.c
index 2eb5420..4f8255f 100644
--- a/modules/stream_out/record.c
+++ b/modules/stream_out/record.c
@@ -374,7 +374,7 @@ static void OutputStart( sout_stream_t *p_stream )
     const char *psz_muxer = NULL;
     const char *psz_extension = NULL;
 
-    /* Look for prefered muxer
+    /* Look for preferred muxer
      * TODO we could insert transcode in a few cases like
      * s16l <-> s16b
      */
diff --git a/modules/video_filter/atmo/README.txt b/modules/video_filter/atmo/README.txt
index f12e849..d4b08c3 100644
--- a/modules/video_filter/atmo/README.txt
+++ b/modules/video_filter/atmo/README.txt
@@ -200,7 +200,7 @@ AtmoLight Channel 4: gets zone 0 (top)
 Also the settings for Gradient images change for the new devices, its no longer
 sufficient to speficy only 5 image name - because the number of zones is no longer
 fixed to five.
-So its prefered to set a path ("Gradient Bitmap searchpath"), where files 
+So its preferred to set a path ("Gradient Bitmap searchpath"), where files 
 like "zone_0.bmp" "zone_1.bmp" etc. exists. (with the same rules as defined for 
 the old zone bitmaps.)
 --> I think in most cases its no longer required to use this option,
diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp
index cab07f7..02a77d0 100644
--- a/modules/video_filter/atmo/atmo.cpp
+++ b/modules/video_filter/atmo/atmo.cpp
@@ -133,7 +133,7 @@ strings for settings menus and hints
  "in live action.")
 
 #define DRIVER_TEXT            N_("Device type")
-#define DRIVER_LONGTEXT        N_("Choose your prefered hardware from " \
+#define DRIVER_LONGTEXT        N_("Choose your preferred hardware from " \
                                   "the list, or choose AtmoWin Software " \
                                   "to delegate processing to the external " \
                                   "process - with more options")
@@ -346,7 +346,7 @@ static const char *const ppsz_zone_assignment_descriptions[] = {
                                      "pixels, containing a grayscale gradient")
 
 #define GRADIENT_PATH_TEXT      N_("Gradient bitmap searchpath")
-#define GRADIENT_PATH_LONGTEXT  N_("Now prefered option to assign gradient "\
+#define GRADIENT_PATH_LONGTEXT  N_("Now preferred option to assign gradient "\
     "bitmaps, put them as zone_0.bmp, zone_1.bmp etc. into one folder and "\
     "set the foldername here")