3ce620eb89
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-27 19:46:56 +11:00
1c142a48a6
Merge pull request #1212 from RBxx/patch-1
...
Convert ru_ru.php to UTF-8
2016-02-04 10:16:24 -06:00
7301e803ed
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2016-01-30 15:45:08 +11:00
d48ec1cfbe
Add AddNewServer and Hostname entries
2016-01-08 10:15:41 -05:00
0ccce76ef8
Convert ru_ru.php to UTF-8
...
In koi8-r encoding, some menu items are not displayed in the web interface. With UTF-8 encoding all displayed correctly.
2015-12-31 16:58:56 +03:00
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
6f5c70dd5d
Add Attr lines for ServerId and ServerName
2015-12-21 10:10:11 -05:00
e28e3c2b75
Merge branch 'master' into feature-h264-videostorage
2015-12-20 14:13:30 +11:00
e5f243a9f8
Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps
2015-12-19 08:16:20 -06:00
d8494aba2d
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
23b549a471
recaptcha fixes to avoid lockout
2015-09-24 15:44:35 -04:00
a995d72ebd
add warning and help text for maxfps fields
2015-08-22 12:36:49 -05:00
2fbf79674b
Add RTSP Describe checkbox to web console
2015-08-21 10:32:50 -05:00
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
68adcc9e67
Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 14:07:38 -05:00
c17de4a00f
add Exif checkbox to monitor
2015-08-16 17:56:03 -05:00
3368d4f474
Removed untranslated "Font size" from language files, corrected white
...
space and make font size a const int
2015-08-10 15:35:19 +02:00
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
f09a551d6a
Merge branch 'master' into feature-h264-videostorage
2015-07-28 21:06:52 +10:00
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02:00
a9df82256b
Change encoding of web/lang/de_de.php from ISO-8859-1 to UTF-8
2015-07-17 14:24:46 +02:00
b6af731400
Add translate options for h264 Storage options in Monitor and update en_gb file
2015-06-10 23:41:17 +10:00
f3a8217651
resolve conflicts from merge by seebaer1976
2015-06-05 19:34:52 +02:00
4cf1e61197
Update de_de.php
2015-05-31 17:43:21 +02:00
ba980ae4ae
update german translation
2015-05-27 15:38:47 +02:00
0e7fa89dd1
Fix: typo in options_libvlc
...
Fixed typo in the OPTIONS_LIBVLC help.
2015-04-22 15:26:33 +03:00
e92fb40c84
Set date and time format in french lang file
2015-04-18 19:08:03 +02:00
955237d6ac
Translate new strings in french file
2015-04-18 17:51:08 +02:00
ac8ace33f8
Remove hardcoded localized strings and update lang files
2015-04-18 17:14:14 +02:00
5d0d5dadc7
Fix translations after first review
2015-04-17 22:58:51 +02:00
1674675da4
Translation of a bunch of english text
2015-04-16 22:32:47 +02:00
750420d42f
Update de_de.php
2015-04-05 09:52:34 +02:00
35ba2a2107
Update de_de.php
2015-04-05 09:03:41 +02:00
2522537184
Update de_de.php
2015-04-04 22:38:12 +02:00
4aa9b0e802
Update de_de.php
2015-04-04 18:03:25 +02:00
da48b0ea4a
Update de_de.php
2015-04-04 09:21:43 +02:00
5c35bc5acb
Update de_de.php
2015-04-03 21:04:24 +02:00
2a3fdf3695
Update de_de.php
2015-04-03 19:12:15 +02:00
039cf09da9
Fix bad translations (first checking before tests)
2015-03-30 21:16:33 +02:00
c0b41ed6a8
Readd translations from Jypy
2015-03-30 20:50:42 +02:00
ca041a3ce5
Revert "Update fr_fr.php"
...
This reverts commit 3b9c3f0776
2015-03-30 20:06:59 +02:00
20107ac1e6
remove NETPBM dependency from autotools
2015-03-01 10:51:04 -06:00
3b9c3f0776
Update fr_fr.php
2015-02-20 12:30:33 +01:00
9f3ff787d1
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
2015-02-18 18:53:47 -06:00
2b53e439b9
Add Capture Resolution to replace Capture Width and Capture Height
2015-02-11 13:14:51 -05:00
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
d7e08559d6
Merge pull request #582 from hanzese/patch-1
...
Update et_ee.php
2014-12-01 15:34:53 -05:00
e60919f19a
Update et_ee.php
...
Translating some code comments.
2014-11-27 03:51:40 +02:00
SteveGilvarry
Andrew Bauer
Isaac Connor
RBxx
Isaac Connor
SteveGilvarry
Pliable Pixels
Andrew Bauer
Robin Daermann
Emmanuel Papin
Sebastian Kaminski
seebaer1976
Lihis
Jean-Philippe Bouillot
Hannes
Isaac Connor