mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2025-12-23 22:37:53 -05:00
Code Issues Packages Projects Releases Wiki Activity
26,364 Commits 39 Branches 101 Tags
master
Commit Graph

42 Commits

Author SHA1 Message Date
IgorA100
23e287062c Замены: 
HighBW => Highband
LowBW => Lowband
MediumBW => Medband
 2025-07-15 10:39:39 +03:00
Isaac Connor
491cc1dfe3 ImageBufferCount can now be as low as 2 2021-01-26 15:37:32 -05:00
Andrew Bauer
031b41f78a remove the english word popup from lang files 2020-10-13 07:59:34 -05:00
Steve Root
0d4651c2d6 Update url to donate page (#2586) 2019-04-23 10:58:28 -04:00
Chris
ad5f6a8729 Camera reboot function (#2554) 
* Adding a button for camera reboot function

This series of commits will add a camera reboot function to the
control interface if supported by the camera configuration.

* Adding reboot function option to contorl configuration

This patch adds a reboot option to the camera control configuration
view.

* Adding Reboot field to Controls table

This patch adds a Reboot field to the Controls table to support
a camera reboot control option.

* Correcting button value to match reset

* Updating language files

I'm not sure of the proper procedure to trigger updating of
non-english language files so I'm updating them all with English
hoping that that will draw attention to the changes and others
will translate accordingly.

* Add missing forward slash
 2019-03-18 14:49:05 -04:00
Isaac Connor
b1fe80a0bd Add JSON/MaybeXS to dependencies, replacing JSON/Any 2018-08-30 18:30:33 -04:00
Isaac Connor
15a6eb7e78 Revert "Add Privacy Statement (#2176)" (#2179) 
This reverts commit 56f4d768c2.
 2018-08-13 15:33:43 -04:00
Andrew Bauer
56f4d768c2 Add Privacy Statement (#2176) 
* initial implementation of privacy popup

* split the privacy text and run it through translate

* change style of toggle button, validate the form

* fix copy/paste error

* fix typos

* display privacy view inline rather than popup

* display privacy inline if show_privacy flag set

* redirect to console after selection is made

* typo

* css formatting

* update privacy verbiage

* push privacy text to all language files
 2018-08-13 15:23:44 -04:00
Andy Bauer
254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
corax
6fab2e97b1 Update German translation of Buffer 2016-09-09 13:32:20 +02:00
corax
430ecd8e32 Fix some too direct translations into German 2016-09-09 11:51:53 +02:00
corax
d017138550 Fix a 'false friend' in German translation 2016-09-09 11:25:12 +02:00
Isaac Connor
247cb3d0b2 Merge pull request #1360 from schrorg/monitornames-spaces 
Allow spaces in monitor names
 2016-03-30 09:17:57 -04:00
Robin Daermann
af68fd20a8 Some Translations for Monitor names with spaces 2016-03-24 14:51:24 +01:00
Jon Burgess
9c98ccbb75 Fix spelling in ffmpeg options help: s/verbosiy/verbosity/ 2016-03-20 16:13:53 +00:00
Jon Burgess
020731a89e Fix typo in ffmpeg options help: s/passwd/passed/ 2016-03-20 16:10:49 +00:00
Andrew Bauer
fe3595bfa1 Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_update-1.28.101.sql
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 20:20:53 -05:00
Robin Daermann
078e18e6c5 Add label size to monitor options (frontend part) 
This commit adds the option "Font size" to monitor options in the
timestamp panel. Includes translations of "Font size" for german
(de_de), french (fr_fr) and spanish (es_es). All other language files
contain the english text.
 2015-08-10 15:35:19 +02:00
Emmanuel Papin
649a39b372 Replace analysis interval parameter by analysis framerate 2015-07-23 16:36:30 -04:00
Emmanuel Papin
132e0a1798 Add analysis fps paramter to monitors 2015-07-22 21:38:35 +02:00
Emmanuel Papin
a6b7c6e99f Add analysis interval parameter to monitors 2015-07-21 22:52:52 +02:00
root
a9df82256b Change encoding of web/lang/de_de.php from ISO-8859-1 to UTF-8 2015-07-17 14:24:46 +02:00
Sebastian Kaminski
f3a8217651 resolve conflicts from merge by seebaer1976 2015-06-05 19:34:52 +02:00
seebaer1976
4cf1e61197 Update de_de.php 2015-05-31 17:43:21 +02:00
Sebastian Kaminski
ba980ae4ae update german translation 2015-05-27 15:38:47 +02:00
Emmanuel Papin
ac8ace33f8 Remove hardcoded localized strings and update lang files 2015-04-18 17:14:14 +02:00
seebaer1976
750420d42f Update de_de.php 2015-04-05 09:52:34 +02:00
seebaer1976
35ba2a2107 Update de_de.php 2015-04-05 09:03:41 +02:00
seebaer1976
2522537184 Update de_de.php 2015-04-04 22:38:12 +02:00
seebaer1976
4aa9b0e802 Update de_de.php 2015-04-04 18:03:25 +02:00
seebaer1976
da48b0ea4a Update de_de.php 2015-04-04 09:21:43 +02:00
seebaer1976
5c35bc5acb Update de_de.php 2015-04-03 21:04:24 +02:00
seebaer1976
2a3fdf3695 Update de_de.php 2015-04-03 19:12:15 +02:00
m-bene
a81b9b8ce2 change examples for options 2014-05-17 21:48:08 +02:00
m-bene
9a71a0068a add help window for ffmpeg/libvlc options 2014-05-17 04:33:33 +02:00
Kfir Itzhak
3cee6a133d Merge remote-tracking branch 'Sune1337/motion/FrameSkip' 
Conflicts:
	db/zm_update-1.27.1.sql
	web/lang/nl_nl.php
 2014-04-22 20:13:11 +03:00
Sune1337
6c637947e2 Ability to skip frames in motion detection. 
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
 2014-04-10 14:59:34 +02:00
m-bene
2784b3d1f5 Merge master 2014-03-20 10:26:12 +01:00
m-bene
26777487dc add feature to extend preclusive zone alarm state by x frames 2014-03-09 17:05:39 +01:00
Andrew Bauer
9a298a2af2 Copy nagyrobi's localization changes from en_gb verbatim to the other language files. 2014-02-26 09:30:57 -06:00
Andrew Bauer
5ac8a5cc99 New localization strings from Nagyrobi copied verbatim from en_gb 2014-02-26 08:38:47 -06:00
nextime
33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00