ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

This commit is contained in:
Isaac Connor 2016-03-30 10:56:32 -04:00
parent b81395843c 247cb3d0b2
commit e9ed046361
13 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
onvif/scripts/zmonvif-probe.pl
View File

@ -106,7 +106,7 @@ sub interpret_messages
my $result = deserialize_message($svc_discover, $response);
if(not $result) {
if($verbose) {
print "Error deserializing message:\n" . $result . "\n";
print "Error deserializing message. No message returned from deserializer.\n";
}
next;
}

2
web/lang/de_de.php
View File

@ -146,7 +146,7 @@ $SLANG = array(
'BadLabelY' => 'Die y-Koordinate der Bezeichnung muss ganzzahlig 0 oder größer sein',
'BadMaxFPS' => 'Maximum-FPS muss eine positive Ganzzahl oder eine Gleitkommazahl sein',
'BadMotionFrameSkip' => 'Bewegungsrahmen Skip-Zählung muß eine ganze Zahl von null oder mehr betragen,',
'BadNameChars' => 'Namen dürfen nur aus Buchstaben, Zahlen und Trenn- oder Unterstrichen bestehen',
'BadNameChars' => 'Namen dürfen nur aus Buchstaben, Zahlen, Leerzeichen und Trenn- oder Unterstrichen bestehen',
'BadPalette' => 'Palette muss auf einen gültigen Wert gesetzt sein', // Added - 2009-03-31
'BadPath' => 'Der Pfad muss auf einen gültigen Wert eingestellt sein',
'BadPort' => 'Der Port muss auf eine gültige Zahl eingestellt sein',

2
web/lang/dk_dk.php
View File

@ -145,7 +145,7 @@ $SLANG = array(
'BadLabelY' => 'Label Y co-ordinate must be set to an integer of zero or more',
'BadMaxFPS' => 'Maximum FPS must be a positive integer or floating point value',
'BadMotionFrameSkip' => 'Motion Frame skip count must be an integer of zero or more',
'BadNameChars' => 'Navne må kun indeholde alphanumeric karaktere plus hyphen og underscore',
'BadNameChars' => 'Navne må kun indeholde alphanumeric karaktere, rum plus hyphen og underscore',
'BadPalette' => 'Palette must be set to a valid value', // Added - 2009-03-31
'BadPath' => 'Path must be set to a valid value',
'BadPort' => 'Port must be set to a valid number',

2
web/lang/en_gb.php
View File

@ -156,7 +156,7 @@ $SLANG = array(
'BadLabelX' => 'Label X co-ordinate must be set to an integer of zero or more',
'BadLabelY' => 'Label Y co-ordinate must be set to an integer of zero or more',
'BadMaxFPS' => 'Maximum FPS must be a positive integer or floating point value',
'BadNameChars' => 'Names may only contain alphanumeric characters plus hyphen and underscore',
'BadNameChars' => 'Names may only contain alphanumeric characters plus spaces, hyphen and underscore',
'BadPalette' => 'Palette must be set to a valid value',
'BadColours' => 'Target colour must be set to a valid value',
'BadPath' => 'Path must be set to a valid value',

2
web/lang/es_es.php
View File

@ -144,7 +144,7 @@ $SLANG = array(
'BadLabelY' => 'La coordenada de la etiqueta Y debe ser un entero de cero o más',
'BadMaxFPS' => 'MPS máximos debe tener un valor entero positivo o de punto flotante',
'BadMotionFrameSkip' => 'Motion Frame skip count must be an integer of zero or more',
'BadNameChars' => 'Los nombre sólo pueden contener carácteres alfanuméricos además de guiones y guiones bajos',
'BadNameChars' => 'Los nombre sólo pueden contener carácteres alfanuméricos, espacios además de guiones y guiones bajos',
'BadPalette' => 'La paleta debe tener un valor válido',
'BadPath' => 'La ruta debe tener un valo válido',
'BadPort' => 'El puerto debe ser un número válido',

2
web/lang/fr_fr.php
View File

@ -150,7 +150,7 @@ $SLANG = array(
'BadLabelY' => 'La coordonnée Y pour l\'horodatage doit être un entier supérieur ou égal à 0',
'BadMaxFPS' => 'Le nombre maximum d\'i/s doit être un entier ou un nombre à virgule flottante supérieur à 0',
'BadMotionFrameSkip' => 'Le nombre d\'images à sauter en cas de détection doit être un entier supérieur ou égal à 0',
'BadNameChars' => 'Les noms ne peuvent contenir que des lettres, chiffres, trait d\'union ou souligné',
'BadNameChars' => 'Les noms ne peuvent contenir que des lettres, chiffres, les espaces, trait d\'union ou souligné',
'BadPalette' => 'La palette doit être définie', // Added - 2009-03-31
'BadPath' => 'Le chemin doit être défini',
'BadPort' => 'Le port doit être un nombre entier supérieur ou égal à 0',

2
web/lang/he_il.php
View File

@ -144,7 +144,7 @@ $SLANG = array(
'BadLabelY' => 'Label Y co-ordinate must be set to an integer of zero or more',
'BadMaxFPS' => 'Maximum FPS must be a positive integer or floating point value',
'BadMotionFrameSkip' => 'Motion Frame skip count must be an integer of zero or more',
'BadNameChars' => 'Names may only contain alphanumeric characters plus hyphen and underscore',
'BadNameChars' => 'Names may only contain alphanumeric characters, spaces plus hyphen and underscore',
'BadPalette' => 'Palette must be set to a valid value', // Added - 2009-03-31
'BadPath' => 'Path must be set to a valid value',
'BadPort' => 'Port must be set to a valid number',

2
web/lang/ja_jp.php
View File

@ -144,7 +144,7 @@ $SLANG = array(
'BadLabelY' => 'Label Y co-ordinate must be set to an integer of zero or more',
'BadMaxFPS' => 'Maximum FPS must be a positive integer or floating point value',
'BadMotionFrameSkip' => 'Motion Frame skip count must be an integer of zero or more',
'BadNameChars' => 'Names may only contain alphanumeric characters plus hyphen and underscore',
'BadNameChars' => 'Names may only contain alphanumeric characters, spaces plus hyphen and underscore',
'BadPalette' => 'Palette must be set to a valid value', // Added - 2009-03-31
'BadPath' => 'Path must be set to a valid value',
'BadPort' => 'Port must be set to a valid number',

2
web/lang/nl_nl.php
View File

@ -144,7 +144,7 @@ $SLANG = array(
'BadLabelY' => 'Label Y co-ordinate moet een nummer nul of groter zijn',
'BadMaxFPS' => 'Maximum FPS moet een positieve integer of floating point waarde zijn',
'BadMotionFrameSkip' => 'Motion Frame skip count must be an integer of zero or more',
'BadNameChars' => 'Namen mogen alleen alpha numerieke karakters bevatten plus hyphens en underscores',
'BadNameChars' => 'Namen mogen alleen alpha numerieke karakters, ruimten bevatten plus hyphens en underscores',
'BadPalette' => 'Palette moet een geldige waarde zijn', // Added - 2009-03-31
'BadPath' => 'Pad moet een geldige waarde zijn',
'BadPort' => 'Port moet een geldige nummer zijn',

2
web/lang/ru_ru.php
View File

@ -145,7 +145,7 @@ $SLANG = array(
'BadLabelY' => 'Label Y co-ordinate must be set to an integer of zero or more',
'BadMaxFPS' => 'Maximum FPS must be a positive integer or floating point value',
'BadMotionFrameSkip' => 'Motion Frame skip count must be an integer of zero or more',
'BadNameChars' => 'Names may only contain alphanumeric characters plus hyphen and underscore',
'BadNameChars' => 'Names may only contain alphanumeric characters, spaces plus hyphen and underscore',
'BadPalette' => 'Palette must be set to a valid value', // Added - 2009-03-31
'BadPath' => 'Path must be set to a valid value',
'BadPort' => 'Port must be set to a valid number',

2
web/lang/se_se.php
View File

@ -145,7 +145,7 @@ $SLANG = array(
'BadLabelY' => 'Etiketten för Y koordinaten måste sättas till ett heltal, 0 eller högre',
'BadMaxFPS' => 'Max. ramar/s måste vara ett positivt heltal eller ett flyttal',
'BadMotionFrameSkip' => 'Motion Frame skip count must be an integer of zero or more',
'BadNameChars' => 'Namn kan endast innehålla alfanumeriska tecken, bindestreck och understreck',
'BadNameChars' => 'Namn kan endast innehålla alfanumeriska tecken, utrymmen, bindestreck och understreck',
'BadPalette' => 'Palette must be set to a valid value', // Added - 2009-03-31
'BadPath' => 'Sökvägen måste innehålla ett giltigt värde',
'BadPort' => 'Porten måste innehålla ett giltigt nummer',

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

@ -59,7 +59,7 @@ function validateForm( form )
{
var errors = new Array();
if ( form.elements['newMonitor[Name]'].value.search( /[^\w-]/ ) >= 0 )
if ( form.elements['newMonitor[Name]'].value.search( /[^\w- ]/ ) >= 0 )
errors[errors.length] = "<?php echo translate('BadNameChars') ?>";
else if ( form.elements.mid.value == 0 && monitorNames[form.elements['newMonitor[Name]'].value] )
errors[errors.length] = "<?php echo translate('DuplicateMonitorName') ?>";

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

@ -154,6 +154,8 @@ else
$newX10Monitor = $x10Monitor;
}
$newMonitor['Name'] = trim($newMonitor['Name']);
if ( $newMonitor['AnalysisFPS'] == '0.00' )
$newMonitor['AnalysisFPS'] = '';
if ( $newMonitor['MaxFPS'] == '0.00' )