Merge remote-tracking branch 'origin/patch-4' into patch-5

This commit is contained in:
Simpler1
2023-06-19 11:36:39 -04:00

View File

@@ -843,6 +843,15 @@ $OLANG = array(
Some, mostly older, IP cameras support snapshot mode. In this case ZoneMinder is actively polling the camera
for new images. In this case, it is safe to use the field.
'
),
'OPTIONS_ALARMMAXFPS' => array(
'Help' => '
This field has certain limitations when used for non-local devices.~~
Failure to adhere to these limitations will cause a delay in live video, irregular frame skipping,
and missed events~
This setting allows you to override the Maximum FPS value if this circumstance occurs. As with the Maximum FPS
setting, leaving this blank implies no limit.
'
),
'OPTIONS_LINKED_MONITORS' => array(
'Help' => '