[Pkg-ossec-devel] [pkg-ossec] 09/09: Merge branch 'master' into test

[Jose Antonio Quevedo Muñoz]

This is an automated email from the git hooks/post-receive script.

jaqm-guest pushed a commit to branch master
in repository pkg-ossec.

commit f8268527d6bbc4023a5491d99864a9a19d996f64
Merge: 5139a70 bb658da
Author: Jose Antonio Quevedo <joseantonio.quevedo at gmail.com>
Date:   Sat Mar 1 15:22:44 2014 +0100

    Merge branch 'master' into test
    
    Conflicts:
    	debian/po/templates.pot

 debian/ossec-hids-agent.templates  |  4 ++++
 debian/ossec-hids-local.templates  |  4 ++++
 debian/ossec-hids-server.templates |  4 ++++
 debian/po/templates.pot            | 16 +++++++++++++++-
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --cc debian/po/templates.pot
index cee5a0f,7f3e2cf..10db013
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: ossec-hids\n"
  "Report-Msgid-Bugs-To: ossec-hids at packages.debian.org\n"
- "POT-Creation-Date: 2014-03-01 13:27+0100\n"
 -"POT-Creation-Date: 2014-03-01 12:12+0100\n"
++"POT-Creation-Date: 2014-03-01 15:21+0100\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
  "Language-Team: LANGUAGE <LL at li.org>\n"
@@@ -74,8 -75,16 +74,22 @@@ msgstr "
  msgid "We'd like to know if you want Ossec to log notifications to syslog."
  msgstr ""
  
+ #. Type: boolean
+ #. Description
+ #: ../ossec-hids-local.templates:5001 ../ossec-hids-agent.templates:5001
+ #: ../ossec-hids-server.templates:5001
+ msgid "Do you want to run Ossec within a chroot environment?"
+ msgstr ""
+ 
+ #. Type: boolean
+ #. Description
+ #: ../ossec-hids-local.templates:5001 ../ossec-hids-agent.templates:5001
+ #: ../ossec-hids-server.templates:5001
+ msgid "We'd like to know if you want to run Ossec within a chroot environment."
+ msgstr ""
++
 +#. Type: string
 +#. Description
 +#: ../ossec-hids-agent.templates:2001 ../ossec-hids-server.templates:2001
 +msgid "Where would you like to receive the emails from Ossec?"
 +msgstr ""

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ossec/pkg-ossec.git