Commit Graph

27 Commits

Author SHA1 Message Date
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 e92fb40c84 Set date and time format in french lang file 2015-04-18 19:08:03 +02:00
Emmanuel Papin 955237d6ac Translate new strings in french file 2015-04-18 17:51:08 +02:00
Emmanuel Papin ac8ace33f8 Remove hardcoded localized strings and update lang files 2015-04-18 17:14:14 +02:00
Emmanuel Papin 5d0d5dadc7 Fix translations after first review 2015-04-17 22:58:51 +02:00
Emmanuel Papin 1674675da4 Translation of a bunch of english text 2015-04-16 22:32:47 +02:00
Emmanuel Papin 039cf09da9 Fix bad translations (first checking before tests) 2015-03-30 21:16:33 +02:00
Emmanuel Papin c0b41ed6a8 Readd translations from Jypy 2015-03-30 20:50:42 +02:00
Emmanuel Papin ca041a3ce5 Revert "Update fr_fr.php"
This reverts commit 3b9c3f0776.
2015-03-30 20:06:59 +02:00
Emmanuel Papin 9929233e75 Merge branch 'master' into plugin_support_test
Conflicts:
	configure.ac
	web/lang/fr_fr.php
2015-02-25 23:14:25 +01:00
Jean-Philippe Bouillot 3b9c3f0776 Update fr_fr.php 2015-02-20 12:30:33 +01:00
Emmanuel Papin 491df7671d Fix a typo error in a variable name 2015-01-04 14:01:01 +01:00
Emmanuel Papin e08c706d3c Fix text encoding in french lang file 2014-12-22 02:45:01 +01:00
Emmanuel Papin a4c01435d7 Fix confict when pulling master 2014-11-29 03:37:06 +01:00
Emmanuel Papin 4e9c3494b8 Convert french lang file to UTF-8 2014-11-20 20:51:49 +01: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