Emmanuel Papin
|
676968ed04
|
Add list option for plugins
|
2015-05-14 11:38:38 +02:00 |
|
Emmanuel Papin
|
55d974a0b3
|
Update lang files
|
2015-05-06 20:46:09 +02:00 |
|
Emmanuel Papin
|
5283369ed6
|
Reintroduce modif after upstream merge
|
2015-05-06 01:03:36 +02:00 |
|
Emmanuel Papin
|
630c8f335f
|
Merge master
|
2015-05-05 23:37:20 +02:00 |
|
Emmanuel Papin
|
ac8ace33f8
|
Remove hardcoded localized strings and update lang files
|
2015-04-18 17:14:14 +02:00 |
|
Emmanuel Papin
|
77138c48d2
|
Fix a conflict in php lang files after merge from upstream master
|
2015-01-10 17:55:46 +01:00 |
|
Emmanuel Papin
|
b5ab290e78
|
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support
Conflicts:
web/lang/et_ee.php
|
2015-01-10 17:47:30 +01:00 |
Hannes
|
4508c541ef
|
Update et_ee.php
Fixing Some problems
Parse error: syntax error, unexpected 'Parameters' (T_STRING) in /usr/share/zoneminder/lang/et_ee.php
|
2015-01-06 17:10:58 +02:00 |
|
Emmanuel Papin
|
82ef0edac3
|
Restore conflictuous modifications for plugin support
|
2014-12-13 20:02:58 +01:00 |
|
Emmanuel Papin
|
d961831355
|
Fix conflict when merging upstream master
|
2014-12-13 19:54:54 +01:00 |
|
Hannes
|
e60919f19a
|
Update et_ee.php
Translating some code comments.
|
2014-11-27 03:51:40 +02:00 |
|
Hannes
|
92b65c553e
|
Update et_ee.php
Changing back charset-utf-8.
|
2014-11-27 03:43:59 +02:00 |
|
hanzese
|
993a186d06
|
Update et_ee.php
ZoneMinder Estonian Translation by Hannes
|
2014-11-19 10:25:35 +02:00 |
|
hanzese
|
db86ac7b40
|
Update et_ee.php
ZoneMinder Estonian Translation by Hannes
|
2014-11-17 18:06:37 +02:00 |
|
hanzese
|
79ca3dd736
|
Update et_ee.php
ZoneMinder Estonian Translation
|
2014-11-17 02:53:50 +02:00 |
|
manupap1
|
cee8b77bec
|
Add plugin translations in language files
|
2014-11-12 10:20:18 +01: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 |