ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add help window for ffmpeg/libvlc options

pull/421/head
m-bene 2014-05-17 04:33:33 +02:00
parent 1b4f9c082c
commit 9a71a0068a
28 changed files with 305 additions and 29 deletions

8
src/zm_ffmpeg_camera.cpp
View File

@ -126,12 +126,14 @@ int FfmpegCamera::PrimeCapture()
{
StringVector parts = split(opVect[i],"=");
if (parts.size() > 1) {
if ( av_dict_set(&opts, trimSpaces(parts[0]).c_str(), trimSpaces(parts[1]).c_str(), 0) == 0 ) {
Debug(2, "set option %d '%s' to '%s'", i, trimSpaces(parts[0]).c_str(), trimSpaces(parts[1]).c_str());
parts[0] = trimSpaces(parts[0]);
parts[1] = trimSpaces(parts[1]);
if ( av_dict_set(&opts, parts[0].c_str(), parts[1].c_str(), 0) == 0 ) {
Debug(2, "set option %d '%s' to '%s'", i, parts[0].c_str(), parts[1].c_str());
}
else
{
Warning( "Error trying to set option %d '%s' to '%s'", i, trimSpaces(parts[0]).c_str(), trimSpaces(parts[1]).c_str() );
Warning( "Error trying to set option %d '%s' to '%s'", i, parts[0].c_str(), parts[1].c_str() );
}
}

1
src/zm_libvlc_camera.cpp
View File

@ -150,6 +150,7 @@ int LibvlcCamera::PrimeCapture()
mOptArgV = new char*[opVect.size()];
Debug(2, "Number of Options: %d",opVect.size());
for (size_t i=0; i< opVect.size(); i++) {
opVect[i] = trimSpaces(opVect[i]);
mOptArgV[i] = (char *)opVect[i].c_str();
Debug(2, "set option %d to '%s'", i, opVect[i].c_str());
}

15
web/lang/big5_big5.php
View File

@ -383,6 +383,7 @@ $SLANG = array(
'Last' => 'Last',
'Layout' => 'Layout', // Added - 2009-02-08
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'results only;', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Limit to first', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16
@ -863,6 +864,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

15
web/lang/cn_zh.php
View File

@ -379,6 +379,7 @@ $SLANG = array(
'Last' => '最后',
'Layout' => '布局',
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => '个结果', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => '仅限于开始', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16
@ -858,6 +859,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

15
web/lang/cs_cz.php
View File

@ -379,6 +379,7 @@ $SLANG = array(
'Last' => 'Poslední',
'Layout' => 'Layout', // Added - 2009-02-08
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'výsledkù', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Zobrazit pouze prvních', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16
@ -859,6 +860,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

15
web/lang/de_de.php
View File

@ -379,6 +379,7 @@ $SLANG = array(
'Last' => 'Letztes',
'Layout' => 'Layout', // Added - 2009-02-08
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'Ergebnisse;', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Begrenze nur auf die ersten', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16
@ -859,6 +860,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Im Feld Optionen können Parameter angegeben werden, die direkt an FFmpeg weitergegeben werden. Mehrere Parameter können mit , getrennt werden. ".
"Einige Bespiele: (Anführungszeichen nicht eingeben)~~~~".
"\"rtsp_transport=tcp\" Verwenden von TCP statt UDP für die Übermittlung des Datenstroms von der Kamera~~~~".
"\"rtsp_transport=http\" Verwenden von http tunneling für die Übermittlung des Datenstroms von der Kamera~~~~".
"\"loglevel=debug\" Gibt an wie viele Status/Debug Meldungen angezeigt werden sollen (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Im Feld Optionen können Parameter angegeben werden, die direkt an Libvlc weitergegeben werden. Mehrere Parameter können mit , getrennt werden. ".
"Einige Bespiele: (Anführungszeichen nicht eingeben)~~~~".
"\"--rtsp-tcp\" Verwenden von TCP statt UDP für die Übermittlung des Datenstroms von der Kamera~~~~".
"\"--verbose=2\" Gibt an wie viele Status/Debug Meldungen angezeigt werden sollen"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

15
web/lang/dk_dk.php
View File

@ -380,6 +380,7 @@ $SLANG = array(
'Last' => 'Sidste',
'Layout' => 'Layout', // Added - 2009-02-08
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'results only;', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Limit to first', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16
@ -860,6 +861,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

14
web/lang/en_gb.php
View File

@ -860,6 +860,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

15
web/lang/es_ar.php
View File

@ -330,6 +330,7 @@ $SLANG = array(
'Last' => 'Ultimo',
'Layout' => 'Layout', // Added - 2009-02-08
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'Resultados;', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Solo los primeros', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16
@ -716,6 +717,20 @@ function zmVlang( $langVarArray, $count )
}
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
);
?>

1
web/lang/es_es.php
View File

@ -376,6 +376,7 @@ $SLANG = array(
'Last' => 'Último',
'Layout' => 'Diseño',
'Level' => 'Nivel',
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'Sólo resultados', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Limitar al primero', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Línea',

15
web/lang/et_ee.php
View File

@ -374,6 +374,7 @@ $SLANG = array(
'Last' => 'Viimane',
'Layout' => 'Layout',
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'results only', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Limit to first', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16
@ -852,6 +853,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

15
web/lang/fr_fr.php
View File

@ -379,6 +379,7 @@ $SLANG = array(
'Last' => 'Dernier',
'Layout' => 'Layout', // Added - 2009-02-08
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'results only;', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Limit to first', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16
@ -859,6 +860,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

15
web/lang/he_il.php Executable file → Normal file
View File

@ -379,6 +379,7 @@ $SLANG = array(
'Last' => 'àçøåï',
'Layout' => 'Layout', // Added - 2009-02-08
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'úåöàåú áìáã;', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'äâáì ìøàùåï', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16
@ -859,6 +860,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

15
web/lang/hu_hu.php
View File

@ -419,6 +419,7 @@ $SLANG = array(
'Last' => 'Utolsó',
'Layout' => 'Elrendezés',
'Level' => 'Szint',
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'találatra', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Csak az első', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Sor',
@ -897,6 +898,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

15
web/lang/it_it.php
View File

@ -384,6 +384,7 @@ $SLANG = array(
'Last' => 'Ultimo',
'Layout' => 'Layout', // Added - 2009-02-08
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'risultati;', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Limita ai primi', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16
@ -864,6 +865,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

15
web/lang/ja_jp.php
View File

@ -379,6 +379,7 @@ $SLANG = array(
'Last' => '<27>Å<EFBFBD>I',
'Layout' => 'Layout', // Added - 2009-02-08
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'results only;', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Limit to first', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16
@ -859,6 +860,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

51
web/lang/nl_nl.php
View File

@ -130,7 +130,7 @@ $SLANG = array(
'BadFPSReportInterval' => 'FPS rapport interval buffer en aantal moet een nummer groter dan nul zijn',
'BadFormat' => 'Formaat moet een nummer nul of groter zijn',
'BadFrameSkip' => 'Frame skip aantal moet een nummer nul of groter zijn',
'BadMotionFrameSkip' => 'Motion Frame skip count must be an integer of zero or more',
'BadMotionFrameSkip' => 'Motion Frame skip count must be an integer of zero or more',
'BadHeight' => 'Hoogte moet een geldige waarde zijn',
'BadHost' => 'Host moet een juiste address or hostname zijn, laat http:// weg ',
'BadImageBufferCount' => 'Foto buffer groote moet een nummer 10 of groter zijn',
@ -151,7 +151,7 @@ $SLANG = array(
'BadWebColour' => 'Web kleur moeten een geldige webkleurwaarde bevatten',
'BadWidth' => 'Breedte moet ingevuld worden',
'Bandwidth' => 'Bandbreedte',
'BandwidthHead' => 'Bandwidth', // This is the end of the bandwidth status on the top of the console, different in many language due to phrasing
'BandwidthHead' => 'Bandwidth', // This is the end of the bandwidth status on the top of the console, different in many language due to phrasing
'BlobPx' => 'Blob px',
'BlobSizes' => 'Blob grootte',
'Blobs' => 'Blobs',
@ -319,12 +319,12 @@ $SLANG = array(
'First' => 'Eerste',
'FlippedHori' => 'Horizontaal gedraait',
'FlippedVert' => 'Vertikaal gedraait',
'FnNone' => 'None', // Added 2013.08.16.
'FnMonitor' => 'Monitor', // Added 2013.08.16.
'FnModect' => 'Modect', // Added 2013.08.16.
'FnRecord' => 'Record', // Added 2013.08.16.
'FnMocord' => 'Mocord', // Added 2013.08.16.
'FnNodect' => 'Nodect', // Added 2013.08.16.
'FnNone' => 'None', // Added 2013.08.16.
'FnMonitor' => 'Monitor', // Added 2013.08.16.
'FnModect' => 'Modect', // Added 2013.08.16.
'FnRecord' => 'Record', // Added 2013.08.16.
'FnMocord' => 'Mocord', // Added 2013.08.16.
'FnNodect' => 'Nodect', // Added 2013.08.16.
'Focus' => 'Focus',
'ForceAlarm' => 'Forceeer alarm',
'Format' => 'Formaat',
@ -332,7 +332,7 @@ $SLANG = array(
'FrameId' => 'Frame id',
'FrameRate' => 'Frame rate',
'FrameSkip' => 'Frame overgeslagen',
'MotionFrameSkip' => 'Motion Frame Skip',
'MotionFrameSkip' => 'Motion Frame Skip',
'Frames' => 'Frames',
'Func' => 'Func',
'Function' => 'Functie',
@ -376,6 +376,7 @@ $SLANG = array(
'Last' => 'Laatste',
'Layout' => 'Layout', // Added - 2009-02-08
'Level' => 'Nivo', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'resultaten;', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'beperk tot eerste', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Lijn', // Added - 2011-06-16
@ -469,11 +470,11 @@ $SLANG = array(
'Month' => 'Maand',
'More' => 'Meer', // Added - 2011-06-16
'Move' => 'Verplaats',
'MtgDefault' => 'Default', // Added 2013.08.15.
'Mtg2widgrd' => '2-wide grid', // Added 2013.08.15.
'Mtg3widgrd' => '3-wide grid', // Added 2013.08.15.
'Mtg4widgrd' => '4-wide grid', // Added 2013.08.15.
'Mtg3widgrx' => '3-wide grid, scaled, enlarge on alarm', // Added 2013.08.15.
'MtgDefault' => 'Default', // Added 2013.08.15.
'Mtg2widgrd' => '2-wide grid', // Added 2013.08.15.
'Mtg3widgrd' => '3-wide grid', // Added 2013.08.15.
'Mtg4widgrd' => '4-wide grid', // Added 2013.08.15.
'Mtg3widgrx' => '3-wide grid, scaled, enlarge on alarm', // Added 2013.08.15.
'MustBeGe' => 'Moet groter zijn of gelijk aan',
'MustBeLe' => 'Moet kleiner zijn of gelijk aan',
'MustConfirmPassword' => 'Je moet je wachtwoord bevestigen',
@ -641,10 +642,10 @@ $SLANG = array(
'TimeDelta' => 'Tijd Delta',
'TimeStamp' => 'Tijdstempel',
'Timeline' => 'Tijdslijn',
'TimelineTip1' => 'Pass your mouse over the graph to view a snapshot image and event details.', // Added 2013.08.15.
'TimelineTip2' => 'Click on the coloured sections of the graph, or the image, to view the event.', // Added 2013.08.15.
'TimelineTip3' => 'Click on the background to zoom in to a smaller time period based around your click.', // Added 2013.08.15.
'TimelineTip4' => 'Use the controls below to zoom out or navigate back and forward through the time range.', // Added 2013.08.15.
'TimelineTip1' => 'Pass your mouse over the graph to view a snapshot image and event details.', // Added 2013.08.15.
'TimelineTip2' => 'Click on the coloured sections of the graph, or the image, to view the event.', // Added 2013.08.15.
'TimelineTip3' => 'Click on the background to zoom in to a smaller time period based around your click.', // Added 2013.08.15.
'TimelineTip4' => 'Use the controls below to zoom out or navigate back and forward through the time range.', // Added 2013.08.15.
'Timestamp' => 'Tijdstempel',
'TimestampLabelFormat' => 'Tijdstempel Label Format',
'TimestampLabelX' => 'Tijdstempel Label X',
@ -853,6 +854,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

15
web/lang/pl_pl.php
View File

@ -379,6 +379,7 @@ $SLANG = array(
'Last' => 'Ostatni',
'Layout' => 'Layout', // Added - 2009-02-08
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'wyników;', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Ogranicz do pocz±tkowych', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16
@ -838,6 +839,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

15
web/lang/pt_br.php
View File

@ -319,6 +319,7 @@ $SLANG = array(
'Last' => 'Último',
'Layout' => 'Layout', // Added - 2009-02-08
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'resultados somente;', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Limitar aos primeiros', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16
@ -799,6 +800,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

17
web/lang/ro_ro.php Executable file → Normal file
View File

@ -350,6 +350,7 @@ $SLANG = array(
'Last' => 'Ultim',
'Layout' => 'Layout', // Added - 2009-02-08
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'rezultate',
'LimitResultsPre' => 'Limiteaz&#259; la primele',
'Line' => 'Line', // Added - 2011-06-16
@ -1296,6 +1297,22 @@ $OLANG = array(
'Prompt' => "C&#226;t de des (&#238;n secunde) se vor schimba imaginile &#238;n ciclul de monitorizare.",
'Help' => "Ciclul de monitorizare este metoda de schimbare continu&#259; a imaginilor monitoarelor. Aceast&#259; op&#355;iune determin&#259; c&#226;t de des va fi actulizat cu o nou&#259; imagine."
),
// Options on Monitor view
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// End of Phone Bandwidth tab
//
);

15
web/lang/ru_ru.php
View File

@ -379,6 +379,7 @@ $SLANG = array(
'Last' => 'ðÏÓÌÅÄÎÉÊ',
'Layout' => 'Layout', // Added - 2009-02-08
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'results only;', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Limit to first', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16
@ -858,6 +859,20 @@ function zmVlang( $langVarArray, $count )
// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
// So for example, to override the help text for ZM_LANG_DEFAULT do
$OLANG = array(
'OPTIONS_FFMPEG' => array(
'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"rtsp_transport=tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"rtsp_transport=http\" Use http tunneling for the data stream from the camera~~~~".
"\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
),
'OPTIONS_LIBVLC' => array(
'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
"Examples (do not enter quotes)~~~~".
"\"--rtsp-tcp\" Use TCP instead of UDP for the data stream from the camera~~~~".
"\"--verbose=2\" Set verbosity of libVLC"
),
// 'LANG_DEFAULT' => array(
// 'Prompt' => "This is a new prompt for this option",
// 'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"

1
web/lang/se_se.php
View File

@ -380,6 +380,7 @@ $SLANG = array(
'Last' => 'Sist',
'Layout' => 'Layout', // Added - 2009-02-08
'Level' => 'Level', // Added - 2011-06-16
'Libvlc' => 'Libvlc',
'LimitResultsPost' => 'resultaten;', // This is used at the end of the phrase 'Limit to first N results only'
'LimitResultsPre' => 'Begränsa till första', // This is used at the beginning of the phrase 'Limit to first N results only'
'Line' => 'Line', // Added - 2011-06-16

2
web/skins/classic/views/monitor.php
View File

@ -747,7 +747,7 @@ switch ( $tab )
{
?>
<tr><td><?= $SLANG['SourcePath'] ?></td><td><input type="text" name="newMonitor[Path]" value="<?= validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
<tr><td><?= "Options" ?></td><td><input type="text" name="newMonitor[Options]" value="<?= validHtmlStr($newMonitor['Options']) ?>" size="36"/></td></tr>
<tr><td><?= $SLANG['Options'] ?>&nbsp;(<?= makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($newMonitor['Type']), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" name="newMonitor[Options]" value="<?= validHtmlStr($newMonitor['Options']) ?>" size="36"/></td></tr>
<?php
}
?>

2
web/skins/classic/views/optionhelp.php
View File

@ -19,7 +19,7 @@
//
$optionHelpIndex = preg_replace( '/^ZM_/', '', $_REQUEST['option'] );
$optionHelpText = !empty($OLANG[$optionHelpIndex])?$OLANG[$optionHelpIndex]:$config[$_REQUEST['option']]['Help'];
$optionHelpText = !empty($OLANG[$optionHelpIndex])?$OLANG[$optionHelpIndex]['Help']:$config[$_REQUEST['option']]['Help'];
$optionHelpText = validHtmlStr($optionHelpText);
$optionHelpText = preg_replace( "/~~/", "<br/>", $optionHelpText );

4
web/skins/classic/views/options.php
View File

@ -85,7 +85,7 @@ foreach ( $tabs as $name=>$value )
if($tab == 'skins') {
$current_skin = $_COOKIE['zmSkin'];
if (isset($_GET['skin-choice'])) {
setcookie('zmSkin',$_GET['skin-choice']);
setcookie('zmSkin',$_GET['skin-choice'], time()+3600*24*30*12*10 );
//header("Location: index.php?view=options&tab=skins&reset_parent=1");
echo "<script type=\"text/javascript\">window.opener.location.reload();window.location.href=\"{$_SERVER['PHP_SELF']}?view={$view}&tab={$tab}\"</script>";
}
@ -210,7 +210,7 @@ else
foreach ( $configCat as $name=>$value )
{
$shortName = preg_replace( '/^ZM_/', '', $name );
$optionPromptText = !empty($OLANG[$shortName])?$OLANG[$shortName]:$value['Prompt'];
$optionPromptText = !empty($OLANG[$shortName])?$OLANG[$shortName]['Prompt']:$value['Prompt'];
?>
<tr>
<td><?= $shortName ?></td>

2
web/skins/flat/views/monitor.php
View File

@ -748,7 +748,7 @@ switch ( $tab )
{
?>
<tr><td><?= $SLANG['SourcePath'] ?></td><td><input type="text" name="newMonitor[Path]" value="<?= validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
<tr><td><?= "Options" ?></td><td><input type="text" name="newMonitor[Options]" value="<?= validHtmlStr($newMonitor['Options']) ?>" size="36"/></td></tr>
<tr><td><?= $SLANG['Options'] ?></td><td><input type="text" name="newMonitor[Options]" value="<?= validHtmlStr($newMonitor['Options']) ?>" size="36"/></td></tr>
<?php
}
?>

2
web/skins/flat/views/optionhelp.php
View File

@ -19,7 +19,7 @@
//
$optionHelpIndex = preg_replace( '/^ZM_/', '', $_REQUEST['option'] );
$optionHelpText = !empty($OLANG[$optionHelpIndex])?$OLANG[$optionHelpIndex]:$config[$_REQUEST['option']]['Help'];
$optionHelpText = !empty($OLANG[$optionHelpIndex])?$OLANG[$optionHelpIndex]['Help']:$config[$_REQUEST['option']]['Help'];
$optionHelpText = validHtmlStr($optionHelpText);
$optionHelpText = preg_replace( "/~~/", "<br/>", $optionHelpText );

4
web/skins/flat/views/options.php
View File

@ -85,7 +85,7 @@ foreach ( $tabs as $name=>$value )
if($tab == 'skins') {
$current_skin = $_COOKIE['zmSkin'];
if (isset($_GET['skin-choice'])) {
setcookie('zmSkin',$_GET['skin-choice']);
setcookie('zmSkin',$_GET['skin-choice'], time()+3600*24*30*12*10 );
//header("Location: index.php?view=options&tab=skins&reset_parent=1");
echo "<script type=\"text/javascript\">window.opener.location.reload();window.location.href=\"{$_SERVER['PHP_SELF']}?view={$view}&tab={$tab}\"</script>";
}
@ -210,7 +210,7 @@ else
foreach ( $configCat as $name=>$value )
{
$shortName = preg_replace( '/^ZM_/', '', $name );
$optionPromptText = !empty($OLANG[$shortName])?$OLANG[$shortName]:$value['Prompt'];
$optionPromptText = !empty($OLANG[$shortName])?$OLANG[$shortName]['Prompt']:$value['Prompt'];
?>
<tr>
<td><?= $shortName ?></td>