From fdc455adc812cf9b02ae40c8bd47a1a261a32ce6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Tue, 31 Aug 2010 21:53:28 +0200 Subject: [PATCH] Fix some typos. --- include/vlc/libvlc.h | 6 +++--- modules/audio_output/alsa.c | 2 +- modules/demux/avi/avi.c | 2 +- modules/gui/macosx/embeddedwindow.m | 2 +- modules/gui/qt4/main_interface.hpp | 2 +- modules/gui/qt4/util/qvlcframe.hpp | 2 +- modules/misc/quartztext.c | 2 +- modules/packetizer/dirac.c | 2 +- src/control/error.c | 6 +++--- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h index dbc70d272e..8541768ff5 100644 --- a/include/vlc/libvlc.h +++ b/include/vlc/libvlc.h @@ -89,21 +89,21 @@ VLC_PUBLIC_API const char *libvlc_errmsg (void); /** * Clears the LibVLC error status for the current thread. This is optional. - * By default, the error status is automatically overriden when a new error + * By default, the error status is automatically overridden when a new error * occurs, and destroyed when the thread exits. */ VLC_PUBLIC_API void libvlc_clearerr (void); /** * Sets the LibVLC error status and message for the current thread. - * Any previous error is overriden. + * Any previous error is overridden. * \return a nul terminated string in any case */ const char *libvlc_vprinterr (const char *fmt, va_list ap); /** * Sets the LibVLC error status and message for the current thread. - * Any previous error is overriden. + * Any previous error is overridden. * \return a nul terminated string in any case */ const char *libvlc_printerr (const char *fmt, ...); diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c index 448951333d..69190c7ffa 100644 --- a/modules/audio_output/alsa.c +++ b/modules/audio_output/alsa.c @@ -338,7 +338,7 @@ static int Open( vlc_object_t *p_this ) } /* Choose the IEC device for S/PDIF output: - if the device is overriden by the user then it will be the one + if the device is overridden by the user then it will be the one otherwise we compute the default device based on the output format. */ char *psz_iec_device = NULL; if( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) ) diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c index a6b9154f5b..cc3f374747 100644 --- a/modules/demux/avi/avi.c +++ b/modules/demux/avi/avi.c @@ -281,7 +281,7 @@ static int Open( vlc_object_t * p_this ) p_demux->pf_control = Control; p_demux->pf_demux = Demux_Seekable; - /* For unseekable stream, automaticaly use Demux_UnSeekable */ + /* For unseekable stream, automatically use Demux_UnSeekable */ if( !p_sys->b_seekable || var_InheritBool( p_demux, "avi-interleaved" ) ) { diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m index acbf2cde38..6491af45c2 100644 --- a/modules/gui/macosx/embeddedwindow.m +++ b/modules/gui/macosx/embeddedwindow.m @@ -435,7 +435,7 @@ /* Only create the o_fullscreen_window if we are not in the middle of the zooming animation */ if (!o_fullscreen_window) { - /* We can't change the styleMask of an already created NSWindow, so we create an other window, and do eye catching stuff */ + /* We can't change the styleMask of an already created NSWindow, so we create another window, and do eye catching stuff */ rect = [[o_view superview] convertRect: [o_view frame] toView: nil]; /* Convert to Window base coord */ rect.origin.x += [self frame].origin.x; diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp index d6a59512d9..c8264c796d 100644 --- a/modules/gui/qt4/main_interface.hpp +++ b/modules/gui/qt4/main_interface.hpp @@ -153,7 +153,7 @@ private: /* Flags */ bool b_notificationEnabled; /// Systray Notifications - bool b_autoresize; ///< persistent resizeable window + bool b_autoresize; ///< persistent resizable window bool b_videoEmbedded; ///< Want an external Video Window bool b_videoFullScreen; ///< --fullscreen bool b_videoOnTop; ///< --video-on-top diff --git a/modules/gui/qt4/util/qvlcframe.hpp b/modules/gui/qt4/util/qvlcframe.hpp index ec968b64d3..edaa08be96 100644 --- a/modules/gui/qt4/util/qvlcframe.hpp +++ b/modules/gui/qt4/util/qvlcframe.hpp @@ -42,7 +42,7 @@ class QVLCTools /* use this function to save a widgets screen position only for windows / dialogs which are floating, if a - window is docked into an other - don't all this function + window is docked into another - don't all this function or it may write garbage to position info! */ static void saveWidgetPosition( QSettings *settings, QWidget *widget) diff --git a/modules/misc/quartztext.c b/modules/misc/quartztext.c index b7c4da2374..b1dd12ade8 100644 --- a/modules/misc/quartztext.c +++ b/modules/misc/quartztext.c @@ -82,7 +82,7 @@ static void setFontAttibutes( char *psz_fontname, int i_font_size, uint32_t i_fo #define FONTSIZER_TEXT N_("Relative font size") #define FONTSIZER_LONGTEXT N_("This is the relative default size of the " \ "fonts that will be rendered on the video. If absolute font size is set, "\ - "relative size will be overriden." ) + "relative size will be overridden." ) #define COLOR_TEXT N_("Text default color") #define COLOR_LONGTEXT N_("The color of the text that will be rendered on "\ "the video. This must be an hexadecimal (like HTML colors). The first two "\ diff --git a/modules/packetizer/dirac.c b/modules/packetizer/dirac.c index 8676e6acbc..0e92cce548 100644 --- a/modules/packetizer/dirac.c +++ b/modules/packetizer/dirac.c @@ -23,7 +23,7 @@ /* Dirac packetizer, formed of three parts: * 1) Bitstream synchroniser (dirac_DoSync) - * - Given an arbitary sequence of bytes, extract whole Dirac Data Units + * - Given an arbitrary sequence of bytes, extract whole Dirac Data Units * - Maps timestamps in supplied block_t's to the extracted Data Unit * A time stamp applies to the next Data Unit to commence at, or after * the first byte of the block_t with the timestamp. diff --git a/src/control/error.c b/src/control/error.c index f9a3f695ac..e3f7051ee8 100644 --- a/src/control/error.c +++ b/src/control/error.c @@ -86,7 +86,7 @@ const char *libvlc_errmsg (void) /** * Clears the LibVLC error status for the current thread. This is optional. - * By default, the error status is automatically overriden when a new error + * By default, the error status is automatically overridden when a new error * occurs, and destroyed when the thread exits. */ void libvlc_clearerr (void) @@ -97,7 +97,7 @@ void libvlc_clearerr (void) /** * Sets the LibVLC error status and message for the current thread. - * Any previous error is overriden. + * Any previous error is overridden. * @return a nul terminated string (always) */ const char *libvlc_vprinterr (const char *fmt, va_list ap) @@ -115,7 +115,7 @@ const char *libvlc_vprinterr (const char *fmt, va_list ap) /** * Sets the LibVLC error status and message for the current thread. - * Any previous error is overriden. + * Any previous error is overridden. * @return a nul terminated string (always) */ const char *libvlc_printerr (const char *fmt, ...) -- 2.39.2