zoneminder/web/lang
SteveGilvarry 20c295ad0c Merge remote-tracking branch 'upstream/master' into feature-plugins
Conflicts:
	.travis.yml
	CMakeLists.txt
	Makefile.am
	bootstrap.sh
	configure.ac
	distros/debian8/control
	distros/debian_cmake/control
	misc/Makefile.am
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	src/CMakeLists.txt
	src/Makefile.am
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zmstreamer.cpp
	web/lang/ru_ru.php
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
2016-04-07 00:00:38 +10:00
..
big5_big5.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
cn_zh.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
cs_cz.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
de_de.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
dk_dk.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
en_gb.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
en_us.php Migrate svn to git 2013-03-17 00:45:21 +01:00
es_ar.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
es_es.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
et_ee.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
fr_fr.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
he_il.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
hu_hu.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
it_it.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
ja_jp.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
nl_nl.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
pl_pl.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
pt_br.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
ro_ro.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
ru_ru.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
se_se.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
updateLangs.php Migrate svn to git 2013-03-17 00:45:21 +01:00