[vlc-commits] commit: Spell "separate" ( Rémi Denis-Courmont )
git at videolan.org
git at videolan.org
Thu Jun 24 03:44:37 CEST 2010
vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jun 24 04:37:32 2010 +0300| [b00a8eb69e56c63f2b3c4b6d71c8bc8c41b6cc4e] | committer: Rémi Denis-Courmont
Spell "separate"
(cherry picked from commit 19a50f5df315c583d84712be7c724ba3ab587c1c)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=b00a8eb69e56c63f2b3c4b6d71c8bc8c41b6cc4e
---
include/vlc_osd.h | 2 +-
modules/codec/dirac.c | 4 ++--
modules/packetizer/h264.c | 2 +-
modules/video_filter/atmo/DmxTools.cpp | 2 +-
modules/video_filter/atmo/DmxTools.h | 2 +-
modules/video_filter/atmo/README.txt | 4 ++--
modules/video_filter/atmo/atmo.cpp | 4 ++--
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/vlc_osd.h b/include/vlc_osd.h
index ec80d07..5c60c58 100644
--- a/include/vlc_osd.h
+++ b/include/vlc_osd.h
@@ -363,7 +363,7 @@ struct osd_button_t
*
* The images that make up an OSD menu can be created in such away that
* they contain all buttons in the same picture, with the selected one
- * highlighted or being a concatenation of all the seperate images. The
+ * highlighted or being a concatenation of all the separate images. The
* first case is the default.
*
* To change the default style the keyword 'style' should be set to 'concat'.
diff --git a/modules/codec/dirac.c b/modules/codec/dirac.c
index 67da03a..2d5af1b 100644
--- a/modules/codec/dirac.c
+++ b/modules/codec/dirac.c
@@ -103,13 +103,13 @@ static const char *const enc_chromafmt_list_text[] =
#define ENC_CODINGMODE "coding-mode"
#define ENC_CODINGMODE_TEXT N_("Picture coding mode")
#define ENC_CODINGMODE_LONGTEXT N_("Field coding is where interlaced fields are coded" \
- " seperately as opposed to a pseudo-progressive frame")
+ " separately as opposed to a pseudo-progressive frame")
static const char *const enc_codingmode_list[] =
{ "auto", "progressive", "field" };
static const char *const enc_codingmode_list_text[] =
{ N_("auto - let encoder decide based upon input (Best)"),
N_("force coding frame as single picture"),
- N_("force coding frame as seperate interlaced fields"),
+ N_("force coding frame as separate interlaced fields"),
};
#define ENC_MCBLK_WIDTH "mc-blk-width"
diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index 37eb011..35e1010 100644
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -821,7 +821,7 @@ static void PutSPS( decoder_t *p_dec, block_t *p_frag )
/* chroma_format_idc */
const int i_chroma_format_idc = bs_read_ue( &s );
if( i_chroma_format_idc == 3 )
- bs_skip( &s, 1 ); /* seperate_colour_plane_flag */
+ bs_skip( &s, 1 ); /* separate_colour_plane_flag */
/* bit_depth_luma_minus8 */
bs_read_ue( &s );
/* bit_depth_chroma_minus8 */
diff --git a/modules/video_filter/atmo/DmxTools.cpp b/modules/video_filter/atmo/DmxTools.cpp
index 9854ceb..fe4c066 100644
--- a/modules/video_filter/atmo/DmxTools.cpp
+++ b/modules/video_filter/atmo/DmxTools.cpp
@@ -1,5 +1,5 @@
/*
- * DmxTools.cpp: functions to convert , or ; seperatered numbers into an integer array
+ * DmxTools.cpp: functions to convert , or ; separated numbers into an integer array
*
* See the README.txt file for copyright information and how to reach the author(s).
*
diff --git a/modules/video_filter/atmo/DmxTools.h b/modules/video_filter/atmo/DmxTools.h
index a714bc9..0640ca5 100644
--- a/modules/video_filter/atmo/DmxTools.h
+++ b/modules/video_filter/atmo/DmxTools.h
@@ -1,5 +1,5 @@
/*
-* DmxTools.h: functions to convert , or ; seperatered numbers into an integer array
+* DmxTools.h: functions to convert , or ; separated numbers into an integer array
*
* See the README.txt file for copyright information and how to reach the author(s).
*
diff --git a/modules/video_filter/atmo/README.txt b/modules/video_filter/atmo/README.txt
index e164692..f12e849 100644
--- a/modules/video_filter/atmo/README.txt
+++ b/modules/video_filter/atmo/README.txt
@@ -66,7 +66,7 @@ VideonLAN 1.1.x
"Serial Device / Port":
The COM-Port you are using for the hardware. E.G.: COM6 (This setting must be done if you are using a device
other than "AtmoWin Software")
-in the case of the device "Quattro AtmoLight" you may specify up to four ports/devices seperated by
+in the case of the device "Quattro AtmoLight" you may specify up to four ports/devices separated by
, or ; for example if you are useing two physical devices write
COM6;COM7 or on linux /dev/ttyUSB1;/dev/ttyUSB2
@@ -258,7 +258,7 @@ devices that AtmoWin supports.
- Quattro AtmoLight - is nothing else as that you have connected up to 4 "classic AtmoLight" devices
to your computer creating a up 16 channel Atmo Light - each devices needs its own serial port.
- you have to write the ports seperated by , or ; to [Serial Port/device] f.e. COM3,COM4,COM5 or on
+ you have to write the ports separated by , or ; to [Serial Port/device] f.e. COM3,COM4,COM5 or on
Linux /dev/ttyUSB01,/dev/ttyUSB02,/dev/ttyUSB03
- DMX - stands for a simple DMX controller which can control up to 255 DMX devices (lights)
diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp
index 5bcf0ce..cab07f7 100644
--- a/modules/video_filter/atmo/atmo.cpp
+++ b/modules/video_filter/atmo/atmo.cpp
@@ -164,7 +164,7 @@ static const char *const ppsz_device_type_descriptions[] = {
"emulated with that DMX device")
#define DMX_CHBASE_TEXT N_("DMX address for each channel")
#define DMX_CHBASE_LONGTEXT N_("Define here the DMX base address for each " \
- "channel use , or ; to seperate the values")
+ "channel use , or ; to separate the values")
#define MOMO_CHANNELS_TEXT N_("Count of channels")
#define MOMO_CHANNELS_LONGTEXT N_("Depending on your MoMoLight hardware " \
@@ -329,7 +329,7 @@ static const char *const ppsz_zone_assignment_descriptions[] = {
#define CHANNELS_ASSIGN_TEXT N_("Channel / Zone Assignment")
#define CHANNELS_ASSIGN_LONGTEXT N_("for devices with more than five " \
"channels / zones write down here for each channel " \
- "the zone number to show and seperate the values with " \
+ "the zone number to show and separate the values with " \
", or ; and use -1 to not use some channels. For the " \
"classic AtmoLight the sequence 4,3,1,0,2 would set the " \
"default channel/zone mapping. " \
More information about the vlc-commits
mailing list