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

..

big5_big5.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

cn_zh.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

cs_cz.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

de_de.php

Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval

2015-08-18 20:20:53 -05:00

dk_dk.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

en_gb.php

Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval

2015-08-18 20:20:53 -05:00

en_us.php

Migrate svn to git

2013-03-17 00:45:21 +01:00

es_ar.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

es_es.php

Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval

2015-08-18 20:20:53 -05:00

et_ee.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

fr_fr.php

Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval

2015-08-18 20:20:53 -05:00

he_il.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

hu_hu.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

it_it.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

ja_jp.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

Makefile.am

Migrate svn to git

2013-03-17 00:45:21 +01:00

nl_nl.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

pl_pl.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

pt_br.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

ro_ro.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

ru_ru.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

se_se.php

Removed untranslated "Font size" from language files, corrected white

2015-08-10 15:35:19 +02:00

updateLangs.php

Migrate svn to git

2013-03-17 00:45:21 +01:00