zoneminder/web/lang
SteveGilvarry 4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
	configure.ac
	src/Makefile.am
	web/js/Makefile.am
2016-04-05 22:06:14 +10:00
..
big5_big5.php Fix spelling in ffmpeg options help: s/verbosiy/verbosity/ 2016-03-20 16:13:53 +00:00
cn_zh.php Fix spelling in ffmpeg options help: s/verbosiy/verbosity/ 2016-03-20 16:13:53 +00:00
cs_cz.php Fix spelling in ffmpeg options help: s/verbosiy/verbosity/ 2016-03-20 16:13:53 +00:00
de_de.php Merge pull request #1360 from schrorg/monitornames-spaces 2016-03-30 09:17:57 -04:00
dk_dk.php Merge pull request #1360 from schrorg/monitornames-spaces 2016-03-30 09:17:57 -04:00
en_gb.php Merge branch 'master' into feature-h264-videostorage 2016-04-01 08:53:45 -04:00
en_us.php Migrate svn to git 2013-03-17 00:45:21 +01:00
es_ar.php Fix spelling in ffmpeg options help: s/verbosiy/verbosity/ 2016-03-20 16:13:53 +00:00
es_es.php Merge pull request #1360 from schrorg/monitornames-spaces 2016-03-30 09:17:57 -04:00
et_ee.php Fix spelling in ffmpeg options help: s/verbosiy/verbosity/ 2016-03-20 16:13:53 +00:00
fr_fr.php Merge pull request #1360 from schrorg/monitornames-spaces 2016-03-30 09:17:57 -04:00
he_il.php Merge pull request #1360 from schrorg/monitornames-spaces 2016-03-30 09:17:57 -04:00
hu_hu.php Fix spelling in ffmpeg options help: s/verbosiy/verbosity/ 2016-03-20 16:13:53 +00:00
it_it.php Fix spelling in ffmpeg options help: s/verbosiy/verbosity/ 2016-03-20 16:13:53 +00:00
ja_jp.php Merge pull request #1360 from schrorg/monitornames-spaces 2016-03-30 09:17:57 -04:00
nl_nl.php Merge pull request #1360 from schrorg/monitornames-spaces 2016-03-30 09:17:57 -04:00
pl_pl.php Fix spelling in ffmpeg options help: s/verbosiy/verbosity/ 2016-03-20 16:13:53 +00:00
pt_br.php Fix spelling in ffmpeg options help: s/verbosiy/verbosity/ 2016-03-20 16:13:53 +00:00
ro_ro.php Fix spelling in ffmpeg options help: s/verbosiy/verbosity/ 2016-03-20 16:13:53 +00:00
ru_ru.php Merge pull request #1360 from schrorg/monitornames-spaces 2016-03-30 09:17:57 -04:00
se_se.php Merge pull request #1360 from schrorg/monitornames-spaces 2016-03-30 09:17:57 -04:00
updateLangs.php Migrate svn to git 2013-03-17 00:45:21 +01:00