spelling fixes

This commit is contained in:
klemens 2016-12-29 10:31:05 +01:00
parent 76db2e811d
commit 0d549f1db3
21 changed files with 26 additions and 26 deletions

View File

@ -82,7 +82,7 @@
- header typo corrections [\#1058](https://github.com/ZoneMinder/ZoneMinder/pull/1058) ([onlyjob](https://github.com/onlyjob)) - header typo corrections [\#1058](https://github.com/ZoneMinder/ZoneMinder/pull/1058) ([onlyjob](https://github.com/onlyjob))
- quick fix for \#1055: make sure our mmap fd is \> 2 [\#1057](https://github.com/ZoneMinder/ZoneMinder/pull/1057) ([connortechnology](https://github.com/connortechnology)) - quick fix for \#1055: make sure our mmap fd is \> 2 [\#1057](https://github.com/ZoneMinder/ZoneMinder/pull/1057) ([connortechnology](https://github.com/connortechnology))
- Fix sgfault caused by the privacy mask stuff [\#1056](https://github.com/ZoneMinder/ZoneMinder/pull/1056) ([connortechnology](https://github.com/connortechnology)) - Fix sgfault caused by the privacy mask stuff [\#1056](https://github.com/ZoneMinder/ZoneMinder/pull/1056) ([connortechnology](https://github.com/connortechnology))
- link to cambozola pacakge, rather than download during build [\#1054](https://github.com/ZoneMinder/ZoneMinder/pull/1054) ([knnniggett](https://github.com/knnniggett)) - link to cambozola package, rather than download during build [\#1054](https://github.com/ZoneMinder/ZoneMinder/pull/1054) ([knnniggett](https://github.com/knnniggett))
- redhat rpm packaging modifications [\#1052](https://github.com/ZoneMinder/ZoneMinder/pull/1052) ([knnniggett](https://github.com/knnniggett)) - redhat rpm packaging modifications [\#1052](https://github.com/ZoneMinder/ZoneMinder/pull/1052) ([knnniggett](https://github.com/knnniggett))
- remove core.php, modify core.php.default [\#1049](https://github.com/ZoneMinder/ZoneMinder/pull/1049) ([knnniggett](https://github.com/knnniggett)) - remove core.php, modify core.php.default [\#1049](https://github.com/ZoneMinder/ZoneMinder/pull/1049) ([knnniggett](https://github.com/knnniggett))
- Google recaptcha [\#1048](https://github.com/ZoneMinder/ZoneMinder/pull/1048) ([pliablepixels](https://github.com/pliablepixels)) - Google recaptcha [\#1048](https://github.com/ZoneMinder/ZoneMinder/pull/1048) ([pliablepixels](https://github.com/pliablepixels))
@ -167,7 +167,7 @@
- alter the logic of ReadData. New behaviour is documented. [\#870](https://github.com/ZoneMinder/ZoneMinder/pull/870) ([connortechnology](https://github.com/connortechnology)) - alter the logic of ReadData. New behaviour is documented. [\#870](https://github.com/ZoneMinder/ZoneMinder/pull/870) ([connortechnology](https://github.com/connortechnology))
- analysis optimisations [\#867](https://github.com/ZoneMinder/ZoneMinder/pull/867) ([connortechnology](https://github.com/connortechnology)) - analysis optimisations [\#867](https://github.com/ZoneMinder/ZoneMinder/pull/867) ([connortechnology](https://github.com/connortechnology))
- Don't die if db goes away during logging [\#866](https://github.com/ZoneMinder/ZoneMinder/pull/866) ([connortechnology](https://github.com/connortechnology)) - Don't die if db goes away during logging [\#866](https://github.com/ZoneMinder/ZoneMinder/pull/866) ([connortechnology](https://github.com/connortechnology))
- Move iostream inclusion in zm.h and declare explicitely the namespace [\#859](https://github.com/ZoneMinder/ZoneMinder/pull/859) ([manupap1](https://github.com/manupap1)) - Move iostream inclusion in zm.h and declare explicitly the namespace [\#859](https://github.com/ZoneMinder/ZoneMinder/pull/859) ([manupap1](https://github.com/manupap1))
- Fix detection of deprecated libav / ffmpeg functions [\#858](https://github.com/ZoneMinder/ZoneMinder/pull/858) ([manupap1](https://github.com/manupap1)) - Fix detection of deprecated libav / ffmpeg functions [\#858](https://github.com/ZoneMinder/ZoneMinder/pull/858) ([manupap1](https://github.com/manupap1))
- Correct bareword config entries with newer {} style [\#856](https://github.com/ZoneMinder/ZoneMinder/pull/856) ([connortechnology](https://github.com/connortechnology)) - Correct bareword config entries with newer {} style [\#856](https://github.com/ZoneMinder/ZoneMinder/pull/856) ([connortechnology](https://github.com/connortechnology))
- update german translation [\#854](https://github.com/ZoneMinder/ZoneMinder/pull/854) ([seeebek](https://github.com/seeebek)) - update german translation [\#854](https://github.com/ZoneMinder/ZoneMinder/pull/854) ([seeebek](https://github.com/seeebek))

View File

@ -42,7 +42,7 @@ execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/misc/jscalendar.sh
if("${unzip_jsc}" STREQUAL "") if("${unzip_jsc}" STREQUAL "")
message(STATUS "jscalendar successfully installed.") message(STATUS "jscalendar successfully installed.")
else("${unzip_jsc}" STREQUAL "") else("${unzip_jsc}" STREQUAL "")
message(FATAL_ERROR "\nAn error occured while jscalendar was being processed:\n${unzip_jsc}") message(FATAL_ERROR "\nAn error occurred while jscalendar was being processed:\n${unzip_jsc}")
endif("${unzip_jsc}" STREQUAL "") endif("${unzip_jsc}" STREQUAL "")
# Create several empty folders # Create several empty folders

View File

@ -1,7 +1,7 @@
HTTPS is now a requirement HTTPS is now a requirement
========================== ==========================
This package now depends on Apache's mod_ssl pacakge. This will automatically This package now depends on Apache's mod_ssl package. This will automatically
be installed along with ZoneMinder. Upon installation, the mod_ssl package be installed along with ZoneMinder. Upon installation, the mod_ssl package
will create a default, self-signed certificate. This is the certificate that will create a default, self-signed certificate. This is the certificate that
ZoneMinder will use out of the box. ZoneMinder will use out of the box.

View File

@ -395,7 +395,7 @@ zoneminder (1.24.2-4.1) unstable; urgency=low
zoneminder (1.24.2-4) unstable; urgency=high zoneminder (1.24.2-4) unstable; urgency=high
* Update init.d to list mysql dependency * Update init.d to list mysql dependency
(closes: #583505) (closes: #583505)
* Change depenency from libmime-perl to libmime-tools-perl * Change dependency from libmime-perl to libmime-tools-perl
(closes: #585589) (closes: #585589)
* Problems in changelog format fixed * Problems in changelog format fixed
(closes: #585592) (closes: #585592)
@ -432,7 +432,7 @@ zoneminder (1.24.1-1) unstable; urgency=high
(closes: #497640) (closes: #497640)
* Change syslog dependency to rsyslog. * Change syslog dependency to rsyslog.
(closes: #526918) (closes: #526918)
* Add missing perl depenency. * Add missing perl dependency.
* Restore patch to disable "check for updates" by default. * Restore patch to disable "check for updates" by default.
* Removed spurious '$' in init script. * Removed spurious '$' in init script.
(closes: #486064) (closes: #486064)

View File

@ -429,7 +429,7 @@ zoneminder (1.24.2-4.1) unstable; urgency=low
zoneminder (1.24.2-4) unstable; urgency=high zoneminder (1.24.2-4) unstable; urgency=high
* Update init.d to list mysql dependency * Update init.d to list mysql dependency
(closes: #583505) (closes: #583505)
* Change depenency from libmime-perl to libmime-tools-perl * Change dependency from libmime-perl to libmime-tools-perl
(closes: #585589) (closes: #585589)
* Problems in changelog format fixed * Problems in changelog format fixed
(closes: #585592) (closes: #585592)
@ -466,7 +466,7 @@ zoneminder (1.24.1-1) unstable; urgency=high
(closes: #497640) (closes: #497640)
* Change syslog dependency to rsyslog. * Change syslog dependency to rsyslog.
(closes: #526918) (closes: #526918)
* Add missing perl depenency. * Add missing perl dependency.
* Restore patch to disable "check for updates" by default. * Restore patch to disable "check for updates" by default.
* Removed spurious '$' in init script. * Removed spurious '$' in init script.
(closes: #486064) (closes: #486064)

View File

@ -29,7 +29,7 @@
extern "C" extern "C"
{ {
/* Stuff for overriden error handlers */ /* Stuff for overridden error handlers */
struct zm_error_mgr struct zm_error_mgr
{ {
struct jpeg_error_mgr pub; struct jpeg_error_mgr pub;

View File

@ -224,7 +224,7 @@ protected:
#endif #endif
bool mStarted; bool mStarted;
bool mRunning; bool mRunning;
int status; // Used in various funcions to get around return a local variable int status; // Used in various functions to get around return a local variable
protected: protected:
Thread(); Thread();

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Prepare proper amount of shared memory # Prepare proper amount of shared memory
# For H.264 cameras it may be necessary to increase the amout of shared memory # For H.264 cameras it may be necessary to increase the amount of shared memory
# to 2048 megabytes. # to 2048 megabytes.
umount /dev/shm umount /dev/shm
mount -t tmpfs -o rw,nosuid,nodev,noexec,relatime,size=512M tmpfs /dev/shm mount -t tmpfs -o rw,nosuid,nodev,noexec,relatime,size=512M tmpfs /dev/shm

View File

@ -93,7 +93,7 @@ class Event {
$start_date['year'] = $start_date['year'] % 100; $start_date['year'] = $start_date['year'] % 100;
$Storage = $this->Storage(); $Storage = $this->Storage();
# So this is because ZM creates a link under teh day pointing to the time that the event happened. # So this is because ZM creates a link under the day pointing to the time that the event happened.
$eventlink_path = $Storage->Path().'/'.$this->Link_Path(); $eventlink_path = $Storage->Path().'/'.$this->Link_Path();
if ( $id_files = glob( $eventlink_path ) ) { if ( $id_files = glob( $eventlink_path ) ) {

View File

@ -482,7 +482,7 @@ function deleteEvent( $event, $mid=false ) {
$start_date = date_parse( $event['StartTime'] ); $start_date = date_parse( $event['StartTime'] );
$start_date['year'] = $start_date['year'] % 100; $start_date['year'] = $start_date['year'] % 100;
# So this is because ZM creates a link under teh day pointing to the time that the event happened. # So this is because ZM creates a link under the day pointing to the time that the event happened.
$eventlink_path = sprintf('%s/%d/%02d/%02d/%02d/.%d', ZM_DIR_EVENTS, $mid, $start_date['year'], $start_date['month'], $start_date['day'], $event['Id'] ); $eventlink_path = sprintf('%s/%d/%02d/%02d/%02d/.%d', ZM_DIR_EVENTS, $mid, $start_date['year'], $start_date['month'], $start_date['day'], $event['Id'] );
if ( $id_files = glob( $eventlink_path ) ) { if ( $id_files = glob( $eventlink_path ) ) {
@ -2137,6 +2137,6 @@ function folder_size($dir) {
$size += is_file($each) ? filesize($each) : folderSize($each); $size += is_file($each) ? filesize($each) : folderSize($each);
} }
return $size; return $size;
} // end fucntion folder_size } // end function folder_size
?> ?>

View File

@ -818,7 +818,7 @@ $VLANG = array(
// in to generate the correct noun form. // in to generate the correct noun form.
// //
// In languages such as English this is fairly simple // In languages such as English this is fairly simple
// Note this still has to be used with printf etc to get the right formating // Note this still has to be used with printf etc to get the right formatting
function zmVlang( $langVarArray, $count ) function zmVlang( $langVarArray, $count )
{ {
krsort( $langVarArray ); krsort( $langVarArray );

View File

@ -813,7 +813,7 @@ $VLANG = array(
// in to generate the correct noun form. // in to generate the correct noun form.
// //
// In languages such as English this is fairly simple // In languages such as English this is fairly simple
// Note this still has to be used with printf etc to get the right formating // Note this still has to be used with printf etc to get the right formatting
function zmVlang( $langVarArray, $count ) function zmVlang( $langVarArray, $count )
{ {
krsort( $langVarArray ); krsort( $langVarArray );

View File

@ -814,7 +814,7 @@ $VLANG = array(
// in to generate the correct noun form. // in to generate the correct noun form.
// //
// In languages such as English this is fairly simple // In languages such as English this is fairly simple
// Note this still has to be used with printf etc to get the right formating // Note this still has to be used with printf etc to get the right formatting
function zmVlang( $langVarArray, $count ) function zmVlang( $langVarArray, $count )
{ {
krsort( $langVarArray ); krsort( $langVarArray );

View File

@ -825,7 +825,7 @@ $VLANG = array(
// in to generate the correct noun form. // in to generate the correct noun form.
// //
// In languages such as English this is fairly simple // In languages such as English this is fairly simple
// Note this still has to be used with printf etc to get the right formating // Note this still has to be used with printf etc to get the right formatting
function zmVlang( $langVarArray, $count ) function zmVlang( $langVarArray, $count )
{ {
krsort( $langVarArray ); krsort( $langVarArray );
@ -913,7 +913,7 @@ $OLANG = array(
'Help' => "Enable this option to embed EXIF data into each jpeg frame." 'Help' => "Enable this option to embed EXIF data into each jpeg frame."
), ),
'OPTIONS_RTSPDESCRIBE' => array( 'OPTIONS_RTSPDESCRIBE' => array(
'Help' => "Sometimes, during the intial RTSP handshake, the camera will send an updated media URL. ". 'Help' => "Sometimes, during the initial RTSP handshake, the camera will send an updated media URL. ".
"Enable this option to tell ZoneMinder to use this URL. Disable this option to ignore the ". "Enable this option to tell ZoneMinder to use this URL. Disable this option to ignore the ".
"value from the camera and use the value as entered in the monitor configuration~~~~". "value from the camera and use the value as entered in the monitor configuration~~~~".
"Generally this should be enabled. However, there are cases where the camera can get its". "Generally this should be enabled. However, there are cases where the camera can get its".

View File

@ -820,7 +820,7 @@ $VLANG = array(
// in to generate the correct noun form. // in to generate the correct noun form.
// //
// In languages such as English this is fairly simple // In languages such as English this is fairly simple
// Note this still has to be used with printf etc to get the right formating // Note this still has to be used with printf etc to get the right formatting
function zmVlang( $langVarArray, $count ) function zmVlang( $langVarArray, $count )
{ {
krsort( $langVarArray ); krsort( $langVarArray );

View File

@ -814,7 +814,7 @@ $VLANG = array(
// in to generate the correct noun form. // in to generate the correct noun form.
// //
// In languages such as English this is fairly simple // In languages such as English this is fairly simple
// Note this still has to be used with printf etc to get the right formating // Note this still has to be used with printf etc to get the right formatting
function zmVlang( $langVarArray, $count ) function zmVlang( $langVarArray, $count )
{ {
krsort( $langVarArray ); krsort( $langVarArray );

View File

@ -819,7 +819,7 @@ $VLANG = array(
// in to generate the correct noun form. // in to generate the correct noun form.
// //
// In languages such as English this is fairly simple // In languages such as English this is fairly simple
// Note this still has to be used with printf etc to get the right formating // Note this still has to be used with printf etc to get the right formatting
function zmVlang( $langVarArray, $count ) function zmVlang( $langVarArray, $count )
{ {
krsort( $langVarArray ); krsort( $langVarArray );

View File

@ -814,7 +814,7 @@ $VLANG = array(
// in to generate the correct noun form. // in to generate the correct noun form.
// //
// In languages such as English this is fairly simple // In languages such as English this is fairly simple
// Note this still has to be used with printf etc to get the right formating // Note this still has to be used with printf etc to get the right formatting
function zmVlang( $langVarArray, $count ) function zmVlang( $langVarArray, $count )
{ {
krsort( $langVarArray ); krsort( $langVarArray );

View File

@ -815,7 +815,7 @@ $VLANG = array(
// in to generate the correct noun form. // in to generate the correct noun form.
// //
// In languages such as English this is fairly simple // In languages such as English this is fairly simple
// Note this still has to be used with printf etc to get the right formating // Note this still has to be used with printf etc to get the right formatting
function zmVlang( $langVarArray, $count ) function zmVlang( $langVarArray, $count )
{ {
krsort( $langVarArray ); krsort( $langVarArray );

View File

@ -754,7 +754,7 @@ $VLANG = array(
// in to generate the correct noun form. // in to generate the correct noun form.
// //
// In languages such as English this is fairly simple // In languages such as English this is fairly simple
// Note this still has to be used with printf etc to get the right formating // Note this still has to be used with printf etc to get the right formatting
function zmVlang( $langVarArray, $count ) function zmVlang( $langVarArray, $count )
{ {
krsort( $langVarArray ); krsort( $langVarArray );

View File

@ -816,7 +816,7 @@ $VLANG = array(
// in to generate the correct noun form. // in to generate the correct noun form.
// //
// In languages such as English this is fairly simple // In languages such as English this is fairly simple
// Note this still has to be used with printf etc to get the right formating // Note this still has to be used with printf etc to get the right formatting
/*function zmVlang( $langVarArray, $count ) /*function zmVlang( $langVarArray, $count )
{ {
krsort( $langVarArray ); krsort( $langVarArray );