Add xep definition to mod_mam

Add MAM (XEP-0313) support
Document a few more supported protocols
2015-06-24 11:58:37 +02:00 · 2015-06-22 16:56:08 +03:00 · 2015-06-22 13:11:37 +02:00 · 2015-06-20 00:14:54 +02:00 · 2015-06-19 23:13:36 +02:00 · 2015-06-18 14:59:00 +02:00
487 changed files with 154167 additions and 127687 deletions
@@ -0,0 +1,44 @@
+#
+# You can add personal rules in your file .git/info/exclude
+*.swp
+*~
+\#*#
+.#*
+.edts
+*.dump
+/Makefile
+/config.log
+/config.status
+/configure
+/aclocal.m4
+/contrib/extract_translations/extract_translations.beam
+/*.cache
+/deps/
+/doc/*.aux
+/doc/*.haux
+/doc/*.html
+/doc/*.htoc
+/doc/*.idx
+/doc/*.ilg
+/doc/*.ind
+/doc/*.log
+/doc/*.out
+/doc/*.pdf
+/doc/*.toc
+/doc/contributed_modules.tex
+/doc/version.tex
+/ebin/
+/ejabberd.init
+/ejabberdctl.example
+XmppAddr.hrl
+/rel/ejabberd/
+/src/XmppAddr.asn1db
+/src/XmppAddr.erl
+/src/ejabberd.app.src
+/src/eldap_filter_yecc.erl
+/vars.config
+/dialyzer/
+/test/*.beam
+/logs/
+/priv/sql
+mix.exs
@@ -0,0 +1,38 @@
+language: erlang
+
+otp_release:
+  - 17.4
+  - R16B03
+
+services:
+  - riak
+
+before_install:
+  - sudo apt-get -qq update
+
+install:
+  - sudo apt-get -qq install libexpat1-dev libyaml-dev libpam0g-dev libsqlite3-dev
+
+before_script:
+  - mysql -u root -e "CREATE USER 'ejabberd_test'@'localhost' IDENTIFIED BY 'ejabberd_test';"
+  - mysql -u root -e "CREATE DATABASE ejabberd_test;"
+  - mysql -u root -e "GRANT ALL ON ejabberd_test.* TO 'ejabberd_test'@'localhost';"
+  - psql -U postgres -c "CREATE USER ejabberd_test WITH PASSWORD 'ejabberd_test';"
+  - psql -U postgres -c "CREATE DATABASE ejabberd_test;"
+  - psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE ejabberd_test TO ejabberd_test;"
+
+script:
+  - ./autogen.sh
+  - ./configure --enable-all --disable-odbc --disable-elixir
+  - make xref
+  - ERL_LIBS=$PWD make test
+  - grep -q 'TEST COMPLETE, \([[:digit:]]*\) ok, .* of \1 ' logs/raw.log
+
+after_script:
+  - find logs -name suite.log -exec cat '{}' ';'
+
+after_failure:
+  - find logs -name ejabberd.log -exec cat '{}' ';'
+
+notifications:
+  email: false
@@ -4,8 +4,8 @@ with the OpenSSL library and distribute the resulting binary.
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -306,9 +306,9 @@ the "copyright" line and a pointer to where the full notice is found.
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.


 Also add information on how to contact you by electronic and paper mail.
@@ -0,0 +1,320 @@
+REBAR = @ESCRIPT@ rebar
+INSTALL = @INSTALL@
+SED = @SED@
+ERL = @ERL@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+DESTDIR =
+
+# /etc/ejabberd/
+ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
+
+# /bin/
+BINDIR = $(DESTDIR)@bindir@
+
+# /sbin/
+SBINDIR = $(DESTDIR)@sbindir@
+
+# /lib/ejabberd/
+EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
+
+# /share/doc/ejabberd
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+datarootdir = @datarootdir@
+DOCDIR = $(DESTDIR)@docdir@
+
+# /usr/lib/ejabberd/ebin/
+BEAMDIR = $(EJABBERDDIR)/ebin
+
+# /usr/lib/ejabberd/include/
+INCLUDEDIR = $(EJABBERDDIR)/include
+
+# /usr/lib/ejabberd/priv/
+PRIVDIR = $(EJABBERDDIR)/priv
+
+# /usr/lib/ejabberd/priv/bin
+PBINDIR = $(PRIVDIR)/bin
+
+# /usr/lib/ejabberd/priv/lib
+SODIR = $(PRIVDIR)/lib
+
+# /usr/lib/ejabberd/priv/msgs
+MSGSDIR = $(PRIVDIR)/msgs
+
+# /usr/lib/ejabberd/priv/sql
+SQLDIR = $(PRIVDIR)/sql
+
+# /var/lib/ejabberd/
+SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
+
+# /var/lock/ejabberdctl
+CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
+
+# /var/lib/ejabberd/.erlang.cookie
+COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
+
+# /var/log/ejabberd/
+LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
+
+INSTALLUSER=@INSTALLUSER@
+# if no user was enabled, don't set privileges or ownership
+ifeq ($(INSTALLUSER),)
+  O_USER=
+  G_USER=
+  CHOWN_COMMAND=echo
+  CHOWN_OUTPUT=/dev/null
+  INIT_USER=root
+else
+  O_USER=-o $(INSTALLUSER)
+  G_USER=-g $(INSTALLUSER)
+  CHOWN_COMMAND=chown
+  CHOWN_OUTPUT=&1
+  INIT_USER=$(INSTALLUSER)
+endif
+
+all: deps src
+
+deps: deps/.got
+
+deps/.got:
+	rm -rf deps/.got
+	rm -rf deps/.built
+	$(REBAR) get-deps && :> deps/.got
+
+deps/.built: deps/.got
+	$(REBAR) compile && :> deps/.built
+
+src: deps/.built
+	$(REBAR) skip_deps=true compile
+
+update:
+	rm -rf deps/.got
+	rm -rf deps/.built
+	$(REBAR) update-deps && :> deps/.got
+
+xref: all
+	$(REBAR) skip_deps=true xref
+
+
+translations:
+	contrib/extract_translations/prepare-translation.sh -updateall
+
+edoc:
+	$(ERL) -noinput +B -eval \
+        'case edoc:application(ejabberd, ".", []) of ok -> halt(0); error -> halt(1) end.'
+
+spec:
+	$(ERL) -noinput +B -pa ebin -pa deps/*/ebin -eval \
+	'case xml_gen:compile("tools/xmpp_codec.spec") of ok -> halt(0); _ -> halt(1) end.'
+
+DLLs := $(wildcard deps/*/priv/*.so) $(wildcard deps/*/priv/lib/*.so)
+
+install: all
+	#
+	# Configuration files
+	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
+	[ -f $(ETCDIR)/ejabberd.yml ] \
+		&& $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml-new \
+		|| $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml
+	$(SED) -e "s*{{rootdir}}*@prefix@*" \
+		-e "s*{{installuser}}*@INSTALLUSER@*" \
+		-e "s*{{bindir}}*@bindir@*" \
+		-e "s*{{libdir}}*@libdir@*" \
+		-e "s*{{sysconfdir}}*@sysconfdir@*" \
+		-e "s*{{localstatedir}}*@localstatedir@*" \
+		-e "s*{{docdir}}*@docdir@*" \
+		-e "s*{{erl}}*@ERL@*" ejabberdctl.template \
+		> ejabberdctl.example
+	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
+		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
+		|| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
+	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
+	#
+	# Administration script
+	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
+	$(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
+	# Elixir binaries
+	[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
+	-[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex
+	-[ -f deps/elixir/bin/elixir ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/elixir $(BINDIR)/elixir
+	-[ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix
+	#
+	# Init script
+	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*" \
+		-e "s*@installuser@*$(INIT_USER)*" ejabberd.init.template \
+		> ejabberd.init
+	chmod 755 ejabberd.init
+	#
+	# Binary Erlang files
+	$(INSTALL) -d $(BEAMDIR)
+	$(INSTALL) -m 644 ebin/*.app $(BEAMDIR)
+	$(INSTALL) -m 644 ebin/*.beam $(BEAMDIR)
+	$(INSTALL) -m 644 deps/*/ebin/*.app $(BEAMDIR)
+	$(INSTALL) -m 644 deps/*/ebin/*.beam $(BEAMDIR)
+	# Install Elixir and Elixir dependancies
+	-$(INSTALL) -m 644 deps/*/lib/*/ebin/*.app $(BEAMDIR)
+	-$(INSTALL) -m 644 deps/*/lib/*/ebin/*.beam $(BEAMDIR)
+	rm -f $(BEAMDIR)/configure.beam
+	#
+	# ejabberd header files
+	$(INSTALL) -d $(INCLUDEDIR)
+	$(INSTALL) -m 644 include/*.hrl $(INCLUDEDIR)
+	$(INSTALL) -m 644 deps/*/include/*.hrl $(INCLUDEDIR)
+	#
+	# Binary C programs
+	$(INSTALL) -d $(PBINDIR)
+	$(INSTALL) -m 750 $(O_USER) tools/captcha.sh $(PBINDIR)
+	$(INSTALL) -m 750 $(O_USER) tools/joincluster $(PBINDIR)
+	$(INSTALL) -m 750 $(O_USER) tools/leavecluster $(PBINDIR)
+	-[ -f deps/p1_pam/priv/bin/epam ] \
+		&& $(INSTALL) -m 750 $(O_USER) deps/p1_pam/priv/bin/epam $(PBINDIR)
+	#
+	# Binary system libraries
+	$(INSTALL) -d $(SODIR)
+	$(INSTALL) -m 644 $(DLLs) $(SODIR)
+	-[ -f $(SODIR)/jiffy.so ] && (cd $(PRIVDIR); ln -s lib/jiffy.so; true)
+	-[ -f $(SODIR)/sqlite3_drv.so ] && (cd $(PRIVDIR); ln -s lib/sqlite3_drv.so; true)
+	#
+	# Translated strings
+	$(INSTALL) -d $(MSGSDIR)
+	$(INSTALL) -m 644 priv/msgs/*.msg $(MSGSDIR)
+	#
+	# Copy lite.sql
+	-[ -d deps/sqlite3 ] && $(INSTALL) -d $(SQLDIR)
+	-[ -d deps/sqlite3 ] && $(INSTALL) -m 644 sql/lite.sql $(SQLDIR)
+	#
+	# Spool directory
+	$(INSTALL) -d -m 750 $(O_USER) $(SPOOLDIR)
+	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(SPOOLDIR) >$(CHOWN_OUTPUT)
+	chmod -R 750 $(SPOOLDIR)
+	[ ! -f $(COOKIEFILE) ] || { $(CHOWN_COMMAND) @INSTALLUSER@ $(COOKIEFILE) >$(CHOWN_OUTPUT) ; chmod 400 $(COOKIEFILE) ; }
+	#
+	# ejabberdctl lock directory
+	$(INSTALL) -d -m 750 $(O_USER) $(CTLLOCKDIR)
+	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(CTLLOCKDIR) >$(CHOWN_OUTPUT)
+	chmod -R 750 $(CTLLOCKDIR)
+	#
+	# Log directory
+	$(INSTALL) -d -m 750 $(O_USER) $(LOGDIR)
+	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(LOGDIR) >$(CHOWN_OUTPUT)
+	chmod -R 750 $(LOGDIR)
+	#
+	# Documentation
+	$(INSTALL) -d $(DOCDIR)
+	[ -f doc/guide.html ] \
+		&& $(INSTALL) -m 644 doc/guide.html $(DOCDIR) \
+		|| echo "Documentation not included in sources"
+	$(INSTALL) -m 644 COPYING $(DOCDIR)
+
+uninstall: uninstall-binary
+
+uninstall-binary:
+	rm -f  $(SBINDIR)/ejabberdctl
+	rm -f  $(BINDIR)/iex
+	rm -f  $(BINDIR)/elixir
+	rm -f  $(BINDIR)/mix
+	rm -fr $(DOCDIR)
+	rm -f  $(BEAMDIR)/*.beam
+	rm -f  $(BEAMDIR)/*.app
+	rm -fr $(BEAMDIR)
+	rm -f  $(INCLUDEDIR)/*.hrl
+	rm -fr $(INCLUDEDIR)
+	rm -fr $(PBINDIR)
+	rm -f  $(SODIR)/*.so
+	rm -fr $(SODIR)
+	rm -f  $(MSGSDIR)/*.msgs
+	rm -fr $(MSGSDIR)
+	rm -f  $(SQLDIR)/*.sql
+	rm -fr $(SQLDIR)
+	rm -fr $(PRIVDIR)
+	rm -fr $(EJABBERDDIR)
+
+uninstall-all: uninstall-binary
+	rm -rf $(ETCDIR)
+	rm -rf $(EJABBERDDIR)
+	rm -rf $(SPOOLDIR)
+	rm -rf $(CTLLOCKDIR)
+	rm -rf $(LOGDIR)
+
+clean:
+	rm -rf deps/.got
+	rm -rf deps/.built
+	rm -rf test/*.beam
+	$(REBAR) clean
+
+clean-rel:
+	rm -rf rel/ejabberd
+
+distclean: clean clean-rel
+	rm -f config.status
+	rm -f config.log
+	rm -rf autom4te.cache
+	rm -rf deps
+	rm -rf ebin
+	rm -f Makefile
+	rm -f vars.config
+	rm -f src/ejabberd.app.src
+	[ ! -f ../ChangeLog ] || rm -f ../ChangeLog
+
+rel: all
+	$(REBAR) generate
+
+TAGS:
+	etags *.erl
+
+Makefile: Makefile.in
+
+deps := $(wildcard deps/*/ebin)
+
+dialyzer/erlang.plt:
+	@mkdir -p dialyzer
+	@dialyzer --build_plt --output_plt dialyzer/erlang.plt \
+	-o dialyzer/erlang.log --apps kernel stdlib sasl crypto \
+	public_key ssl mnesia inets odbc tools compiler erts webtool \
+	runtime_tools asn1 observer xmerl et gs wx syntax_tools; \
+	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
+
+dialyzer/deps.plt:
+	@mkdir -p dialyzer
+	@dialyzer --build_plt --output_plt dialyzer/deps.plt \
+	-o dialyzer/deps.log $(deps); \
+	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
+
+dialyzer/ejabberd.plt:
+	@mkdir -p dialyzer
+	@dialyzer --build_plt --output_plt dialyzer/ejabberd.plt \
+	-o dialyzer/ejabberd.log ebin; \
+	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
+
+erlang_plt: dialyzer/erlang.plt
+	@dialyzer --plt dialyzer/erlang.plt --check_plt -o dialyzer/erlang.log; \
+	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
+
+deps_plt: dialyzer/deps.plt
+	@dialyzer --plt dialyzer/deps.plt --check_plt -o dialyzer/deps.log; \
+	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
+
+ejabberd_plt: dialyzer/ejabberd.plt
+	@dialyzer --plt dialyzer/ejabberd.plt --check_plt -o dialyzer/ejabberd.log; \
+	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
+
+dialyzer: erlang_plt deps_plt ejabberd_plt
+	@dialyzer --plts dialyzer/*.plt --no_check_plt \
+	--get_warnings -o dialyzer/error.log ebin; \
+	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
+
+test:
+	@echo "************************** NOTICE ***************************************"
+	@cat test/README
+	@echo "*************************************************************************"
+	@cd priv && ln -sf ../sql
+	$(REBAR) skip_deps=true ct
+
+quicktest:
+	$(REBAR) skip_deps=true ct suites=elixir
+
+.PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean rel \
+	install uninstall uninstall-binary uninstall-all translations deps test spec \
+	quicktest erlang_plt deps_plt ejabberd_plt
@@ -1,55 +1,168 @@
-ejabberd - High-Performance Enterprise Instant Messaging Server 
+ejabberd Community Edition [![Build Status](https://travis-ci.org/processone/ejabberd.svg?branch=master)](https://travis-ci.org/processone/ejabberd)
+=========================================
+
+ejabberd is a distributed, fault-tolerant technology that allows the creation
+of large-scale instant messaging applications. The server can reliably support
+thousands of simultaneous users on a single node and has been designed to
+provide exceptional standards of fault tolerance. As an open source
+technology, based on industry-standards, ejabberd can be used to build bespoke
+solutions very cost effectively.
+
+
+Key Features
+------------
+
+- **Cross-platform**  
+  ejabberd runs under Microsoft Windows and Unix-derived systems such as
+  Linux, FreeBSD and NetBSD.
+
+- **Distributed**  
+  You can run ejabberd on a cluster of machines and all of them will serve the
+  same XMPP domain(s). When you need more capacity you can simply add a new
+  cheap node to your cluster. Accordingly, you do not need to buy an expensive
+  high-end machine to support tens of thousands concurrent users.
+
+- **Fault-tolerant**  
+  You can deploy an ejabberd cluster so that all the information required for
+  a properly working service will be replicated permanently on all nodes. This
+  means that if one of the nodes crashes, the others will continue working
+  without disruption. In addition, nodes also can be added or replaced ‘on
+  the fly’.
+
+- **Administrator-friendly**  
+  ejabberd is built on top of the Open Source Erlang. As a result you do not
+  need to install an external database, an external web server, amongst others
+  because everything is already included, and ready to run out of the box.
+  Other administrator benefits include:
+  - Comprehensive documentation.
+  - Straightforward installers for Linux and Mac OS X.
+  - Web administration.
+  - Shared roster groups.
+  - Command line administration tool.
+  - Can integrate with existing authentication mechanisms.
+  - Capability to send announce messages.
+
+- **Internationalized**  
+  ejabberd leads in internationalization. Hence it is very well suited in a
+  globalized world. Related features are:
+  - Translated to 25 languages.
+  - Support for IDNA.
+
+- **Open Standards**  
+  ejabberd is the first Open Source Jabber server claiming to fully comply to
+  the XMPP standard.
+  - Fully XMPP-compliant.
+  - XML-based protocol.
+  - Many protocols supported.
+
+
+Additional Features
+-------------------
+
+Moreover, ejabberd comes with a wide range of other state-of-the-art features:
+
+- **Modularity**
+  - Load only the modules you want.
+  - Extend ejabberd with your own custom modules.
+
+- **Security**
+  - SASL and STARTTLS for c2s and s2s connections.
+  - STARTTLS and Dialback s2s connections.
+  - Web Admin accessible via HTTPS secure access.
+
+- **Databases**
+  - Internal database for fast deployment (Mnesia).
+  - Native MySQL support.
+  - Native PostgreSQL support.
+  - ODBC data storage support.
+  - Microsoft SQL Server support.
+
+- **Authentication**
+  - Internal authentication.
+  - PAM, LDAP and ODBC.
+  - External authentication script.
+
+- **Others**
+  - Support for virtual hosting.
+  - Compressing XML streams with Stream Compression (XEP-0138).
+  - Statistics via Statistics Gathering (XEP-0039).
+  - IPv6 support both for c2s and s2s connections.
+  - Multi-User Chat module with support for clustering and HTML logging.
+  - Users Directory based on users vCards.
+  - Publish-Subscribe component with support for Personal Eventing.
+  - Support for web clients: HTTP Polling and HTTP Binding (BOSH).
+  - IRC transport.
+  - Component support: interface with networks such as AIM, ICQ and MSN.
+

 Quickstart guide
+----------------

-
-0. Requirements
+### 0. Requirements

 To compile ejabberd you need:
- - GNU Make
- - GCC
- - Libexpat 1.95 or higher
- - Erlang/OTP R10B-9 or higher. The recommended version is R12B-5.
-   Support for R13 is experimental.
- - OpenSSL 0.9.6 or higher, for STARTTLS, SASL and SSL
-   encryption. Optional, highly recommended.
- - Zlib 1.2.3 or higher, for Stream Compression support
-   (XEP-0138). Optional.
- - Erlang mysql library. Optional. MySQL authentication/storage.
- - Erlang pgsql library. Optional. PostgreSQL authentication/storage.
+
+ - GNU Make.
+ - GCC.
+ - Libexpat 1.95 or higher.
+ - Libyaml 0.1.4 or higher.
+ - Erlang/OTP R16B03 or higher.
+ - OpenSSL 0.9.8 or higher, for STARTTLS, SASL and SSL encryption.
+ - Zlib 1.2.3 or higher, for Stream Compression support (XEP-0138). Optional.
 - PAM library. Optional. For Pluggable Authentication Modules (PAM).
- - GNU Iconv 1.8 or higher, for the IRC Transport
-   (mod_irc). Optional. Not needed on systems with GNU Libc.
- - ImageMagick’s Convert program. Optional. For CAPTCHA challenges.
- - exmpp 0.9.2 or higher. Optional. For import/export XEP-0227 files. 
+ - GNU Iconv 1.8 or higher, for the IRC Transport (mod_irc). Optional. Not
+   needed on systems with GNU Libc.
+ - ImageMagick's Convert program. Optional. For CAPTCHA challenges.


-1. Compile and install on *nix systems
+### 1. Compile and install on *nix systems

-To compile ejabberd, go to the directory src/ and execute the commands:
-  ./configure
-  make
+To compile ejabberd, execute the following commands.  The first one is only
+necessary if your source tree didn't come with a `configure` script.

-To install ejabberd, run this command with system administrator rights
-(root user):
+    ./autogen.sh
+    ./configure
+    make

-  sudo make install
+To install ejabberd, run this command with system administrator rights (root
+user):
+
+    sudo make install

 These commands will:
- - Install the configuration files in /etc/ejabberd/
- - Install ejabberd binary, header and runtime files in /lib/ejabberd/
- - Install the administration script: /sbin/ejabberdctl
- - Install ejabberd documentation in /share/doc/ejabberd/
- - Create a spool directory: /var/lib/ejabberd/
- - Create a directory for log files: /var/log/ejabberd/
+
+- Install the configuration files in `/etc/ejabberd/`
+- Install ejabberd binary, header and runtime files in `/lib/ejabberd/`
+- Install the administration script: `/sbin/ejabberdctl`
+- Install ejabberd documentation in `/share/doc/ejabberd/`
+- Create a spool directory: `/var/lib/ejabberd/`
+- Create a directory for log files: `/var/log/ejabberd/`


-2. Start ejabberd
+### 2. Start ejabberd

-You can use the ejabberdctl command line administration script to
+You can use the `ejabberdctl` command line administration script to
 start and stop ejabberd. For example:
-  ejabberdctl start
+
+    ejabberdctl start


-For detailed information please refer to the
-ejabberd Installation and Operation Guide
+For detailed information please refer to the ejabberd Installation and
+Operation Guide available online and in the `doc` directory of the source
+tarball.
+
+
+Development
+-----------
+
+In order to assist in the development of ejabberd, and particularly the
+execution of the test suite, a Vagrant environment is available at
+https://github.com/processone/ejabberd-vagrant-dev.
+
+
+Links
+-----
+
+- Documentation: http://docs.ejabberd.im
+- Community site: https://www.ejabberd.im
+- ejabberd commercial offering and support: https://www.process-one.net/en/ejabberd
@@ -0,0 +1 @@
+README
@@ -286,6 +286,16 @@ ExtendedResponse ::= [APPLICATION 24] SEQUENCE {
        responseName     [10] LDAPOID OPTIONAL,
        response         [11] OCTET STRING OPTIONAL }

+passwdModifyOID LDAPOID ::= "1.3.6.1.4.1.4203.1.11.1"
+
+PasswdModifyRequestValue ::= SEQUENCE {
+        userIdentity    [0]  OCTET STRING OPTIONAL,
+        oldPasswd       [1]  OCTET STRING OPTIONAL,
+        newPasswd       [2]  OCTET STRING OPTIONAL }
+
+PasswdModifyResponseValue ::= SEQUENCE {
+        genPasswd       [0]     OCTET STRING OPTIONAL }
+
 END


@@ -0,0 +1,3 @@
+# generate a new autoconf
+aclocal -I m4
+autoconf -f
@@ -0,0 +1,285 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.53)
+AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 0.0` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd])
+REQUIRE_ERLANG_MIN="5.9.1 (Erlang/OTP R15B01)"
+REQUIRE_ERLANG_MAX="9.0.0 (No Max)"
+
+# Checks for programs.
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+AC_PROG_SED
+
+if test "x$GCC" = "xyes"; then
+    CFLAGS="$CFLAGS -Wall"
+fi
+
+# Checks Erlang runtime and compiler
+AC_ARG_WITH(erlang,
+	AC_HELP_STRING([--with-erlang=dir],
+		[search for erlang in dir]),
+[if test "$withval" = "yes" -o "$withval" = "no" -o "X$with_erlang" = "X"; then
+    extra_erl_path=""
+else
+    extra_erl_path="$with_erlang:$with_erlang/bin:"
+fi
+])
+
+AC_PATH_TOOL(ERL, erl, , [${extra_erl_path}$PATH])
+AC_PATH_TOOL(ERLC, erlc, , [${extra_erl_path}$PATH])
+
+AC_ERLANG_NEED_ERL
+AC_ERLANG_NEED_ERLC
+
+AC_ARG_ENABLE(erlang-version-check,
+[AC_HELP_STRING([--enable-erlang-version-check],
+	[Check Erlang/OTP version @<:@default=yes@:>@])])
+case "$enable_erlang_version_check" in
+	yes|'')
+		ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX])
+		;;
+	no)
+		ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX],[warn])
+		;;
+esac
+
+# Checks and sets ERLANG_ROOT_DIR and ERLANG_LIB_DIR variable
+AC_ERLANG_SUBST_ROOT_DIR
+# AC_ERLANG_SUBST_LIB_DIR
+
+#locating escript
+AC_PATH_PROG([ESCRIPT], [escript], [], [$ERLANG_ROOT_DIR/bin])
+
+#locating make
+AC_CHECK_PROG([MAKE], [make], [make], [])
+
+if test "x$ESCRIPT" = "x"; then
+   AC_MSG_ERROR(['escript' was not found])
+fi
+
+if test "x$MAKE" = "x"; then
+   AC_MSG_ERROR(['make' was not found])
+fi
+
+# Change default prefix
+AC_PREFIX_DEFAULT(/)
+
+AC_ARG_ENABLE(hipe,
+[AC_HELP_STRING([--enable-hipe], [compile natively with HiPE, not recommended (default: no)])],
+[case "${enableval}" in
+  yes) hipe=true ;;
+  no)  hipe=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-hipe) ;;
+esac],[hipe=false])
+
+AC_ARG_ENABLE(roster_gateway_workaround,
+[AC_HELP_STRING([--enable-roster-gateway-workaround], [turn on workaround for processing gateway subscriptions (default: no)])],
+[case "${enableval}" in
+  yes) roster_gateway_workaround=true ;;
+  no)  roster_gateway_workaround=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-roster-gateway-workaround) ;;
+esac],[roster_gateway_workaround=false])
+
+AC_ARG_ENABLE(transient_supervisors,
+[AC_HELP_STRING([--disable-transient-supervisors], [disable Erlang supervision for transient processes (default: no)])],
+[case "${enableval}" in
+  yes) transient_supervisors=true ;;
+  no)  transient_supervisors=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-transient_supervisors) ;;
+esac],[transient_supervisors=true])
+
+AC_ARG_ENABLE(full_xml,
+[AC_HELP_STRING([--enable-full-xml], [use XML features in XMPP stream (ex: CDATA) (default: no, requires XML compliant clients)])],
+[case "${enableval}" in
+  yes) full_xml=true ;;
+  no)  full_xml=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-full-xml) ;;
+esac],[full_xml=false])
+
+AC_ARG_ENABLE(mssql,
+[AC_HELP_STRING([--enable-mssql], [use Microsoft SQL Server database (default: no, requires --enable-odbc)])],
+[case "${enableval}" in
+  yes) db_type=mssql ;;
+  no)  db_type=generic ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-mssql) ;;
+esac],[db_type=generic])
+
+AC_ARG_ENABLE(all,
+[AC_HELP_STRING([--enable-all], [same as --enable-nif --enable-odbc --enable-mysql --enable-pgsql --enable-sqlite --enable-pam --enable-zlib --enable-riak --enable-redis --enable-json --enable-elixir --enable-iconv --enable-debug --enable-lager --enable-tools (useful for Dialyzer checks, default: no)])],
+[case "${enableval}" in
+  yes) nif=true odbc=true mysql=true pgsql=true sqlite=true pam=true zlib=true riak=true redis=true json=true elixir=true iconv=true debug=true lager=true tools=true ;;
+  no) nif=false odbc=false mysql=false pgsql=false sqlite=false pam=false zlib=false riak=false redis=false json=false elixir=false iconv=false debug=false lager=false tools=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
+esac],[])
+
+AC_ARG_ENABLE(tools,
+[AC_HELP_STRING([--enable-tools], [build development tools (default: no)])],
+[case "${enableval}" in
+  yes) tools=true ;;
+  no)  tools=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-tools) ;;
+esac],[if test "x$tools" = "x"; then tools=false; fi])
+
+AC_ARG_ENABLE(nif,
+[AC_HELP_STRING([--enable-nif], [replace some functions with C equivalents. Requires Erlang R13B04 or higher (default: no)])],
+[case "${enableval}" in
+  yes) nif=true ;;
+  no)  nif=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-nif) ;;
+esac],[if test "x$nif" = "x"; then nif=false; fi])
+
+AC_ARG_ENABLE(odbc,
+[AC_HELP_STRING([--enable-odbc], [enable pure ODBC support (default: no)])],
+[case "${enableval}" in
+  yes) odbc=true ;;
+  no)  odbc=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-odbc) ;;
+esac],[if test "x$odbc" = "x"; then odbc=false; fi])
+
+AC_ARG_ENABLE(mysql,
+[AC_HELP_STRING([--enable-mysql], [enable MySQL support (default: no)])],
+[case "${enableval}" in
+  yes) mysql=true ;;
+  no)  mysql=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-mysql) ;;
+esac],[if test "x$mysql" = "x"; then mysql=false; fi])
+
+AC_ARG_ENABLE(pgsql,
+[AC_HELP_STRING([--enable-pgsql], [enable PostgreSQL support (default: no)])],
+[case "${enableval}" in
+  yes) pgsql=true ;;
+  no)  pgsql=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-pgsql) ;;
+esac],[if test "x$pgsql" = "x"; then pgsql=false; fi])
+
+AC_ARG_ENABLE(sqlite,
+[AC_HELP_STRING([--enable-sqlite], [enable SQLite support (default: no)])],
+[case "${enableval}" in
+  yes) sqlite=true ;;
+  no)  sqlite=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-sqlite) ;;
+esac],[if test "x$sqlite" = "x"; then sqlite=false; fi])
+
+AC_ARG_ENABLE(pam,
+[AC_HELP_STRING([--enable-pam], [enable PAM support (default: no)])],
+[case "${enableval}" in
+  yes) pam=true ;;
+  no)  pam=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-pam) ;;
+esac],[if test "x$pam" = "x"; then pam=false; fi])
+
+AC_ARG_ENABLE(zlib,
+[AC_HELP_STRING([--enable-zlib], [enable Stream Compression (XEP-0138) using zlib (default: yes)])],
+[case "${enableval}" in
+  yes) zlib=true ;;
+  no)  zlib=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-zlib) ;;
+esac],[if test "x$zlib" = "x"; then zlib=true; fi])
+
+AC_ARG_ENABLE(riak,
+[AC_HELP_STRING([--enable-riak], [enable Riak support (default: no)])],
+[case "${enableval}" in
+  yes) riak=true ;;
+  no)  riak=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-riak) ;;
+esac],[if test "x$riak" = "x"; then riak=false; fi])
+
+AC_ARG_ENABLE(redis,
+[AC_HELP_STRING([--enable-redis], [enable Redis support (default: no)])],
+[case "${enableval}" in
+  yes) redis=true ;;
+  no)  redis=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-redis) ;;
+esac],[if test "x$redis" = "x"; then redis=false; fi])
+
+AC_ARG_ENABLE(json,
+[AC_HELP_STRING([--enable-json], [enable JSON support for mod_bosh (default: no)])],
+[case "${enableval}" in
+  yes) json=true ;;
+  no)  json=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-json) ;;
+esac],[if test "x$json" = "x"; then json=false; fi])
+
+AC_ARG_ENABLE(elixir,
+[AC_HELP_STRING([--enable-elixir], [enable Elixir support (default: no)])],
+[case "${enableval}" in
+  yes) elixir=true ;;
+  no)  elixir=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-elixir) ;;
+esac],[if test "x$elixir" = "x"; then elixir=false; fi])
+
+AC_ARG_ENABLE(iconv,
+[AC_HELP_STRING([--enable-iconv], [enable iconv support (default: yes)])],
+[case "${enableval}" in
+  yes) iconv=true ;;
+  no)  iconv=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-iconv) ;;
+esac],[if test "x$iconv" = "x"; then iconv=true; fi])
+
+AC_ARG_ENABLE(debug,
+[AC_HELP_STRING([--enable-debug], [enable debug information (default: yes)])],
+[case "${enableval}" in
+  yes) debug=true ;;
+  no)  debug=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
+esac],[if test "x$debug" = "x"; then debug=true; fi])
+
+AC_ARG_ENABLE(lager,
+[AC_HELP_STRING([--enable-lager], [enable lager support (default: yes)])],
+[case "${enableval}" in
+  yes) lager=true ;;
+  no)  lager=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-lager) ;;
+esac],[if test "x$lager" = "x"; then lager=true; fi])
+
+AC_CONFIG_FILES([Makefile
+		 vars.config
+		 src/ejabberd.app.src
+		 mix.exs])
+
+ENABLEUSER=""
+AC_ARG_ENABLE(user,
+  [AS_HELP_STRING([--enable-user[[[[=USER]]]]], [allow this system user to start ejabberd (default: no)])],
+  [case "${enableval}" in
+     yes) ENABLEUSER=`whoami` ;;
+     no) ENABLEUSER="" ;;
+     *) ENABLEUSER=$enableval
+   esac],
+  [])
+if test "$ENABLEUSER" != ""; then
+  echo "allow this system user to start ejabberd: $ENABLEUSER"
+  AC_SUBST([INSTALLUSER], [$ENABLEUSER])
+fi
+
+ERLANG_DEPRECATED_TYPES_CHECK
+
+if test "$sqlite" = "true"; then
+   AX_LIB_SQLITE3([3.6.19])
+   if test "x$SQLITE3_VERSION" = "x"; then
+      AC_MSG_ERROR(SQLite3 library >= 3.6.19 was not found)
+   fi
+fi
+
+AC_SUBST(hipe)
+AC_SUBST(roster_gateway_workaround)
+AC_SUBST(transient_supervisors)
+AC_SUBST(full_xml)
+AC_SUBST(nif)
+AC_SUBST(db_type)
+AC_SUBST(odbc)
+AC_SUBST(mysql)
+AC_SUBST(pgsql)
+AC_SUBST(sqlite)
+AC_SUBST(pam)
+AC_SUBST(zlib)
+AC_SUBST(riak)
+AC_SUBST(redis)
+AC_SUBST(json)
+AC_SUBST(elixir)
+AC_SUBST(iconv)
+AC_SUBST(debug)
+AC_SUBST(lager)
+AC_SUBST(tools)
+
+AC_OUTPUT
@@ -1,5 +0,0 @@
-% List of ejabberd-modules to add for ejabberd packaging (source archive and installer)
-%
-% HTTP-binding:
-%https://svn.process-one.net/ejabberd-modules/http_bind/trunk
-%https://svn.process-one.net/ejabberd-modules/mod_http_fileserver/trunk
@@ -88,6 +88,16 @@ parse_form(Dir, File, Form, Used) ->
 	 [_, {string, Line, Str}]
 	} ->
 	    process_string(Dir, File, Line, Str, Used);
+	{call,
+	 _,
+	 {remote, _, {atom, _, translate}, {atom, _, translate}},
+	 [_,
+	  {bin,_,
+	   [{bin_element,_,
+	     {string,Line,Str},
+	     default,default}]}]
+	} ->
+	    process_string(Dir, File, Line, Str, Used);
 	{call,
 	 _,
 	 {remote, _, {atom, _, translate}, {atom, _, translate}},
@@ -281,14 +291,14 @@ build_additional_translators(List) ->
      List).

 print_translation(File, Line, Str, StrT) ->
-    {ok, StrQ, _} = regexp:gsub(Str, "\"", "\\\""),
-    {ok, StrTQ, _} = regexp:gsub(StrT, "\"", "\\\""),
+    StrQ = ejabberd_regexp:greplace(list_to_binary(Str), <<"\\\"">>, <<"\\\\\"">>),
+    StrTQ = ejabberd_regexp:greplace(list_to_binary(StrT), <<"\\\"">>, <<"\\\\\"">>),
    io:format("#: ~s:~p~nmsgid \"~s\"~nmsgstr \"~s\"~n~n", [File, Line, StrQ, StrTQ]).

 print_translation_obsolete(Str, StrT) ->
    File = "unknown.erl",
    Line = 1,
-    {ok, StrQ, _} = regexp:gsub(Str, "\"", "\\\""),
-    {ok, StrTQ, _} = regexp:gsub(StrT, "\"", "\\\""),
+    StrQ = ejabberd_regexp:greplace(Str, "\\\"", "\\\\\""),
+    StrTQ = ejabberd_regexp:greplace(StrT, "\\\"", "\\\\\""),
    io:format("#: ~s:~p~n#~~ msgid \"~s\"~n#~~ msgstr \"~s\"~n~n", [File, Line, StrQ, StrTQ]).

@@ -15,13 +15,14 @@ prepare_dirs ()
 	ERL=`which erl`

 	EJA_SRC_DIR=$EJA_DIR/src/
-	EJA_MSGS_DIR=$EJA_SRC_DIR/msgs/
+	EJA_MSGS_DIR=$EJA_DIR/priv/msgs/
 	EXTRACT_DIR=$EJA_DIR/contrib/extract_translations/
 	EXTRACT_ERL=$EXTRACT_DIR/extract_translations.erl
 	EXTRACT_BEAM=$EXTRACT_DIR/extract_translations.beam

 	SRC_DIR=$RUN_DIR/src
-	MSGS_DIR=$SRC_DIR/msgs
+	EBIN_DIR=$RUN_DIR/ebin
+	MSGS_DIR=$EJA_DIR/priv/msgs

 	if !([[ -n $EJA_DIR ]])
 	then 
@@ -91,13 +92,13 @@ extract_lang_all ()
 	cd $MSGS_DIR
 	for i in $( ls *.msg ) ; do
 		MISSING=`cat $i.translate | grep "\", \"\"}." | wc -l`
-		LANGUAGE=`grep "Language:" $i.translate | sed 's/% Language: //g'`
+		LANGUAGE=`grep "X-Language:" $i.translate | sed 's/% Language: //g'`
 		LASTAUTH=`grep "Author:" $i.translate | head -n 1 | sed 's/% Author: //g'`
 		echo -e "$i\t$MISSING\t$LANGUAGE\t$LASTAUTH"
 	done

 	cd $MSGS_DIR
-	REVISION=`svn info | grep "^Rev" | head -1 | awk '{print $2}'`
+	REVISION=`git describe --always`
 	zip $HOME/ejabberd-langs-$REVISION.zip *.translate;

 	rm *.translate
@@ -155,7 +156,8 @@ extract_lang_srcmsg2po ()

 	echo $MSGS_PATH

-	$ERL -pa $EXTRACT_DIR -pa $SRC_DIR -pa $EJA_SRC_DIR -pa /lib/ejabberd/include -noinput -noshell -s extract_translations -s init stop -extra -srcmsg2po . $MSGS_PATH >$PO_PATH.1
+	cd $SRC_DIR
+	$ERL -pa $EXTRACT_DIR -pa $EBIN_DIR -pa $EJA_SRC_DIR -pa /lib/ejabberd/include -noinput -noshell -s extract_translations -s init stop -extra -srcmsg2po . $MSGS_PATH >$PO_PATH.1
 	sed -e 's/ \[\]$/ \"\"/g;' $PO_PATH.1 > $PO_PATH.2
 	msguniq --sort-by-file $PO_PATH.2 --output-file=$PO_PATH
 	
@@ -174,7 +176,7 @@ extract_lang_src2pot ()
 	echo "" >>$MSGS_PATH

 	cd $SRC_DIR
-	$ERL -pa $EXTRACT_DIR -pa $SRC_DIR -pa $EJA_SRC_DIR -pa /lib/ejabberd/include -noinput -noshell -s extract_translations -s init stop -extra -srcmsg2po . $MSGS_PATH >$POT_PATH.1
+	$ERL -pa $EXTRACT_DIR -pa $EBIN_DIR -pa $EJA_SRC_DIR -pa /lib/ejabberd/include -noinput -noshell -s extract_translations -s init stop -extra -srcmsg2po . $MSGS_PATH >$POT_PATH.1
 	sed -e 's/ \[\]$/ \"\"/g;' $POT_PATH.1 > $POT_PATH.2

 	#msguniq --sort-by-file $POT_PATH.2 $EJA_MSGS_DIR --output-file=$POT_PATH
@@ -228,7 +230,8 @@ extract_lang_po2msg ()
 	msgattrib $PO_PATH --translated --no-fuzzy --no-obsolete --no-location --no-wrap | grep "^msg" | tail --lines=+3 >$MS_PATH
 	grep "^msgid" $PO_PATH.ms | sed 's/^msgid //g' >$MSGID_PATH
 	grep "^msgstr" $PO_PATH.ms | sed 's/^msgstr //g' >$MSGSTR_PATH
-	paste $MSGID_PATH $MSGSTR_PATH --delimiter=, | awk '{print "{" $0 "}."}' | sort -g >$MSGS_PATH
+	echo "%% -*- coding: latin-1 -*-" >$MSGS_PATH
+	paste $MSGID_PATH $MSGSTR_PATH --delimiter=, | awk '{print "{" $0 "}."}' | sort -g >>$MSGS_PATH

 	rm $MS_PATH
 	rm $MSGID_PATH
@@ -258,7 +261,7 @@ extract_lang_updateall ()
 		MISSING=`msgfmt --statistics $PO 2>&1 | awk '{printf "%5s", $4 }'`
 		echo -n " $MISSING"

-		LANGUAGE=`grep "Language:" $PO | sed 's/\"X-Language: //g' | sed 's/\\\\n\"//g' | awk '{printf "%-12s", $1}'`
+		LANGUAGE=`grep "X-Language:" $PO | sed 's/\"X-Language: //g' | sed 's/\\\\n\"//g' | awk '{printf "%-12s", $1}'`
 		echo -n " $LANGUAGE"

 		LASTAUTH=`grep "Last-Translator" $PO | sed 's/\"Last-Translator: //g' | sed 's/\\\\n\"//g'`
@@ -288,8 +291,8 @@ translation_instructions ()
 	echo "  $MSGS_PATH"
 }

-EJA_DIR=`pwd`/..
-RUN_DIR=`pwd`/..
+EJA_DIR=`pwd`
+RUN_DIR=`pwd`
 PROJECT=ejabberd

 while [ $# -ne 0 ] ; do
@@ -1,62 +0,0 @@
-# $Id$
-
-SHELL = /bin/bash
-
-CONTRIBUTED_MODULES = ""
-#ifeq ($(shell ls mod_http_bind.tex),mod_http_bind.tex)
-#	CONTRIBUTED_MODULES += "\\n\\setboolean{modhttpbind}{true}"
-#endif
-
-
-all:	release pdf html
-
-release:
-	@echo "Notes for the releaser:"
-	@echo "* Do not forget to add a link to the release notes in guide.tex"
-	@echo "* Do not forget to update the version number in src/ejabberd.app!"
-	@echo "* Do not forget to update the features in introduction.tex (including \new{} and \improved{} tags)."
-	@echo "Press any key to continue"
-	##@read foo
-	@echo "% ejabberd version (automatically generated)." > version.tex
-	@echo "\newcommand{\version}{"`sed '/vsn/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../src/ejabberd.app`"}" >> version.tex
-	@echo -n "% Contributed modules (automatically generated)."  > contributed_modules.tex
-	@echo -e "$(CONTRIBUTED_MODULES)" >> contributed_modules.tex
-
-html:	guide.html dev.html features.html
-
-pdf:	guide.pdf features.pdf
-
-clean:
-	rm -f *.aux
-	rm -f *.haux
-	rm -f *.htoc
-	rm -f *.idx
-	rm -f *.ilg
-	rm -f *.ind
-	rm -f *.log
-	rm -f *.out
-	rm -f *.pdf
-	rm -f *.toc
-	[ ! -f contributed_modules.tex ] || rm contributed_modules.tex
-
-distclean: clean
-	rm -f *.html
-
-guide.html:	guide.tex
-		hevea -fix -pedantic guide.tex
-
-dev.html:	dev.tex
-		hevea -fix -pedantic dev.tex
-
-features.html:	features.tex
-		hevea -fix -pedantic features.tex
-
-guide.pdf:	guide.tex
-		pdflatex guide.tex
-		pdflatex guide.tex
-		pdflatex guide.tex
-		makeindex guide.idx
-		pdflatex guide.tex
-
-features.pdf:	features.tex
-		pdflatex features.tex
@@ -1,18 +0,0 @@
-APPNAME = ejabberd
-VSN = $(shell sed '/vsn/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../../src/ejabberd.app)
-
-DOCDIR=.
-SRCDIR=../../src
-
-.PHONY = all
-
-all: docs
-
-clean:
-	rm -f *.html
-	rm edoc-info
-	rm erlang.png
-
-docs:
-	erl -noshell -run edoc_run application \
-	"'$(APPNAME)'" '"$(SRCDIR)"' '[{dir,"$(DOCDIR)"},{packages, false},{todo,true},{private,true},{def,{vsn,"$(VSN)"}},{stylesheet,"process-one.css"},{overview,"$(DOCDIR)/overview.edoc"}]' -s init stop
@@ -1,10 +0,0 @@
-@author Mickael Remond <mickael.remond@process-one.net>
-  [http://www.process-one.net/]
-@copyright 2007 ProcessOne
-@version {@vsn}, {@date} {@time}
-@title ejabberd Development API Documentation
-
-@doc
-== Introduction ==
-
-TODO: Insert content from Jerome documentation.
@@ -1,92 +0,0 @@
-html, body {
-  font-family: Verdana, sans-serif;
-  color: #000;
-  background-color: #fff;
-}
-
-h1 {
-  color: #4a5389;
-  border-bottom: solid 1px #000;
-}
-
-h2 {
-  font-size: 24px;
-  text-align: right;
-  color: #4a5389;
-  border-bottom: 1px solid #000;
-}
-
-h3 {
-  font-size: 18px;
-  color: #900;
-}
-
-h4 {
-  font-size: 14px;
-  color: #000;
-}
-
-a[href] {
-  color: #4a5389;
-}
-
-a[href]:hover {
-  background-color: #ecefff;
-}
-
-p, li, dd {
-  text-align: justify;
-}
-
-li {
-  margin-top: 0.3em;
-}
-
-li:first-child {
-  margin-top: 0px;
-}
-
-blockquote {
-  color: #555;
-}
-
-caption {
-  font-style: italic;
-  color: #009;
-  text-align: left;
-  margin-left: 20px;
-}
-
-table[border="1"] {
-  border-collapse: collapse;
-  margin-bottom: 1em;
-}
-
-table[border="1"] td {
-  border: 1px solid #ddd;
-}
-
-pre, tt, code {
-  color: #461b7e;
-}
-
-pre {
-  margin:1ex 2ex;
-  border:1px dashed lightgrey;
-  background-color:#f9f9f9;
-  padding:0.5ex;
-}
-
-pre em {
-  font-style: normal;
-  font-weight: bold;
-}
-
-dt {
-  margin:0ex 2ex;
-  font-weight:bold;
-}
-
-dd {
-  margin:0ex 0ex 1ex 4ex;
-}
@@ -1,410 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-            "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE>Ejabberd 2.1.2 Developers Guide
-</TITLE>
-
-<META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<META name="GENERATOR" content="hevea 1.10">
-<STYLE type="text/css">
-.li-itemize{margin:1ex 0ex;}
-.li-enumerate{margin:1ex 0ex;}
-.dd-description{margin:0ex 0ex 1ex 4ex;}
-.dt-description{margin:0ex;}
-.toc{list-style:none;}
-.thefootnotes{text-align:left;margin:0ex;}
-.dt-thefootnotes{margin:0em;}
-.dd-thefootnotes{margin:0em 0em 0em 2em;}
-.footnoterule{margin:1em auto 1em 0px;width:50%;}
-.caption{padding-left:2ex; padding-right:2ex; margin-left:auto; margin-right:auto}
-.title{margin:2ex auto;text-align:center}
-.center{text-align:center;margin-left:auto;margin-right:auto;}
-.flushleft{text-align:left;margin-left:0ex;margin-right:auto;}
-.flushright{text-align:right;margin-left:auto;margin-right:0ex;}
-DIV TABLE{margin-left:inherit;margin-right:inherit;}
-PRE{text-align:left;margin-left:0ex;margin-right:auto;}
-BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
-TD P{margin:0px;}
-.boxed{border:1px solid black}
-.textboxed{border:1px solid black}
-.vbar{border:none;width:2px;background-color:black;}
-.hbar{border:none;height:2px;width:100%;background-color:black;}
-.hfill{border:none;height:1px;width:200%;background-color:black;}
-.vdisplay{border-collapse:separate;border-spacing:2px;width:auto; empty-cells:show; border:2px solid red;}
-.vdcell{white-space:nowrap;padding:0px;width:auto; border:2px solid green;}
-.display{border-collapse:separate;border-spacing:2px;width:auto; border:none;}
-.dcell{white-space:nowrap;padding:0px;width:auto; border:none;}
-.dcenter{margin:0ex auto;}
-.vdcenter{border:solid #FF8000 2px; margin:0ex auto;}
-.minipage{text-align:left; margin-left:0em; margin-right:auto;}
-.marginpar{border:solid thin black; width:20%; text-align:left;}
-.marginparleft{float:left; margin-left:0ex; margin-right:1ex;}
-.marginparright{float:right; margin-left:1ex; margin-right:0ex;}
-.theorem{text-align:left;margin:1ex auto 1ex 0ex;}
-.part{margin:2ex auto;text-align:center}
-</STYLE>
-</HEAD>
-<BODY >
-<!--HEVEA command line is: /usr/bin/hevea -fix -pedantic dev.tex -->
-<!--CUT DEF section 1 --><P><A NAME="titlepage"></A>
-
-</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.2 Developers Guide</H1><H3 CLASS="titlerest">Alexey Shchepin<BR>
- <A HREF="mailto:alexey@sevcom.net"><TT>mailto:alexey@sevcom.net</TT></A><BR>
- <A HREF="xmpp:aleksey@jabber.ru"><TT>xmpp:aleksey@jabber.ru</TT></A></H3></TD></TR>
-</TABLE><DIV CLASS="center">
-
-<IMG SRC="logo.png" ALT="logo.png">
-
-
-</DIV><BLOCKQUOTE CLASS="quotation"><I>I can thoroughly recommend ejabberd for ease of setup &#X2013;
-Kevin Smith, Current maintainer of the Psi project</I></BLOCKQUOTE><!--TOC section Contents-->
-<H2 CLASS="section"><!--SEC ANCHOR -->Contents</H2><!--SEC END --><UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc1">1&#XA0;&#XA0;Key Features</A>
-</LI><LI CLASS="li-toc"><A HREF="#htoc2">2&#XA0;&#XA0;Additional Features</A>
-</LI><LI CLASS="li-toc"><A HREF="#htoc3">3&#XA0;&#XA0;How it Works</A>
-<UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc4">3.1&#XA0;&#XA0;Router</A>
-</LI><LI CLASS="li-toc"><A HREF="#htoc5">3.2&#XA0;&#XA0;Local Router</A>
-</LI><LI CLASS="li-toc"><A HREF="#htoc6">3.3&#XA0;&#XA0;Session Manager</A>
-</LI><LI CLASS="li-toc"><A HREF="#htoc7">3.4&#XA0;&#XA0;S2S Manager</A>
-</LI></UL>
-</LI><LI CLASS="li-toc"><A HREF="#htoc8">4&#XA0;&#XA0;Authentication</A>
-<UL CLASS="toc">
-<UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc9">4.0.1&#XA0;&#XA0;External</A>
-</LI></UL>
-</UL>
-</LI><LI CLASS="li-toc"><A HREF="#htoc10">5&#XA0;&#XA0;XML Representation</A>
-</LI><LI CLASS="li-toc"><A HREF="#htoc11">6&#XA0;&#XA0;Module <TT>xml</TT></A>
-</LI><LI CLASS="li-toc"><A HREF="#htoc12">7&#XA0;&#XA0;Module <TT>xml_stream</TT></A>
-</LI><LI CLASS="li-toc"><A HREF="#htoc13">8&#XA0;&#XA0;Modules</A>
-<UL CLASS="toc"><LI CLASS="li-toc">
-<A HREF="#htoc14">8.1&#XA0;&#XA0;Module gen_iq_handler</A>
-</LI><LI CLASS="li-toc"><A HREF="#htoc15">8.2&#XA0;&#XA0;Services</A>
-</LI></UL>
-</LI></UL><P>Introduction
-<A NAME="intro"></A></P><P><TT>ejabberd</TT> is a free and open source instant messaging server written in <A HREF="http://www.erlang.org/">Erlang/OTP</A>.</P><P><TT>ejabberd</TT> is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication.</P><P><TT>ejabberd</TT> is designed to be a rock-solid and feature rich XMPP server.</P><P><TT>ejabberd</TT> is suitable for small deployments, whether they need to be scalable or not, as well as extremely big deployments.</P><!--TOC section Key Features-->
-<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc1">1</A>&#XA0;&#XA0;Key Features</H2><!--SEC END --><P>
-<A NAME="keyfeatures"></A>
-</P><P><TT>ejabberd</TT> is:
-</P><UL CLASS="itemize"><LI CLASS="li-itemize">
-Cross-platform: <TT>ejabberd</TT> runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.</LI><LI CLASS="li-itemize">Distributed: You can run <TT>ejabberd</TT> on a cluster of machines and all of them will serve the same Jabber domain(s). When you need more capacity you can simply add a new cheap node to your cluster. Accordingly, you do not need to buy an expensive high-end machine to support tens of thousands concurrent users.</LI><LI CLASS="li-itemize">Fault-tolerant: You can deploy an <TT>ejabberd</TT> cluster so that all the information required for a properly working service will be replicated permanently on all nodes. This means that if one of the nodes crashes, the others will continue working without disruption. In addition, nodes also can be added or replaced &#X2018;on the fly&#X2019;.</LI><LI CLASS="li-itemize">Administrator Friendly: <TT>ejabberd</TT> is built on top of the Open Source Erlang. As a result you do not need to install an external database, an external web server, amongst others because everything is already included, and ready to run out of the box. Other administrator benefits include:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Comprehensive documentation.
-</LI><LI CLASS="li-itemize">Straightforward installers for Linux, Mac OS X, and Windows. </LI><LI CLASS="li-itemize">Web Administration.
-</LI><LI CLASS="li-itemize">Shared Roster Groups.
-</LI><LI CLASS="li-itemize">Command line administration tool. </LI><LI CLASS="li-itemize">Can integrate with existing authentication mechanisms.
-</LI><LI CLASS="li-itemize">Capability to send announce messages.
-</LI></UL></LI><LI CLASS="li-itemize">Internationalized: <TT>ejabberd</TT> leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Translated to 25 languages. </LI><LI CLASS="li-itemize">Support for <A HREF="http://www.ietf.org/rfc/rfc3490.txt">IDNA</A>.
-</LI></UL></LI><LI CLASS="li-itemize">Open Standards: <TT>ejabberd</TT> is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Fully XMPP compliant.
-</LI><LI CLASS="li-itemize">XML-based protocol.
-</LI><LI CLASS="li-itemize"><A HREF="http://www.ejabberd.im/protocols">Many protocols supported</A>.
-</LI></UL></LI></UL><!--TOC section Additional Features-->
-<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc2">2</A>&#XA0;&#XA0;Additional Features</H2><!--SEC END --><P>
-<A NAME="addfeatures"></A>
-</P><P>Moreover, <TT>ejabberd</TT> comes with a wide range of other state-of-the-art features:
-</P><UL CLASS="itemize"><LI CLASS="li-itemize">
-Modular
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Load only the modules you want.
-</LI><LI CLASS="li-itemize">Extend <TT>ejabberd</TT> with your own custom modules.
-</LI></UL>
-</LI><LI CLASS="li-itemize">Security
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-SASL and STARTTLS for c2s and s2s connections.
-</LI><LI CLASS="li-itemize">STARTTLS and Dialback s2s connections.
-</LI><LI CLASS="li-itemize">Web Admin accessible via HTTPS secure access.
-</LI></UL>
-</LI><LI CLASS="li-itemize">Databases
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Internal database for fast deployment (Mnesia).
-</LI><LI CLASS="li-itemize">Native MySQL support.
-</LI><LI CLASS="li-itemize">Native PostgreSQL support.
-</LI><LI CLASS="li-itemize">ODBC data storage support.
-</LI><LI CLASS="li-itemize">Microsoft SQL Server support. </LI></UL>
-</LI><LI CLASS="li-itemize">Authentication
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Internal Authentication.
-</LI><LI CLASS="li-itemize">PAM, LDAP and ODBC. </LI><LI CLASS="li-itemize">External Authentication script.
-</LI></UL>
-</LI><LI CLASS="li-itemize">Others
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Support for virtual hosting.
-</LI><LI CLASS="li-itemize">Compressing XML streams with Stream Compression (<A HREF="http://www.xmpp.org/extensions/xep-0138.html">XEP-0138</A>).
-</LI><LI CLASS="li-itemize">Statistics via Statistics Gathering (<A HREF="http://www.xmpp.org/extensions/xep-0039.html">XEP-0039</A>).
-</LI><LI CLASS="li-itemize">IPv6 support both for c2s and s2s connections.
-</LI><LI CLASS="li-itemize"><A HREF="http://www.xmpp.org/extensions/xep-0045.html">Multi-User Chat</A> module with support for clustering and HTML logging. </LI><LI CLASS="li-itemize">Users Directory based on users vCards.
-</LI><LI CLASS="li-itemize"><A HREF="http://www.xmpp.org/extensions/xep-0060.html">Publish-Subscribe</A> component with support for <A HREF="http://www.xmpp.org/extensions/xep-0163.html">Personal Eventing via Pubsub</A>.
-</LI><LI CLASS="li-itemize">Support for web clients: <A HREF="http://www.xmpp.org/extensions/xep-0025.html">HTTP Polling</A> and <A HREF="http://www.xmpp.org/extensions/xep-0206.html">HTTP Binding (BOSH)</A> services.
-</LI><LI CLASS="li-itemize">IRC transport.
-</LI><LI CLASS="li-itemize">Component support: interface with networks such as AIM, ICQ and MSN installing special tranports.
-</LI></UL>
-</LI></UL><!--TOC section How it Works-->
-<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc3">3</A>&#XA0;&#XA0;How it Works</H2><!--SEC END --><P>
-<A NAME="howitworks"></A></P><P>A XMPP domain is served by one or more <TT>ejabberd</TT> nodes. These nodes can
-be run on different machines that are connected via a network. They all must
-have the ability to connect to port 4369 of all another nodes, and must have
-the same magic cookie (see Erlang/OTP documentation, in other words the file
-<TT>~ejabberd/.erlang.cookie</TT> must be the same on all nodes). This is
-needed because all nodes exchange information about connected users, S2S
-connections, registered services, etc&#X2026;</P><P>Each <TT>ejabberd</TT> node have following modules:
-</P><UL CLASS="itemize"><LI CLASS="li-itemize">
-router;
-</LI><LI CLASS="li-itemize">local router.
-</LI><LI CLASS="li-itemize">session manager;
-</LI><LI CLASS="li-itemize">S2S manager;
-</LI></UL><!--TOC subsection Router-->
-<H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc4">3.1</A>&#XA0;&#XA0;Router</H3><!--SEC END --><P>This module is the main router of XMPP packets on each node. It routes
-them based on their destinations domains. It has two tables: local and global
-routes. First, domain of packet destination searched in local table, and if it
-found, then the packet is routed to appropriate process. If no, then it
-searches in global table, and is routed to the appropriate <TT>ejabberd</TT> node or
-process. If it does not exists in either tables, then it sent to the S2S
-manager.</P><!--TOC subsection Local Router-->
-<H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc5">3.2</A>&#XA0;&#XA0;Local Router</H3><!--SEC END --><P>This module routes packets which have a destination domain equal to this server
-name. If destination JID has a non-empty user part, then it routed to the
-session manager, else it is processed depending on it&#X2019;s content.</P><!--TOC subsection Session Manager-->
-<H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc6">3.3</A>&#XA0;&#XA0;Session Manager</H3><!--SEC END --><P>This module routes packets to local users. It searches for what user resource
-packet must be sended via presence table. If this resource is connected to
-this node, it is routed to C2S process, if it connected via another node, then
-the packet is sent to session manager on that node.</P><!--TOC subsection S2S Manager-->
-<H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc7">3.4</A>&#XA0;&#XA0;S2S Manager</H3><!--SEC END --><P>This module routes packets to other XMPP servers. First, it checks if an
-open S2S connection from the domain of the packet source to the domain of
-packet destination already exists. If it is open on another node, then it
-routes the packet to S2S manager on that node, if it is open on this node, then
-it is routed to the process that serves this connection, and if a connection
-does not exist, then it is opened and registered.</P><!--TOC section Authentication-->
-<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc8">4</A>&#XA0;&#XA0;Authentication</H2><!--SEC END --><!--TOC subsubsection External-->
-<H4 CLASS="subsubsection"><!--SEC ANCHOR --><A NAME="htoc9">4.0.1</A>&#XA0;&#XA0;External</H4><!--SEC END --><P>
-<A NAME="externalauth"></A>
-</P><P>The external authentication script follows
-<A HREF="http://www.erlang.org/doc/tutorial/c_portdriver.html">the erlang port driver API</A>.</P><P>That script is supposed to do theses actions, in an infinite loop:
-</P><UL CLASS="itemize"><LI CLASS="li-itemize">
-read from stdin: AABBBBBBBBB.....
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-A: 2 bytes of length data (a short in network byte order)
-</LI><LI CLASS="li-itemize">B: a string of length found in A that contains operation in plain text
-operation are as follows:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-auth:User:Server:Password (check if a username/password pair is correct)
-</LI><LI CLASS="li-itemize">isuser:User:Server (check if it&#X2019;s a valid user)
-</LI><LI CLASS="li-itemize">setpass:User:Server:Password (set user&#X2019;s password)
-</LI></UL>
-</LI></UL>
-</LI><LI CLASS="li-itemize">write to stdout: AABB
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-A: the number 2 (coded as a short, which is bytes length of following result)
-</LI><LI CLASS="li-itemize">B: the result code (coded as a short), should be 1 for success/valid, or 0 for failure/invalid
-</LI></UL>
-</LI></UL><P>Example python script
-</P><PRE CLASS="verbatim">#!/usr/bin/python
-
-import sys
-from struct import *
-
-def from_ejabberd():
-    input_length = sys.stdin.read(2)
-    (size,) = unpack('&gt;h', input_length)
-    return sys.stdin.read(size).split(':')
-
-def to_ejabberd(bool):
-    answer = 0
-    if bool:
-        answer = 1
-    token = pack('&gt;hh', 2, answer)
-    sys.stdout.write(token)
-    sys.stdout.flush()
-
-def auth(username, server, password):
-    return True
-
-def isuser(username, server):
-    return True
-
-def setpass(username, server, password):
-    return True
-
-while True:
-    data = from_ejabberd()
-    success = False
-    if data[0] == "auth":
-        success = auth(data[1], data[2], data[3])
-    elif data[0] == "isuser":
-        success = isuser(data[1], data[2])
-    elif data[0] == "setpass":
-        success = setpass(data[1], data[2], data[3])
-    to_ejabberd(success)
-</PRE><!--TOC section XML Representation-->
-<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc10">5</A>&#XA0;&#XA0;XML Representation</H2><!--SEC END --><P>
-<A NAME="xmlrepr"></A></P><P>Each XML stanza is represented as the following tuple:
-</P><PRE CLASS="verbatim">XMLElement = {xmlelement, Name, Attrs, [ElementOrCDATA]}
-        Name = string()
-        Attrs = [Attr]
-        Attr = {Key, Val}
-        Key = string()
-        Val = string()
-        ElementOrCDATA = XMLElement | CDATA
-        CDATA = {xmlcdata, string()}
-</PRE><P>E.&#XA0;g. this stanza:
-</P><PRE CLASS="verbatim">&lt;message to='test@conference.example.org' type='groupchat'&gt;
-  &lt;body&gt;test&lt;/body&gt;
-&lt;/message&gt;
-</PRE><P>is represented as the following structure:
-</P><PRE CLASS="verbatim">{xmlelement, "message",
-    [{"to", "test@conference.example.org"},
-     {"type", "groupchat"}],
-    [{xmlelement, "body",
-         [],
-         [{xmlcdata, "test"}]}]}}
-</PRE><!--TOC section Module <TT>xml</TT>-->
-<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc11">6</A>&#XA0;&#XA0;Module <TT>xml</TT></H2><!--SEC END --><P>
-<A NAME="xmlmod"></A></P><DL CLASS="description"><DT CLASS="dt-description">
-</DT><DD CLASS="dd-description"><CODE>element_to_string(El) -&gt; string()</CODE>
-<PRE CLASS="verbatim">El = XMLElement
-</PRE>Returns string representation of XML stanza <TT>El</TT>.</DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description"><CODE>crypt(S) -&gt; string()</CODE>
-<PRE CLASS="verbatim">S = string()
-</PRE>Returns string which correspond to <TT>S</TT> with encoded XML special
-characters.</DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description"><CODE>remove_cdata(ECList) -&gt; EList</CODE>
-<PRE CLASS="verbatim">ECList = [ElementOrCDATA]
-EList = [XMLElement]
-</PRE><TT>EList</TT> is a list of all non-CDATA elements of ECList.</DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description"><CODE>get_path_s(El, Path) -&gt; Res</CODE>
-<PRE CLASS="verbatim">El = XMLElement
-Path = [PathItem]
-PathItem = PathElem | PathAttr | PathCDATA
-PathElem = {elem, Name}
-PathAttr = {attr, Name}
-PathCDATA = cdata
-Name = string()
-Res = string() | XMLElement
-</PRE>If <TT>Path</TT> is empty, then returns <TT>El</TT>. Else sequentially
-consider elements of <TT>Path</TT>. Each element is one of:
-<DL CLASS="description"><DT CLASS="dt-description">
-</DT><DD CLASS="dd-description"><CODE>{elem, Name}</CODE> <TT>Name</TT> is name of subelement of
-<TT>El</TT>, if such element exists, then this element considered in
-following steps, else returns empty string.
-</DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description"><CODE>{attr, Name}</CODE> If <TT>El</TT> have attribute <TT>Name</TT>, then
-returns value of this attribute, else returns empty string.
-</DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description"><CODE>cdata</CODE> Returns CDATA of <TT>El</TT>.
-</DD></DL></DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description">TODO:
-<PRE CLASS="verbatim">         get_cdata/1, get_tag_cdata/1
-         get_attr/2, get_attr_s/2
-         get_tag_attr/2, get_tag_attr_s/2
-         get_subtag/2
-</PRE></DD></DL><!--TOC section Module <TT>xml_stream</TT>-->
-<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc12">7</A>&#XA0;&#XA0;Module <TT>xml_stream</TT></H2><!--SEC END --><P>
-<A NAME="xmlstreammod"></A></P><DL CLASS="description"><DT CLASS="dt-description">
-</DT><DD CLASS="dd-description"><CODE>parse_element(Str) -&gt; XMLElement | {error, Err}</CODE>
-<PRE CLASS="verbatim">Str = string()
-Err = term()
-</PRE>Parses <TT>Str</TT> using XML parser, returns either parsed element or error
-tuple.
-</DD></DL><!--TOC section Modules-->
-<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc13">8</A>&#XA0;&#XA0;Modules</H2><!--SEC END --><P>
-<A NAME="emods"></A></P><!--TOC subsection Module gen_iq_handler-->
-<H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc14">8.1</A>&#XA0;&#XA0;Module gen_iq_handler</H3><!--SEC END --><P>
-<A NAME="geniqhandl"></A></P><P>The module <CODE>gen_iq_handler</CODE> allows to easily write handlers for IQ packets
-of particular XML namespaces that addressed to server or to users bare JIDs.</P><P>In this module the following functions are defined:
-</P><DL CLASS="description"><DT CLASS="dt-description">
-</DT><DD CLASS="dd-description"><CODE>add_iq_handler(Component, Host, NS, Module, Function, Type)</CODE>
-<PRE CLASS="verbatim">Component = Module = Function = atom()
-Host = NS = string()
-Type = no_queue | one_queue | parallel
-</PRE>Registers function <CODE>Module:Function</CODE> as handler for IQ packets on
-virtual host <CODE>Host</CODE> that contain child of namespace <CODE>NS</CODE> in
-<CODE>Component</CODE>. Queueing discipline is <CODE>Type</CODE>. There are at least
-two components defined:
-<DL CLASS="description"><DT CLASS="dt-description">
-</DT><DD CLASS="dd-description"><CODE>ejabberd_local</CODE> Handles packets that addressed to server JID;
-</DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description"><CODE>ejabberd_sm</CODE> Handles packets that addressed to users bare JIDs.
-</DD></DL>
-</DD><DT CLASS="dt-description"></DT><DD CLASS="dd-description"><CODE>remove_iq_handler(Component, Host, NS)</CODE>
-<PRE CLASS="verbatim">Component = atom()
-Host = NS = string()
-</PRE>Removes IQ handler on virtual host <CODE>Host</CODE> for namespace <CODE>NS</CODE> from
-<CODE>Component</CODE>.
-</DD></DL><P>Handler function must have the following type:
-</P><DL CLASS="description"><DT CLASS="dt-description">
-</DT><DD CLASS="dd-description"><CODE>Module:Function(From, To, IQ)</CODE>
-<PRE CLASS="verbatim">From = To = jid()
-</PRE></DD></DL><PRE CLASS="verbatim">-module(mod_cputime).
-
-behaviour(gen_mod).
-
-export([start/2,
-         stop/1,
-         process_local_iq/3]).
-
-include("ejabberd.hrl").
-include("jlib.hrl").
-
-define(NS_CPUTIME, "ejabberd:cputime").
-
-start(Host, Opts) -&gt;
-    IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue),
-    gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_CPUTIME,
-                                  ?MODULE, process_local_iq, IQDisc).
-
-stop(Host) -&gt;
-    gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_CPUTIME).
-
-process_local_iq(From, To, {iq, ID, Type, XMLNS, SubEl}) -&gt;
-    case Type of
-        set -&gt;
-            {iq, ID, error, XMLNS,
-             [SubEl, ?ERR_NOT_ALLOWED]};
-        get -&gt;
-            CPUTime = element(1, erlang:statistics(runtime))/1000,
-            SCPUTime = lists:flatten(io_lib:format("~.3f", CPUTime)),
-            {iq, ID, result, XMLNS,
-             [{xmlelement, "query",
-               [{"xmlns", ?NS_CPUTIME}],
-               [{xmlelement, "cputime", [], [{xmlcdata, SCPUTime}]}]}]}
-    end.
-</PRE><!--TOC subsection Services-->
-<H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc15">8.2</A>&#XA0;&#XA0;Services</H3><!--SEC END --><P>
-<A NAME="services"></A></P><PRE CLASS="verbatim">-module(mod_echo).
-
-behaviour(gen_mod).
-
-export([start/2, init/1, stop/1]).
-
-include("ejabberd.hrl").
-include("jlib.hrl").
-
-start(Host, Opts) -&gt;
-    MyHost = gen_mod:get_opt(host, Opts, "echo." ++ Host),
-    register(gen_mod:get_module_proc(Host, ?PROCNAME),
-             spawn(?MODULE, init, [MyHost])).
-
-init(Host) -&gt;
-    ejabberd_router:register_local_route(Host),
-    loop(Host).
-
-loop(Host) -&gt;
-    receive
-        {route, From, To, Packet} -&gt;
-            ejabberd_router:route(To, From, Packet),
-            loop(Host);
-        stop -&gt;
-            ejabberd_router:unregister_route(Host),
-            ok;
-        _ -&gt;
-            loop(Host)
-    end.
-
-stop(Host) -&gt;
-    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-    Proc ! stop,
-    {wait, Proc}.
-</PRE><!--CUT END -->
-<!--HTMLFOOT-->
-<!--ENDHTML-->
-<!--FOOTER-->
-<HR SIZE=2><BLOCKQUOTE CLASS="quote"><EM>This document was translated from L<sup>A</sup>T<sub>E</sub>X by
-</EM><A HREF="http://hevea.inria.fr/index.html"><EM>H</EM><EM><FONT SIZE=2><sup>E</sup></FONT></EM><EM>V</EM><EM><FONT SIZE=2><sup>E</sup></FONT></EM><EM>A</EM></A><EM>.</EM></BLOCKQUOTE></BODY>
-</HTML>
@@ -1,467 +0,0 @@
-\documentclass[a4paper,10pt]{article}
-
-%% Packages
-\usepackage{graphics}
-\usepackage{hevea}
-\usepackage{makeidx}
-\usepackage{verbatim}
-
-%% Index
-\makeindex
-% Remove the index anchors from the HTML version to save size and bandwith.
-\newcommand{\ind}[1]{\begin{latexonly}\index{#1}\end{latexonly}}
-
-%% Images
-\newcommand{\logoscale}{0.7}
-\newcommand{\imgscale}{0.58}
-\newcommand{\insimg}[1]{\insscaleimg{\imgscale}{#1}}
-\newcommand{\insscaleimg}[2]{
-  \imgsrc{#2}{}
-  \begin{latexonly}
-    \scalebox{#1}{\includegraphics{#2}}
-  \end{latexonly}
-}
-
-%% Various
-\newcommand{\ns}[1]{\texttt{#1}}
-\newcommand{\ejabberd}{\texttt{ejabberd}}
-\newcommand{\Jabber}{Jabber}
-\newcommand{\XMPP}{XMPP}
-
-%% Modules
-\newcommand{\module}[1]{\texttt{#1}}
-\newcommand{\modadhoc}{\module{mod\_adhoc}}
-\newcommand{\modannounce}{\module{mod\_announce}}
-\newcommand{\modconfigure}{\module{mod\_configure}}
-\newcommand{\moddisco}{\module{mod\_disco}}
-\newcommand{\modecho}{\module{mod\_echo}}
-\newcommand{\modirc}{\module{mod\_irc}}
-\newcommand{\modlast}{\module{mod\_last}}
-\newcommand{\modlastodbc}{\module{mod\_last\_odbc}}
-\newcommand{\modmuc}{\module{mod\_muc}}
-\newcommand{\modmuclog}{\module{mod\_muc\_log}}
-\newcommand{\modoffline}{\module{mod\_offline}}
-\newcommand{\modofflineodbc}{\module{mod\_offline\_odbc}}
-\newcommand{\modprivacy}{\module{mod\_privacy}}
-\newcommand{\modprivate}{\module{mod\_private}}
-\newcommand{\modpubsub}{\module{mod\_pubsub}}
-\newcommand{\modregister}{\module{mod\_register}}
-\newcommand{\modroster}{\module{mod\_roster}}
-\newcommand{\modrosterodbc}{\module{mod\_roster\_odbc}}
-\newcommand{\modservicelog}{\module{mod\_service\_log}}
-\newcommand{\modsharedroster}{\module{mod\_shared\_roster}}
-\newcommand{\modstats}{\module{mod\_stats}}
-\newcommand{\modtime}{\module{mod\_time}}
-\newcommand{\modvcard}{\module{mod\_vcard}}
-\newcommand{\modvcardldap}{\module{mod\_vcard\_ldap}}
-\newcommand{\modvcardodbc}{\module{mod\_vcard\_odbc}}
-\newcommand{\modversion}{\module{mod\_version}}
-
-%% Title page
-\include{version}
-\title{Ejabberd \version\ Developers Guide}
-\author{Alexey Shchepin \\
-  \ahrefurl{mailto:alexey@sevcom.net} \\
-  \ahrefurl{xmpp:aleksey@jabber.ru}}
-
-%% Options
-\newcommand{\marking}[1]{#1} % Marking disabled
-\newcommand{\quoting}[2][yozhik]{} % Quotes disabled
-\newcommand{\new}{\begin{latexonly}\marginpar{\textsc{new}}\end{latexonly}} % Highlight new features
-\newcommand{\improved}{\begin{latexonly}\marginpar{\textsc{improved}}\end{latexonly}} % Highlight improved features
-\newcommand{\moreinfo}[1]{} % Hide details
-
-%% Footnotes
-\newcommand{\txepref}[2]{\footahref{http://www.xmpp.org/extensions/xep-#1.html}{#2}}
-\newcommand{\xepref}[1]{\txepref{#1}{XEP-#1}}
-
-\begin{document}
-
-\label{titlepage}
-\begin{titlepage}
-  \maketitle{}
-
-  \begin{center}
-  {\insscaleimg{\logoscale}{logo.png}
-    \par
-  }
-  \end{center}
-
-  \begin{quotation}\textit{I can thoroughly recommend ejabberd for ease of setup --
-  Kevin Smith, Current maintainer of the Psi project}\end{quotation}
-
-\end{titlepage}
-
-\tableofcontents{}
-
-% Input introduction.tex
-\input{introduction}
-
-\section{How it Works}
-\label{howitworks}
-
-
-A \XMPP{} domain is served by one or more \ejabberd{} nodes.  These nodes can
-be run on different machines that are connected via a network.  They all must
-have the ability to connect to port 4369 of all another nodes, and must have
-the same magic cookie (see Erlang/OTP documentation, in other words the file
-\texttt{\~{}ejabberd/.erlang.cookie} must be the same on all nodes). This is
-needed because all nodes exchange information about connected users, S2S
-connections, registered services, etc\ldots
-
-
-
-Each \ejabberd{} node have following modules:
-\begin{itemize}
-\item router;
-\item local router.
-\item session manager;
-\item S2S manager;
-\end{itemize}
-
-
-\subsection{Router}
-
-This module is the main router of \XMPP{} packets on each node.  It routes
-them based on their destinations domains.  It has two tables: local and global
-routes.  First, domain of packet destination searched in local table, and if it
-found, then the packet is routed to appropriate process.  If no, then it
-searches in global table, and is routed to the appropriate \ejabberd{} node or
-process.  If it does not exists in either tables, then it sent to the S2S
-manager.
-
-
-\subsection{Local Router}
-
-This module routes packets which have a destination domain equal to this server
-name.  If destination JID has a non-empty user part, then it routed to the
-session manager, else it is processed depending on it's content.
-
-
-\subsection{Session Manager}
-
-This module routes packets to local users.  It searches for what user resource
-packet must be sended via presence table.  If this resource is connected to
-this node, it is routed to C2S process, if it connected via another node, then
-the packet is sent to session manager on that node.
-
-
-\subsection{S2S Manager}
-
-This module routes packets to other \XMPP{} servers.  First, it checks if an
-open S2S connection from the domain of the packet source to the domain of
-packet destination already exists. If it is open on another node, then it
-routes the packet to S2S manager on that node, if it is open on this node, then
-it is routed to the process that serves this connection, and if a connection
-does not exist, then it is opened and registered.
-
-
-\section{Authentication}
-
-\subsubsection{External}
-\label{externalauth}
-\ind{external authentication}
-
-The external authentication script follows
-\footahref{http://www.erlang.org/doc/tutorial/c_portdriver.html}{the erlang port driver API}.
-
-That script is supposed to do theses actions, in an infinite loop:
-\begin{itemize}
-\item read from stdin: AABBBBBBBBB.....
-    \begin{itemize}
-    \item A: 2 bytes of length data (a short in network byte order)
-    \item B: a string of length found in A that contains operation in plain text
-    operation are as follows:
-    \begin{itemize}
-    \item auth:User:Server:Password (check if a username/password pair is correct)
-    \item isuser:User:Server (check if it's a valid user)
-    \item setpass:User:Server:Password (set user's password)
-    \end{itemize}
-    \end{itemize}
-\item write to stdout: AABB
-    \begin{itemize}
-    \item A: the number 2 (coded as a short, which is bytes length of following result)
-    \item B: the result code (coded as a short), should be 1 for success/valid, or 0 for failure/invalid
-    \end{itemize}
-\end{itemize}
-
-Example python script
-\begin{verbatim}
-#!/usr/bin/python
-
-import sys
-from struct import *
-
-def from_ejabberd():
-    input_length = sys.stdin.read(2)
-    (size,) = unpack('>h', input_length)
-    return sys.stdin.read(size).split(':')
-
-def to_ejabberd(bool):
-    answer = 0
-    if bool:
-        answer = 1
-    token = pack('>hh', 2, answer)
-    sys.stdout.write(token)
-    sys.stdout.flush()
-
-def auth(username, server, password):
-    return True
-
-def isuser(username, server):
-    return True
-
-def setpass(username, server, password):
-    return True
-
-while True:
-    data = from_ejabberd()
-    success = False
-    if data[0] == "auth":
-        success = auth(data[1], data[2], data[3])
-    elif data[0] == "isuser":
-        success = isuser(data[1], data[2])
-    elif data[0] == "setpass":
-        success = setpass(data[1], data[2], data[3])
-    to_ejabberd(success)
-\end{verbatim}
-
-\section{XML Representation}
-\label{xmlrepr}
-
-Each XML stanza is represented as the following tuple:
-\begin{verbatim}
-XMLElement = {xmlelement, Name, Attrs, [ElementOrCDATA]}
-        Name = string()
-        Attrs = [Attr]
-        Attr = {Key, Val}
-        Key = string()
-        Val = string()
-        ElementOrCDATA = XMLElement | CDATA
-        CDATA = {xmlcdata, string()}
-\end{verbatim}
-E.\,g. this stanza:
-\begin{verbatim}
-<message to='test@conference.example.org' type='groupchat'>
-  <body>test</body>
-</message>
-\end{verbatim}
-is represented as the following structure:
-\begin{verbatim}
-{xmlelement, "message",
-    [{"to", "test@conference.example.org"},
-     {"type", "groupchat"}],
-    [{xmlelement, "body",
-         [],
-         [{xmlcdata, "test"}]}]}}
-\end{verbatim}
-
-
-
-\section{Module \texttt{xml}}
-\label{xmlmod}
-
-\begin{description}
-\item{\verb|element_to_string(El) -> string()|}
-\begin{verbatim}
-El = XMLElement
-\end{verbatim}
-  Returns string representation of XML stanza \texttt{El}.
-
-\item{\verb|crypt(S) -> string()|}
-\begin{verbatim}
-S = string()
-\end{verbatim}
-  Returns string which correspond to \texttt{S} with encoded XML special
-  characters.
-
-\item{\verb|remove_cdata(ECList) -> EList|}
-\begin{verbatim}
-ECList = [ElementOrCDATA]
-EList = [XMLElement]
-\end{verbatim}
-  \texttt{EList} is a list of all non-CDATA elements of ECList.
-
-
-
-\item{\verb|get_path_s(El, Path) -> Res|}
-\begin{verbatim}
-El = XMLElement
-Path = [PathItem]
-PathItem = PathElem | PathAttr | PathCDATA
-PathElem = {elem, Name}
-PathAttr = {attr, Name}
-PathCDATA = cdata
-Name = string()
-Res = string() | XMLElement
-\end{verbatim}
-  If \texttt{Path} is empty, then returns \texttt{El}.  Else sequentially
-  consider elements of \texttt{Path}.  Each element is one of:
-  \begin{description}
-  \item{\verb|{elem, Name}|} \texttt{Name} is name of subelement of
-    \texttt{El}, if such element exists, then this element considered in
-    following steps, else returns empty string.
-  \item{\verb|{attr, Name}|} If \texttt{El} have attribute \texttt{Name}, then
-    returns value of this attribute, else returns empty string.
-  \item{\verb|cdata|} Returns CDATA of \texttt{El}.
-  \end{description}
-
-\item{TODO:}
-\begin{verbatim}
-         get_cdata/1, get_tag_cdata/1
-         get_attr/2, get_attr_s/2
-         get_tag_attr/2, get_tag_attr_s/2
-         get_subtag/2
-\end{verbatim}
-\end{description}
-
-
-\section{Module \texttt{xml\_stream}}
-\label{xmlstreammod}
-
-\begin{description}
-\item{\verb!parse_element(Str) -> XMLElement | {error, Err}!}
-\begin{verbatim}
-Str = string()
-Err = term()
-\end{verbatim}
-  Parses \texttt{Str} using XML parser, returns either parsed element or error
-  tuple.
-\end{description}
-
-
-\section{Modules}
-\label{emods}
-
-
-%\subsection{gen\_mod behaviour}
-%\label{genmod}
-
-%TBD
-
-\subsection{Module gen\_iq\_handler}
-\label{geniqhandl}
-
-The module \verb|gen_iq_handler| allows to easily write handlers for IQ packets
-of particular XML namespaces that addressed to server or to users bare JIDs.
-
-In this module the following functions are defined:
-\begin{description}
-\item{\verb|add_iq_handler(Component, Host, NS, Module, Function, Type)|}
-\begin{verbatim}
-Component = Module = Function = atom()
-Host = NS = string()
-Type = no_queue | one_queue | parallel
-\end{verbatim}
-  Registers function \verb|Module:Function| as handler for IQ packets on
-  virtual host \verb|Host| that contain child of namespace \verb|NS| in
-  \verb|Component|.  Queueing discipline is \verb|Type|.  There are at least
-  two components defined:
-  \begin{description}
-  \item{\verb|ejabberd_local|} Handles packets that addressed to server JID;
-  \item{\verb|ejabberd_sm|} Handles packets that addressed to users bare JIDs.
-  \end{description}
-\item{\verb|remove_iq_handler(Component, Host, NS)|}
-\begin{verbatim}
-Component = atom()
-Host = NS = string()
-\end{verbatim}
-  Removes IQ handler on virtual host \verb|Host| for namespace \verb|NS| from
-  \verb|Component|.
-\end{description}
-
-Handler function must have the following type:
-\begin{description}
-\item{\verb|Module:Function(From, To, IQ)|}
-\begin{verbatim}
-From = To = jid()
-\end{verbatim}
-\end{description}
-
-
-
-\begin{verbatim}
-module(mod_cputime).
-
-behaviour(gen_mod).
-
-export([start/2,
-         stop/1,
-         process_local_iq/3]).
-
-include("ejabberd.hrl").
-include("jlib.hrl").
-
-define(NS_CPUTIME, "ejabberd:cputime").
-
-start(Host, Opts) ->
-    IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue),
-    gen_iq_handler:add_iq_handler(ejabberd_local, Host, ?NS_CPUTIME,
-                                  ?MODULE, process_local_iq, IQDisc).
-
-stop(Host) ->
-    gen_iq_handler:remove_iq_handler(ejabberd_local, Host, ?NS_CPUTIME).
-
-process_local_iq(From, To, {iq, ID, Type, XMLNS, SubEl}) ->
-    case Type of
-        set ->
-            {iq, ID, error, XMLNS,
-             [SubEl, ?ERR_NOT_ALLOWED]};
-        get ->
-            CPUTime = element(1, erlang:statistics(runtime))/1000,
-            SCPUTime = lists:flatten(io_lib:format("~.3f", CPUTime)),
-            {iq, ID, result, XMLNS,
-             [{xmlelement, "query",
-               [{"xmlns", ?NS_CPUTIME}],
-               [{xmlelement, "cputime", [], [{xmlcdata, SCPUTime}]}]}]}
-    end.
-\end{verbatim}
-
-
-\subsection{Services}
-\label{services}
-
-%TBD
-
-
-%TODO: use \verb|proc_lib|
-\begin{verbatim}
-module(mod_echo).
-
-behaviour(gen_mod).
-
-export([start/2, init/1, stop/1]).
-
-include("ejabberd.hrl").
-include("jlib.hrl").
-
-start(Host, Opts) ->
-    MyHost = gen_mod:get_opt(host, Opts, "echo." ++ Host),
-    register(gen_mod:get_module_proc(Host, ?PROCNAME),
-             spawn(?MODULE, init, [MyHost])).
-
-init(Host) ->
-    ejabberd_router:register_local_route(Host),
-    loop(Host).
-
-loop(Host) ->
-    receive
-        {route, From, To, Packet} ->
-            ejabberd_router:route(To, From, Packet),
-            loop(Host);
-        stop ->
-            ejabberd_router:unregister_route(Host),
-            ok;
-        _ ->
-            loop(Host)
-    end.
-
-stop(Host) ->
-    Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
-    Proc ! stop,
-    {wait, Proc}.
-\end{verbatim}
-
-
-
-\end{document}
@@ -1,132 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-            "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE>Ejabberd 2.1.2 Feature Sheet
-</TITLE>
-
-<META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<META name="GENERATOR" content="hevea 1.10">
-<STYLE type="text/css">
-.li-itemize{margin:1ex 0ex;}
-.li-enumerate{margin:1ex 0ex;}
-.dd-description{margin:0ex 0ex 1ex 4ex;}
-.dt-description{margin:0ex;}
-.toc{list-style:none;}
-.thefootnotes{text-align:left;margin:0ex;}
-.dt-thefootnotes{margin:0em;}
-.dd-thefootnotes{margin:0em 0em 0em 2em;}
-.footnoterule{margin:1em auto 1em 0px;width:50%;}
-.caption{padding-left:2ex; padding-right:2ex; margin-left:auto; margin-right:auto}
-.title{margin:2ex auto;text-align:center}
-.center{text-align:center;margin-left:auto;margin-right:auto;}
-.flushleft{text-align:left;margin-left:0ex;margin-right:auto;}
-.flushright{text-align:right;margin-left:auto;margin-right:0ex;}
-DIV TABLE{margin-left:inherit;margin-right:inherit;}
-PRE{text-align:left;margin-left:0ex;margin-right:auto;}
-BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
-TD P{margin:0px;}
-.boxed{border:1px solid black}
-.textboxed{border:1px solid black}
-.vbar{border:none;width:2px;background-color:black;}
-.hbar{border:none;height:2px;width:100%;background-color:black;}
-.hfill{border:none;height:1px;width:200%;background-color:black;}
-.vdisplay{border-collapse:separate;border-spacing:2px;width:auto; empty-cells:show; border:2px solid red;}
-.vdcell{white-space:nowrap;padding:0px;width:auto; border:2px solid green;}
-.display{border-collapse:separate;border-spacing:2px;width:auto; border:none;}
-.dcell{white-space:nowrap;padding:0px;width:auto; border:none;}
-.dcenter{margin:0ex auto;}
-.vdcenter{border:solid #FF8000 2px; margin:0ex auto;}
-.minipage{text-align:left; margin-left:0em; margin-right:auto;}
-.marginpar{border:solid thin black; width:20%; text-align:left;}
-.marginparleft{float:left; margin-left:0ex; margin-right:1ex;}
-.marginparright{float:right; margin-left:1ex; margin-right:0ex;}
-.theorem{text-align:left;margin:1ex auto 1ex 0ex;}
-.part{margin:2ex auto;text-align:center}
-SPAN{width:20%; float:right; text-align:left; margin-left:auto;}
-</STYLE>
-</HEAD>
-<BODY >
-<!--HEVEA command line is: /usr/bin/hevea -fix -pedantic features.tex -->
-<!--CUT DEF section 1 --><P><A NAME="titlepage"></A>
-
-</P><TABLE CLASS="title"><TR><TD><H1 CLASS="titlemain">Ejabberd 2.1.2 Feature Sheet</H1><H3 CLASS="titlerest">Sander Devrieze<BR>
- <A HREF="mailto:s.devrieze@pandora.be"><TT>mailto:s.devrieze@pandora.be</TT></A><BR>
- <A HREF="xmpp:sander@devrieze.dyndns.org"><TT>xmpp:sander@devrieze.dyndns.org</TT></A></H3></TD></TR>
-</TABLE><DIV CLASS="center">
-
-<IMG SRC="logo.png" ALT="logo.png">
-
-
-</DIV><BLOCKQUOTE CLASS="quotation"><FONT COLOR="#921700"><I>I can thoroughly recommend ejabberd for ease of setup &#X2013;
-Kevin Smith, Current maintainer of the Psi project</I></FONT></BLOCKQUOTE><P>Introduction
-<A NAME="intro"></A></P><BLOCKQUOTE CLASS="quotation"><FONT COLOR="#921700"><I>I just tried out ejabberd and was impressed both by ejabberd itself and the language it is written in, Erlang. &#X2014;
-Joeri</I></FONT></BLOCKQUOTE><P><TT>ejabberd</TT> is a <B><FONT SIZE=4><FONT COLOR="#001376">free and open source</FONT></FONT></B> instant messaging server written in <A HREF="http://www.erlang.org/">Erlang/OTP</A>.</P><P><TT>ejabberd</TT> is <B><FONT SIZE=4><FONT COLOR="#001376">cross-platform</FONT></FONT></B>, distributed, fault-tolerant, and based on open standards to achieve real-time communication.</P><P><TT>ejabberd</TT> is designed to be a <B><FONT SIZE=4><FONT COLOR="#001376">rock-solid and feature rich</FONT></FONT></B> XMPP server.</P><P><TT>ejabberd</TT> is suitable for small deployments, whether they need to be <B><FONT SIZE=4><FONT COLOR="#001376">scalable</FONT></FONT></B> or not, as well as extremely big deployments.</P><!--TOC section Key Features-->
-<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc1"></A>Key Features</H2><!--SEC END --><P>
-<A NAME="keyfeatures"></A>
-</P><BLOCKQUOTE CLASS="quotation"><FONT COLOR="#921700"><I>Erlang seems to be tailor-made for writing stable, robust servers. &#X2014;
-Peter Saint-Andr&#XE9;, Executive Director of the Jabber Software Foundation</I></FONT></BLOCKQUOTE><P><TT>ejabberd</TT> is:
-</P><UL CLASS="itemize"><LI CLASS="li-itemize">
-<B><FONT SIZE=4><FONT COLOR="#001376">Cross-platform:</FONT></FONT></B> <TT>ejabberd</TT> runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.</LI><LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Distributed:</FONT></FONT></B> You can run <TT>ejabberd</TT> on a cluster of machines and all of them will serve the same Jabber domain(s). When you need more capacity you can simply add a new cheap node to your cluster. Accordingly, you do not need to buy an expensive high-end machine to support tens of thousands concurrent users.</LI><LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Fault-tolerant:</FONT></FONT></B> You can deploy an <TT>ejabberd</TT> cluster so that all the information required for a properly working service will be replicated permanently on all nodes. This means that if one of the nodes crashes, the others will continue working without disruption. In addition, nodes also can be added or replaced &#X2018;on the fly&#X2019;.</LI><LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Administrator Friendly:</FONT></FONT></B> <TT>ejabberd</TT> is built on top of the Open Source Erlang. As a result you do not need to install an external database, an external web server, amongst others because everything is already included, and ready to run out of the box. Other administrator benefits include:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Comprehensive documentation.
-</LI><LI CLASS="li-itemize">Straightforward installers for Linux, Mac OS X, and Windows. </LI><LI CLASS="li-itemize">Web Administration.
-</LI><LI CLASS="li-itemize">Shared Roster Groups.
-</LI><LI CLASS="li-itemize">Command line administration tool. </LI><LI CLASS="li-itemize">Can integrate with existing authentication mechanisms.
-</LI><LI CLASS="li-itemize">Capability to send announce messages.
-</LI></UL></LI><LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Internationalized:</FONT></FONT></B> <TT>ejabberd</TT> leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Translated to 25 languages. </LI><LI CLASS="li-itemize">Support for <A HREF="http://www.ietf.org/rfc/rfc3490.txt">IDNA</A>.
-</LI></UL></LI><LI CLASS="li-itemize"><B><FONT SIZE=4><FONT COLOR="#001376">Open Standards:</FONT></FONT></B> <TT>ejabberd</TT> is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Fully XMPP compliant.
-</LI><LI CLASS="li-itemize">XML-based protocol.
-</LI><LI CLASS="li-itemize"><A HREF="http://www.ejabberd.im/protocols">Many protocols supported</A>.
-</LI></UL></LI></UL><!--TOC section Additional Features-->
-<H2 CLASS="section"><!--SEC ANCHOR --><A NAME="htoc2"></A>Additional Features</H2><!--SEC END --><P>
-<A NAME="addfeatures"></A>
-</P><BLOCKQUOTE CLASS="quotation"><FONT COLOR="#921700"><I>ejabberd is making inroads to solving the "buggy incomplete server" problem &#X2014;
-Justin Karneges, Founder of the Psi and the Delta projects</I></FONT></BLOCKQUOTE><P>Moreover, <TT>ejabberd</TT> comes with a wide range of other state-of-the-art features:
-</P><UL CLASS="itemize"><LI CLASS="li-itemize">
-Modular
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Load only the modules you want.
-</LI><LI CLASS="li-itemize">Extend <TT>ejabberd</TT> with your own custom modules.
-</LI></UL>
-</LI><LI CLASS="li-itemize">Security
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-SASL and STARTTLS for c2s and s2s connections.
-</LI><LI CLASS="li-itemize">STARTTLS and Dialback s2s connections.
-</LI><LI CLASS="li-itemize">Web Admin accessible via HTTPS secure access.
-</LI></UL>
-</LI><LI CLASS="li-itemize">Databases
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Internal database for fast deployment (Mnesia).
-</LI><LI CLASS="li-itemize">Native MySQL support.
-</LI><LI CLASS="li-itemize">Native PostgreSQL support.
-</LI><LI CLASS="li-itemize">ODBC data storage support.
-</LI><LI CLASS="li-itemize">Microsoft SQL Server support. </LI></UL>
-</LI><LI CLASS="li-itemize">Authentication
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Internal Authentication.
-</LI><LI CLASS="li-itemize">PAM, LDAP and ODBC. </LI><LI CLASS="li-itemize">External Authentication script.
-</LI></UL>
-</LI><LI CLASS="li-itemize">Others
-<UL CLASS="itemize"><LI CLASS="li-itemize">
-Support for virtual hosting.
-</LI><LI CLASS="li-itemize">Compressing XML streams with Stream Compression (<A HREF="http://www.xmpp.org/extensions/xep-0138.html">XEP-0138</A>).
-</LI><LI CLASS="li-itemize">Statistics via Statistics Gathering (<A HREF="http://www.xmpp.org/extensions/xep-0039.html">XEP-0039</A>).
-</LI><LI CLASS="li-itemize">IPv6 support both for c2s and s2s connections.
-</LI><LI CLASS="li-itemize"><A HREF="http://www.xmpp.org/extensions/xep-0045.html">Multi-User Chat</A> module with support for clustering and HTML logging. </LI><LI CLASS="li-itemize">Users Directory based on users vCards.
-</LI><LI CLASS="li-itemize"><A HREF="http://www.xmpp.org/extensions/xep-0060.html">Publish-Subscribe</A> component with support for <A HREF="http://www.xmpp.org/extensions/xep-0163.html">Personal Eventing via Pubsub</A>.
-</LI><LI CLASS="li-itemize">Support for web clients: <A HREF="http://www.xmpp.org/extensions/xep-0025.html">HTTP Polling</A> and <A HREF="http://www.xmpp.org/extensions/xep-0206.html">HTTP Binding (BOSH)</A> services.
-</LI><LI CLASS="li-itemize">IRC transport.
-</LI><LI CLASS="li-itemize">Component support: interface with networks such as AIM, ICQ and MSN installing special tranports.
-</LI></UL>
-</LI></UL><!--CUT END -->
-<!--HTMLFOOT-->
-<!--ENDHTML-->
-<!--FOOTER-->
-<HR SIZE=2><BLOCKQUOTE CLASS="quote"><EM>This document was translated from L<sup>A</sup>T<sub>E</sub>X by
-</EM><A HREF="http://hevea.inria.fr/index.html"><EM>H</EM><EM><FONT SIZE=2><sup>E</sup></FONT></EM><EM>V</EM><EM><FONT SIZE=2><sup>E</sup></FONT></EM><EM>A</EM></A><EM>.</EM></BLOCKQUOTE></BODY>
-</HTML>
@@ -1,136 +0,0 @@
-\documentclass[a4paper,10pt]{article}
-
-%% Packages
-\usepackage{epsfig}
-\usepackage{fancyhdr}
-\usepackage{graphics}
-\usepackage{hevea}
-\usepackage[pdftex,colorlinks,unicode,urlcolor=blue,linkcolor=blue,pdftitle=Ejabberd\
-        Feature\ Sheet,pdfauthor=Sander\
-        Devrieze,pdfsubject=ejabberd,pdfkeywords=ejabberd]{hyperref}
-\usepackage{verbatim}
-\usepackage{color}
-
-%% Index
-% Remove the index anchors from the HTML version to save size and bandwith.
-\newcommand{\ind}[1]{\begin{latexonly}\index{#1}\end{latexonly}}
-
-%% Images
-\newcommand{\logoscale}{0.7}
-\newcommand{\imgscale}{0.58}
-\newcommand{\insimg}[1]{\insscaleimg{\imgscale}{#1}}
-\newcommand{\insscaleimg}[2]{
-  \imgsrc{#2}{}
-  \begin{latexonly}
-    \scalebox{#1}{\includegraphics{#2}}
-  \end{latexonly}
-}
-
-%% Various
-\newcommand{\bracehack}{\def\{{\char"7B}\def\}{\char"7D}}
-\newcommand{\titem}[1]{\item[\bracehack\texttt{#1}]}
-\newcommand{\ns}[1]{\texttt{#1}}
-\newcommand{\jid}[1]{\texttt{#1}}
-\newcommand{\option}[1]{\texttt{#1}}
-\newcommand{\poption}[1]{{\bracehack\texttt{#1}}}
-\newcommand{\node}[1]{\texttt{#1}}
-\newcommand{\term}[1]{\texttt{#1}}
-\newcommand{\shell}[1]{\texttt{#1}}
-\newcommand{\ejabberd}{\texttt{ejabberd}}
-\newcommand{\Jabber}{Jabber}
-
-%% Title page
-\include{version}
-\title{Ejabberd \version\ Feature Sheet}
-\author{Sander Devrieze \\
-  \ahrefurl{mailto:s.devrieze@pandora.be} \\
-  \ahrefurl{xmpp:sander@devrieze.dyndns.org}}
-
-% Options
-\newcommand{\marking}[1]{\textbf{\begin{large}\textcolor{ejblue}{#1}\end{large}}} % Marking enabled
-\newcommand{\quoting}[2][yozhik]{\begin{quotation}\textcolor{#1}{\textit{#2}}\end{quotation}} % Quotes enabled
-\newcommand{\new}{\marginpar{\textcolor{red}{\textsc{new}}}} % Highlight new features
-\newcommand{\improved}{\marginpar{\textcolor{orange}{\textsc{improved}}}} % Highlight improved features
-\setcounter{secnumdepth}{-1} % Disable section numbering
-
-%% To by-pass errors in the HTML version.
-\newstyle{SPAN}{width:20\%; float:right; text-align:left; margin-left:auto;}
-\definecolor{orange}       {cmyk}{0.000,0.333,1.000,0.000}
-
-%% Footnotes
-\begin{latexonly}
-\global\parskip=9pt plus 3pt minus 1pt
-\global\parindent=0pt
-\gdef\ahrefurl#1{\href{#1}{\texttt{#1}}}
-\gdef\footahref#1#2{#2\footnote{\href{#1}{\texttt{#1}}}}
-\end{latexonly}
-\newcommand{\txepref}[2]{\footahref{http://www.xmpp.org/extensions/xep-#1.html}{#2}}
-\newcommand{\xepref}[1]{\txepref{#1}{XEP-#1}}
-
-%% Fancy header
-\fancyhf{}
-\pagestyle{fancy}
-\rhead{\textcolor{ejblue}{The Expandable Jabber/XMPP Daemon.}}
-\renewcommand{\headrule}{{\color{ejblue}%
-\hrule width\headwidth height\headrulewidth \vskip-\headrulewidth}}
-\lhead{\setlength{\unitlength}{-6mm}
-  \begin{picture}(0,0)
-    \put(5.8,3.25){\includegraphics[width=1.3\textwidth]{yozhikheader.png}}
-  \end{picture}}
-
-% Official ejabberd colours
-\definecolor{ejblue}       {cmyk}{1.000,0.831,0.000,0.537} %RGB: 0,0,118	HTML: 000076
-\definecolor{ejgreenyellow}{cmyk}{0.079,0.000,0.275,0.102} %RGB: 209,229,159	HTML: d1e59f
-\definecolor{ejgreendark}  {cmyk}{0.131,0.000,0.146,0.220} %RGB: 166,199,162	HTML: a6c7a2
-\definecolor{ejgreen}      {cmyk}{0.077,0.000,0.081,0.078} %RGB: 216,236,215	HTML: d8ecd7
-\definecolor{ejgreenwhite} {cmyk}{0.044,0.000,0.048,0.020} %RGB: 239,250,238	HTML: effaee
-\definecolor{yozhik}       {cmyk}{0.000,0.837,1.000,0.424} %RGB: 147,0,0	HTML: 930000
-
-\begin{document}
-
-\label{titlepage}
-\begin{titlepage}
-  \maketitle{}
-
-  \thispagestyle{empty}
-
-  \begin{center}
-  {\insscaleimg{\logoscale}{logo.png}
-    \par
-  }
-  \end{center}
-  \quoting{I can thoroughly recommend ejabberd for ease of setup --
-  Kevin Smith, Current maintainer of the Psi project}
-
-\end{titlepage}
-
-\newpage
-% Set the page counter to 2 so that the titlepage and the second page do not
-% have the same page number. This fixes the PDFLaTeX warning "destination with
-% the same identifier".
-\begin{latexonly}
-\setcounter{page}{2}
-\pagecolor{ejgreenwhite}
-\end{latexonly}
-
-% Input introduction.tex
-\input{introduction}
-
-\end{document}
-
-%% TODO
-% * illustrations (e.g. screenshot from web interface)
-% * commented parts
-% * slides, guide and html version
-% * cleaning and improving LaTeX code
-% * key features: something like this (shorter)? (more focussed on Erlang now): "To reach the goal of high
-%   availability, performance and clustering, ejabberd is written in Erlang, a programming language perfectly
-%   suited for this. Besides that, some parts are written in C to also incude the advantages of this language. In
-%   short, ejabberd is a perfect mix of mainly Erlang code, peppered with some C code to get the final touch!"
-%   <picture of a cocktail>
-% * key features: saying that ejabberd the only XMPP server is that can do real clustering:
-%   http://www.jivesoftware.org/forums/thread.jspa?threadID=14602
-%   "What I find interesting is that *no* XMPP servers truly provide clustering. This includes all the commercial
-%   servers. The one partial exception appears to be ejabberd, which can cluster certain data such as sessions,
-%   but not all services such as MUC."
-% * try it today: links to migration tutorials
@@ -1,105 +0,0 @@
-digraph messages {
-	//concentrate=true;
-	subgraph clusterclients {
-		client1 [shape = box];
-		client2 [shape = box];
-		client3 [shape = box];
-
-		style = dashed;
-		label = "Clients";
-	}
-
-	subgraph clusternode1 {
-		subgraph clusterc2s1 {
-			c2s11;
-			c2s12;
-			style = invis;
-		}
-		subgraph clusterservices1 {
-			service11;
-			service12;
-			service13;
-			style = invis;
-		}
-		//subgraph clusters2s1 {
-			//s2s11;
-			//s2s12;
-			//style = invis;
-		//}
-		c2s11     -> auth1;
-		c2s12     -> auth1;
-		auth1     -> c2s11;
-		auth1     -> c2s12;
-		c2s11     -> sm1;
-		c2s11     -> router1;
-		c2s12     -> sm1;
-		c2s12     -> router1;
-		router1   -> local1;
-		router1   -> service11;
-		router1   -> service12;
-		router1   -> service13;
-		router1   -> s2s11;
-		router1   -> s2s12;
-		service11 -> router1;
-		service12 -> router1;
-		service13 -> router1;
-		s2s11     -> router1;
-		s2s12     -> router1;
-		local1    -> sm1;
-		sm1       -> c2s11;
-		sm1       -> c2s12;
-
-		style = dashed;
-		label = "Node1";
-	}
-
-	subgraph clusternode2 {
-		c2s2      -> auth2;
-		auth2     -> c2s2;
-		c2s2      -> sm2;
-		c2s2      -> router2;
-		router2   -> local2;
-		router2   -> service21;
-		router2   -> s2s21;
-		service21 -> router2;
-		s2s21     -> router2;
-		local2    -> sm2;
-		sm2       -> c2s2;
-
-		style = dashed;
-		label = "Node2";
-	}
-
-
-
-	subgraph clusterservers {
-		server1 [shape = box];
-		server2 [shape = box];
-		server3 [shape = box];
-
-		style = dashed;
-		label = "Servers";
-	}
-
-
-	client1 -> c2s11;
-	client2 -> c2s12;
-	client3 -> c2s2;
-	c2s11 -> client1 [constraint=false];
-	c2s12 -> client2 [constraint=false];
-	c2s2  -> client3 [constraint=false];
-
-	s2s11 -> server1 [minlen = 2];
-	s2s12 -> server2 [minlen = 2];
-	s2s21 -> server3 [minlen = 2];
-	server1 -> s2s11 [constraint=false];
-	server2 -> s2s12 [constraint=false];
-	server3 -> s2s21 [constraint=false];
-
-	router1 -> router2;
-	router2 -> router1;
-	sm1     -> sm2;
-	sm2     -> sm1;
-
-	label = "Data Flows";
-}
@@ -1,133 +0,0 @@
-\chapter{Introduction}
-\label{intro}
-
-%% TODO: improve the feature sheet with a nice table to highlight new features.
-
-\quoting{I just tried out ejabberd and was impressed both by ejabberd itself and the language it is written in, Erlang. ---
-Joeri} 
-
-%ejabberd is a free and open source instant messaging server written in Erlang. ejabberd is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication (Jabber/XMPP).
-
-\ejabberd{} is a \marking{free and open source} instant messaging server written in \footahref{http://www.erlang.org/}{Erlang/OTP}.
-
-\ejabberd{} is \marking{cross-platform}, distributed, fault-tolerant, and based on open standards to achieve real-time communication.
-
-\ejabberd{} is designed to be a \marking{rock-solid and feature rich} XMPP server.
-
-\ejabberd{} is suitable for small deployments, whether they need to be \marking{scalable} or not, as well as extremely big deployments.
-
-%\subsection{Layout with example deployment (title needs a better name)}
-%\label{layout}
-
-%In this section there will be a graphical overview like these:\\
-%\verb|http://www.tipic.com/var/timp/timp_dep.gif| \\
-%\verb|http://www.jabber.com/images/jabber_Com_Platform.jpg| \\
-%\verb|http://www.antepo.com/files/OPN45systemdatasheet.pdf| \\
-
-%A page full with names of Jabber client that are known to work with ejabberd. \begin{tiny}tiny font\end{tiny}
-
-%\subsection{Try It Today}
-%\label{trytoday}
-
-%(Not sure if I will include/finish this section for the next version.)
-
-%\begin{itemize}
-%\item Erlang REPOS
-%\item Packages in distributions
-%\item Windows binary
-%\item source tar.gz
-%\item Migration from Jabberd14 (and so also Jabberd2 because you can migrate from version 2 back to 14) and Jabber Inc. XCP possible.
-%\end{itemize}
-
-\newpage
-\section{Key Features}
-\label{keyfeatures}
-\ind{features!key features}
-
-\quoting{Erlang seems to be tailor-made for writing stable, robust servers. ---
-Peter Saint-Andr\'e, Executive Director of the Jabber Software Foundation}
-
-\ejabberd{} is:
-\begin{itemize}
-\item \marking{Cross-platform:} \ejabberd{} runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.
-
-\item \marking{Distributed:} You can run \ejabberd{} on a cluster of machines and all of them will serve the same \Jabber{} domain(s). When you need more capacity you can simply add a new cheap node to your cluster. Accordingly, you do not need to buy an expensive high-end machine to support tens of thousands concurrent users.
-
-\item \marking{Fault-tolerant:} You can deploy an \ejabberd{} cluster so that all the information required for a properly working service will be replicated permanently on all nodes. This means that if one of the nodes crashes, the others will continue working without disruption. In addition, nodes also can be added or replaced `on the fly'.
-
-\item \marking{Administrator Friendly:} \ejabberd{} is built on top of the Open Source Erlang. As a result you do not need to install an external database, an external web server, amongst others because everything is already included, and ready to run out of the box. Other administrator benefits include:
-\begin{itemize}
-\item Comprehensive documentation.
-\item Straightforward installers for Linux, Mac OS X, and Windows. %%\improved{}
-\item Web Administration.
-\item Shared Roster Groups.
-\item Command line administration tool. %%\improved{}
-\item Can integrate with existing authentication mechanisms.
-\item Capability to send announce messages.
-\end{itemize}
-
-\item \marking{Internationalized:} \ejabberd{} leads in internationalization. Hence it is very well suited in a globalized world. Related features are:
-\begin{itemize}
-\item Translated to 25 languages. %%\improved{}
-\item Support for \footahref{http://www.ietf.org/rfc/rfc3490.txt}{IDNA}.
-\end{itemize}
-
-\item \marking{Open Standards:} \ejabberd{} is the first Open Source Jabber server claiming to fully comply to the XMPP standard.
-\begin{itemize}
-\item Fully XMPP compliant.
-\item XML-based protocol.
-\item \footahref{http://www.ejabberd.im/protocols}{Many protocols supported}.
-\end{itemize}
-
-\end{itemize}
-
-\newpage
-
-\section{Additional Features}
-\label{addfeatures}
-\ind{features!additional features}
-
-\quoting{ejabberd is making inroads to solving the "buggy incomplete server" problem ---
-Justin Karneges, Founder of the Psi and the Delta projects}
-
-Moreover, \ejabberd{} comes with a wide range of other state-of-the-art features:
-\begin{itemize}
-\item Modular
-\begin{itemize}
-\item Load only the modules you want.
-\item Extend \ejabberd{} with your own custom modules.
-\end{itemize}
-\item Security
-\begin{itemize}
-\item SASL and STARTTLS for c2s and s2s connections.
-\item STARTTLS and Dialback s2s connections.
-\item Web Admin accessible via HTTPS secure access.
-\end{itemize}
-\item Databases
-\begin{itemize}
-\item Internal database for fast deployment (Mnesia).
-\item Native MySQL support.
-\item Native PostgreSQL support.
-\item ODBC data storage support.
-\item Microsoft SQL Server support. %%\new{}
-\end{itemize}
-\item Authentication
-\begin{itemize}
-\item Internal Authentication.
-\item PAM, LDAP and ODBC.  %%\improved{}
-\item External Authentication script.
-\end{itemize}
-\item Others
-\begin{itemize}
-\item Support for virtual hosting.
-\item Compressing XML streams with Stream Compression (\xepref{0138}).
-\item Statistics via Statistics Gathering (\xepref{0039}).
-\item IPv6 support both for c2s and s2s connections.
-\item \txepref{0045}{Multi-User Chat} module with support for clustering and HTML logging. %%\improved{}
-\item Users Directory based on users vCards.
-\item \txepref{0060}{Publish-Subscribe} component with support for \txepref{0163}{Personal Eventing via Pubsub}.
-\item Support for web clients: \txepref{0025}{HTTP Polling} and \txepref{0206}{HTTP Binding (BOSH)} services.
-\item IRC transport.
-\item Component support: interface with networks such as AIM, ICQ and MSN installing special tranports.
-\end{itemize}
-\end{itemize}
@@ -1,62 +0,0 @@
-			    Release notes
-			    ejabberd 0.9.1
-
-   This document describes the main changes from [25]ejabberd 0.9.
-
-   The code can be downloaded from the [26]download page.
-
-   For more detailed information, please refer to ejabberd [27]User Guide.
-
-
-Groupchat (Multi-user chat and IRC) improvements
-
-   The multi-user chat code has been improved to comply with the latest version
-   of Jabber Enhancement Proposal 0045.
-
-   The IRC (Internet Relay Chat) features now support WHOIS and USERINFO
-   requests.
-
-
-Web interface
-
-   ejabberd modules management features have been added to the web interface.
-   They now allow to start or stop extension module without restarting the
-   ejabberd server.
-
-
-Publish and subscribe
-
-   It is now possible to a subscribe node with a JabberID that includes a
-   resource.
-
-
-Translations
-
-   A new script has been included to help translate ejabberd into new languages
-   and maintain existing translations.
-
-   As a result, ejabberd is now translating into 10 languages:
-     * Dutch
-     * English
-     * French
-     * German
-     * Polish
-     * Portuguese
-     * Russian
-     * Spanish
-     * Swedish
-     * Ukrainian
-
-
-Migration
-
-   No changes have been made to the database. No particular conversion steps
-   are needed. However, you should backup your database before upgrading to a
-   new ejabberd version.
-
-
-Bugfixes
-
-   This release contains several bugfixes and architectural changes. Please
-   refer to the Changelog file supplied with this release for details of all
-   improvements in the ejabberd code.
@@ -1,99 +0,0 @@
-			    Release notes
-			    ejabberd 0.9.8
-			      2005-08-01
-
-   This document describes the main changes in ejabberd 0.9.8. This
-   version prepares the way for the release of ejabberd 1.0, which 
-   is due later this year.
-
-   The code can be downloaded from the Process-one website:
-   http://www.process-one.net/en/projects/ejabberd/
-
-   For more detailed information, please refer to ejabberd User Guide
-   on the Process-one website:
-   http://www.process-one.net/en/projects/ejabberd/docs.html
-
-
-   Recent changes include....
-
-
-Enhanced virtual hosting
-
-   Virtual hosting applies to many more setting options and
-   features and is transparent. Virtual hosting accepts different
-   parameters for different virtual hosts regarding the following
-   features: authentication method, access control lists and access
-   rules, users management, statistics, and shared roster. The web
-   interface gives access to each virtual host's parameters.
-
-
-Enhanced Publish-Subscribe module
-
-   ejabberd's Publish-Subscribe module integrates enhancements
-   coming from J-EAI, an XMPP-based integration server built on
-   ejabberd. ejabberd thus supports Publish-Subscribe node
-   configuration. It is possible to define nodes that should be
-   persistent, and the number of items to persist. Besides that, it
-   is also possible to define various notification parameters, such
-   as the delivery of the payload with the notifications, and the
-   notification of subscribers when some changes occur on items.
-   Other examples are: the maximum size of the items payload, the
-   subscription approvers, the limitation of the notification to
-   online users only, etc.
-
-
-Code reorganisation and update
-
-   - The mod_register module has been cleaned up.
-   - ODBC support has been updated and several bugs have been fixed.
-
-
-Development API
-
-   To ease the work of Jabber/XMPP developers, a filter_packet hook
-   has been added. As a result it is possible to develop plugins to
-   filter or modify packets flowing through ejabberd.
-
-
-Translations
-
-   - Translations have been updated to support the new Publish-Subscribe features.
-   - A new Brazilian Portuguese translation has been contributed.
-
-
-Web interface
-
-   - The CSS stylesheet from the web interface is W3C compliant.
-
-
-Installers
-
-   Installers are provided for Microsoft Windows and Linux/x86. The
-   Linux installer includes Erlang ASN.1 modules for LDAP
-   authentication support.
-
-
-Bugfixes
-
-   - This release contains several bugfixes and architectural
-     changes. Among other bugfixes include improvements in LDAP
-     authentication. Please refer to the ChangeLog file supplied 
-     with this release regarding all improvements in ejabberd.
-
-
-References
-
-   The ejabberd feature sheet helps comparing with other Jabber/XMPP 
-   servers:
-   http://www.process-one.net/en/projects/ejabberd/docs/features.pdf
-
-   Contributed tutorials of interest are:
-   - Migration from Jabberd1.4 to ejabberd:
-     http://ejabberd.jabber.ru/jabberd1-to-ejabberd
-   - Migration from Jabberd2 to ejabberd:
-     http://ejabberd.jabber.ru/jabberd2-to-ejabberd
-   - Transport configuration for connecting to other networks:
-     http://ejabberd.jabber.ru/tutorials-transports
-
-END
-
@@ -1,88 +0,0 @@
-			    Release notes
-			     ejabberd 0.9
-
-    This document describes the major new features of and changes to
-    ejabberd 0.9, compared to latest public release ejabber 0.7.5.
-
-    For more detailed information, please refer to ejabberd User
-    Guide.
-
-
-Virtual Hosting
-
-    ejabberd now can host several domain on the same instance.
-    This option is enabled by using:
-
-      {hosts, ["erlang-projects.org", "erlang-fr.org"]}.
-
-    instead of the previous host directive.
-
-    Note that you are now using a list of hosts. The main one should
-    be the first listed. See migration section further in this release
-    note for details.
-      
-
-Shared Roster
-
-    Shared roster is a new feature that allow the ejabberd
-    administrator to add jabber user that will be present in the
-    roster of every users on the server.
-    Shared roster are enabled by adding:
-
-            {mod_shared_roster, []}
-
-    at the end of your module list in your ejabberd.cfg file.
-
-
-PostgreSQL (ODBC) support
-
-    This feature is experimental and not yet properly documented. This
-    feature is released for testing purpose.
-
-    You need to have Erlang/OTP R10 to compile with ODBC on various
-    flavour of *nix. You should use Erlang/OTP R10B-4, as this task
-    has became easier with this release. It comes already build in
-    Erlang/OTP Microsoft Windows binary.
-
-    PostgreSQL support is enabled by using the following module in
-    ejabberd.cfg instead of their standard counterpart:
-
-     mod_last_odbc.erl
-     mod_offline_odbc.erl
-     mod_roster_odbc.erl
-
-    The database schema is located in the src/odbc/pq.sql file.
-
-    Look at the src/ejabberd.cfg.example file for more information on
-    how to configure ejabberd with odbc support. You can get support
-    on how to configure ejabberd with a relational database.
-
-
-Migration from ejabberd 0.7.5
-
-    Migration is pretty straightforward as Mnesia database schema
-    conversions is handled automatically. Remember however that you
-    must backup your ejabberd database before migration.
-
-    Here are the following steps to proceed:
-
-    1. Stop your instance of ejabberd.
-
-    2. In ejabberd.cfg, define the host lists. Change the host
-    directive to the hosts one:
-    Before:
-      {host, "erlang-projects.org"}.
-    After:
-      {hosts, ["erlang-projects.org", "erlang-fr.org"]}.
-    Note that when you restart the server the existing users will be
-    affected to the first virtual host, so the order is important. You
-    should keep the previous hostname as the first virtual host.
-
-    3. Restart ejabberd.
-
-
-Bugfixes
-
-    This release contains several bugfixes and architectural changes.
-    Please refer to the Changelog file supplied with this release for
-    details of all improvements in the ejabberd code.
@@ -1,120 +0,0 @@
-			    Release Notes
-			    ejabberd 1.0.0
-			    14 December 2005
-
-   This document describes the main changes in ejabberd 1.0.0. Unique in this
-   version is the compliancy with the XMPP (eXtensible Messaging and Presence
-   Protocol) standard. ejabberd is the first Open Source Jabber server claiming
-   to fully comply to the XMPP standard.
-
-   ejabberd can be downloaded from the Process-one website:
-   http://www.process-one.net/en/projects/ejabberd/
-
-   Detailed information can be found in the ejabberd Feature Sheet and User
-   Guide which are available on the Process-one website:
-   http://www.process-one.net/en/projects/ejabberd/docs.html
-
-
-   Recent changes include:
-
-
-Server-to-server Encryption for Enhanced Security
-
-  - Support for STARTTLS and SASL EXTERNAL to secure server-to-server traffic
-    has been added.
-  - Also, STARTTLS and Dialback has been implemented for server-to-server (s2s)
-    connections. Detailed information about these new features can be found on
-    http://ejabberd.jabber.ru/s2s-encryption
-  - commonName and dNSName fields matching were introduced to ease the process
-    of retrieving certificates.
-  - Different certificates can be defined for each virtual host.
-
-ODBC Support
-
-  - ODBC support has been improved to allow production use of ejabberd with
-    relational databases.
-  - Support for vCard storage in ODBC has been added.
-  - ejd2odbc.erl is a tool to convert an installation from Erlang's database
-    Mnesia to an ODBC compatible relational database.
-
-Native PostgreSQL Support
-
-  - Native PostgreSQL support gives you a better performance when you use
-    PostgreSQL.
-
-Shared Roster groups
-
-  - Shared Roster groups support has been enhanced. New is the ability to add
-    all registered users to everyone's roster. Detailed information about this
-    new feature can be found on http://ejabberd.jabber.ru/shared-roster-all
-
-Web Interface
-
-   - The web interface internal code has been modified for better integration
-     and compliancy with J-EAI, an ejabberd-based Enterprise Application
-     Integration platform.
-   - More XHTML 1.0 Transitional compliancy work was done.
-
-Transports
-
-   - A transport workaround can be enabled during compilation. To do this, you
-     can pass the "--enable-roster-gateway-workaround" option to the configure
-     script. (./configure --enable-roster-gateway-workaround)
-     This option allows transports to add items with subscription "to" in the
-     roster by sending <presence type='subscribed'/> stanza to user. This option
-     is only needed for JIT ICQ transport.
-     Warning: by enabling this option, ejabberd will not be fully XMPP compliant
-              anymore.
-
-Documentation and Internationalization
-
-   - Documentation has been extended to cover more topics.
-   - Translations have been updated.
-
-Bugfixes
-
-   - This release contains several bugfixes.
-   - Among other bugfixes include improvements to the client-to-server (c2s)
-     connection management module.
-   - Please refer to the ChangeLog file supplied
-     with this release regarding all improvements in ejabberd.
-
-
-   Installation Notes
-
-
-Supported Erlang Version
-
-   - You need at least Erlang/OTP R9C to run ejabberd 1.0.0.
-
-Installation
-
-   Installers are provided for Microsoft Windows and Linux/x86.
-   Installers can be retrieved from:
-   http://www.process-one.net/en/projects/ejabberd/download.html
-
-Migration Notes
-
-   - Before any migration, ejabberd system and database must be properly
-     backed up.
-   - When upgrading an ODBC-based installation, you will need to change the
-     relational database schema. The following SQL commands must be run on the
-     database:
-       CREATE SEQUENCE spool_seq_seq;
-       ALTER TABLE spool ADD COLUMN seq integer;
-       ALTER TABLE spool ALTER COLUMN seq SET DEFAULT nextval('spool_seq_seq');
-       UPDATE spool SET seq = DEFAULT;
-       ALTER TABLE spool ALTER COLUMN seq SET NOT NULL;
-
-References
-
-   Contributed tutorials of interest are:
-   - Migration from Jabberd1.4 to ejabberd:
-     http://ejabberd.jabber.ru/jabberd1-to-ejabberd
-   - Migration from Jabberd2 to ejabberd:
-     http://ejabberd.jabber.ru/jabberd2-to-ejabberd
-   - Transport configuration for connecting to other networks:
-     http://ejabberd.jabber.ru/tutorials-transports
-
-END
-
@@ -1,115 +0,0 @@
-				Release Notes
-				ejabberd 1.1.0
-				24 April 2006
-
-   This document describes the main changes in ejabberd 1.1.0. This version
-   introduce new features including support for new Jabber Enhancement
-   Proposals and several performance improvements enabling deployments on an
-   even larger scale than already possible.
-
-   ejabberd can be downloaded from the Process-one website:
-   http://www.process-one.net/en/projects/ejabberd/
-
-   Detailed information can be found in the ejabberd Feature Sheet and User
-   Guide which are available on the Process-one website:
-   http://www.process-one.net/en/projects/ejabberd/docs.html
-
-   A complete list of changes is available from:
-   http://support.process-one.net/secure/ReleaseNote.jspa?projectId=10011&styleName=Html&version=10025
-
-
-   Recent changes include:
-
-
-New Jabber Enhancement Proposal support:
-
-  - JEP-0050: Ad-Hoc Commands.
-  - JEP-0138: Stream Compression.
-  - JEP-0175: SASL anonymous.
-
-Anonymous login
-
-  - SASL anonymous.
-  - Anonymous login for clients that do not yet support SASL Anonymous.
-  
-Relational database Support
-
-  - MySQL is now fully supported through ODBC and in native mode.
-  - Various improvements to the native database interfaces.
-  - The migration tool can use relational databases.
-
-Multi-User Chat improvements
-
-  - Logging of room discussion to text file is now supported.
-  - Better reconfiguration support.
-  - Security oriented fixes.
-  - Several improvements and updates to latest JEP-0045.
-
-Performance scalability improvements for large clusters
-
-  - Improved session synchronisation management between cluster nodes.
-  - Internal architecture has been reworked to use generalize Erlang/OTP
-    framework usage.
-  - Speed improvement on logger.
-  - TCP/IP packet reception change for better network throttling and
-    regulation.
-  As a result, these improvements will reduce load on large scale deployments.
-
-XMPP Protocol related improvements
-
-  - XML stanza size can be limited.
-  - Messages are send to all resources with the same highest priority.
-
-Documentation and Internationalization
-
-   - Documentation has been extended to cover more topics.
-   - Translations have been updated.
-
-Web interface
-
-   - XHTML 1.0 compliance.
-
-Bugfixes
-
-   - This release contains many bugfixes on various areas such as Publish-Subscribe, build
-     chain, installers, IRC gateway, ejabberdctl, amongst others.
-   - Please refer to the ChangeLog file supplied with this release regarding
-     all improvements in ejabberd.
-
-
-
-   Installation Notes
-
-Supported Erlang Version
-
-   - You need at least Erlang/OTP R9C-2 to run ejabberd 1.1.0.
-
-Installation
-
-   Installers are provided for Microsoft Windows, Linux/x86 and MacOSX/PPC.
-   Installers can be retrieved from:
-   http://www.process-one.net/en/projects/ejabberd/download.html
-
-Migration Notes
-
-   - Before any migration, ejabberd system and database must be properly
-     backed up.
-   - The database schema has not been changed comparing to version 1.0.0 and
-     consequently it does not require any migration.
-
-
-References
-
-   Contributed tutorials and documents of interest are:
-   - Migration from Jabberd1.4, Jabberd2 and WPJabber to ejabberd:
-     http://ejabberd.jabber.ru/migrate-to-ejabberd     
-   - Transport configuration for connecting to other networks:
-     http://ejabberd.jabber.ru/tutorials-transports
-   - Using ejabberd with MySQL native driver:
-     http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver
-   - Anonymous User Support:
-     http://support.process-one.net/doc/display/MESSENGER/Anonymous+users+support
-   - Frequently Asked Questions:
-     http://ejabberd.jabber.ru/faq
-
-END
@@ -1,119 +0,0 @@
-				Release Notes
-				ejabberd 1.1.1 
-				28 April 2006
-
-   This document describes the main changes in ejabberd 1.1.x. This version
-   introduce new features including support for new Jabber Enhancement
-   Proposals and several performance improvements enabling deployments on an
-   even larger scale than already possible.
-
-   This release fix a security issue introduced in ejabberd 1.1.0. In SASL
-   mode, anonymous login was enabled as a default. Upgrading ejabberd 1.1.0 to
-   ejabberd 1.1.1 is highly recommended.
-
-   ejabberd can be downloaded from the Process-one website:
-   http://www.process-one.net/en/projects/ejabberd/
-
-   Detailed information can be found in the ejabberd Feature Sheet and User
-   Guide which are available on the Process-one website:
-   http://www.process-one.net/en/projects/ejabberd/docs.html
-
-   A complete list of changes is available from:
-   http://support.process-one.net/secure/ReleaseNote.jspa?projectId=10011&styleName=Html&version=10025
-
-
-   Recent changes include:
-
-
-New Jabber Enhancement Proposal support:
-
-  - JEP-0050: Ad-Hoc Commands.
-  - JEP-0138: Stream Compression.
-  - JEP-0175: SASL anonymous.
-
-Anonymous login
-
-  - SASL anonymous.
-  - Anonymous login for clients that do not yet support SASL Anonymous.
-  
-Relational database Support
-
-  - MySQL is now fully supported through ODBC and in native mode.
-  - Various improvements to the native database interfaces.
-  - The migration tool can use relational databases.
-
-Multi-User Chat improvements
-
-  - Logging of room discussion to text file is now supported.
-  - Better reconfiguration support.
-  - Security oriented fixes.
-  - Several improvements and updates to latest JEP-0045.
-
-Performance scalability improvements for large clusters
-
-  - Improved session synchronisation management between cluster nodes.
-  - Internal architecture has been reworked to use generalize Erlang/OTP
-    framework usage.
-  - Speed improvement on logger.
-  - TCP/IP packet reception change for better network throttling and
-    regulation.
-  As a result, these improvements will reduce load on large scale deployments.
-
-XMPP Protocol related improvements
-
-  - XML stanza size can be limited.
-  - Messages are send to all resources with the same highest priority.
-
-Documentation and Internationalization
-
-   - Documentation has been extended to cover more topics.
-   - Translations have been updated.
-
-Web interface
-
-   - XHTML 1.0 compliance.
-
-Bugfixes
-
-   - This release contains many bugfixes on various areas such as Publish-Subscribe, build
-     chain, installers, IRC gateway, ejabberdctl, amongst others.
-   - Please refer to the ChangeLog file supplied with this release regarding
-     all improvements in ejabberd.
-
-
-
-   Installation Notes
-
-Supported Erlang Version
-
-   - You need at least Erlang/OTP R9C-2 to run ejabberd 1.1.0.
-
-Installation
-
-   Installers are provided for Microsoft Windows, Linux/x86 and MacOSX/PPC.
-   Installers can be retrieved from:
-   http://www.process-one.net/en/projects/ejabberd/download.html
-
-Migration Notes
-
-   - Before any migration, ejabberd system and database must be properly
-     backed up.
-   - The database schema has not been changed comparing to version 1.0.0 and
-     consequently it does not require any migration.
-
-
-References
-
-   Contributed tutorials and documents of interest are:
-   - Migration from Jabberd1.4, Jabberd2 and WPJabber to ejabberd:
-     http://ejabberd.jabber.ru/migrate-to-ejabberd     
-   - Transport configuration for connecting to other networks:
-     http://ejabberd.jabber.ru/tutorials-transports
-   - Using ejabberd with MySQL native driver:
-     http://support.process-one.net/doc/display/MESSENGER/Using+ejabberd+with+MySQL+native+driver
-   - Anonymous User Support:
-     http://support.process-one.net/doc/display/MESSENGER/Anonymous+users+support
-   - Frequently Asked Questions:
-     http://ejabberd.jabber.ru/faq
-
-END
@@ -1,119 +0,0 @@
-				Release Notes
-				ejabberd 1.1.2
-			      27 September 2006
-
-   This document describes the main changes in ejabberd 1.1.2.
-
-   This version is a major improvement over ejabberd 1.1.1, improving the
-   overall behaviour of the server in many areas. Users of ejabberd 1.1.1
-   should upgrade to this new release for improved robustness and compliance.
-
-   ejabberd can be downloaded from the Process-one website:
-   http://www.process-one.net/en/projects/ejabberd/
-
-   Detailed information can be found in the Feature Sheet and in the
-   Installation and Operation Guide which are both available on the
-   Process-one website:
-   http://www.process-one.net/en/projects/ejabberd/docs.html
-
-   ejabberd includes 44 improvements. A complete list of changes can be
-   retrieved from:
-   http://redir.process-one.net/ejabberd-1.1.2
-
-
-   Recent changes include:
-
-LDAP Improvements
-
-  - Major improvements have been made on the LDAP module. It is now more
-    flexible and more robust.
-
-HTTP Polling Fixes
-
-  - The HTTP polling modules have been fixed and improved: the connections are
-    closed properly and polled messages cannot be lost anymore.
-
-Roster Management Improvement
-
-  - Roster management improvements increase reliability, especially in cases
-  where users are on different servers.
-  - Shared rosters are more reliable.
-
-Improved Robustness
-
-  - It is now possible to limit the number of opened connections for a single
-  user.
-
-Relational databases
-
-  - Database support: Microsoft SQL Server is now officially supported in ODBC
-  mode.
-
-Publish-Subscribe Improvement
-
-  - Restricting node creation with a dedicated ACL rule is now possible.
-
-Localization
-
-  - A Czech translation has been added.
-  - Translations have been updated.
-
-Binary Installer
-
-  - New binary installer for Windows including all requirements.
-  - Improved installers for Linux and MacOSX (PowerPC)
-
-XMPP Compliancy
-
-  - Some protocol compliance fix have been added, after the Portland XMPP
-    Interop Meeting in July.
-
-Miscelanous
-
-  - MUC have been improved (logging rendering).
-  - The command line tool ejabberdctl has been improved.
-  - The build chain has been improved, including MacOSX support.
-  - The documentation has been improved and updated to describe the new
-    features.
-
-Bugfixes
-
-   - Anonymous login bugfixes.
-   - Please refer to the ChangeLog file supplied with this release regarding
-     all improvements in ejabberd.
-
-
-   Installation Notes
-
-Supported Erlang Version
-
-   - You need at least Erlang/OTP R9C-2 to run ejabberd 1.1.2.
-   - The recommanded version is Erlang/OTP R10B-10.
-   - Erlang/OTP R11B has not yet been fully certified for ejabberd.
-
-Installation
-
-   Installers are provided for Microsoft Windows, Linux/x86 and MacOSX/PPC.
-   They can be retrieved from:
-   http://www.process-one.net/en/projects/ejabberd/download.html
-
-Migration Notes
-
-   - Before any migration, ejabberd system and database must be properly
-   backed up.
-   - The relational database schema has changed between version 1.1.1 and
-   1.1.2. An "askmessage" column needs to be added in the "rosterusers" table
-   to perform the migration.
-
-
-References
-
-   Contributed tutorials and documents of interest are:
-   - Migration from other XMPP servers to ejabberd:
-     http://ejabberd.jabber.ru/migrate-to-ejabberd     
-   - Transport configuration for connecting to other networks:
-     http://ejabberd.jabber.ru/tutorials-transports
-   - Frequently Asked Questions:
-     http://ejabberd.jabber.ru/faq
-
-END
@@ -1,14 +0,0 @@
-			    Release Notes
-			    ejabberd 1.1.3
-			   2 February 2007
-
-  ejabberd 1.1.3 is a security fix release for ejabberd roster ODBC
-  module.
-
-  The upgrade is only necessary if you are using ejabberd with the
-  mod_roster_odbc.
-
-  The new code can be downloaded from ejabberd download page:
-     http://www.process-one.net/en/projects/ejabberd/
-
-END
@@ -1,31 +0,0 @@
-			      Release Notes
-			      ejabberd 1.1.4
-			   3 september 2007
-
-  ejabberd 1.1.4 is a bugfix release for ejabberd 1.1.x branch.
-
-  ejabberd 1.1.4 includes 10 improvements. A complete list of changes
-  can be retrieved from:
-   http://redir.process-one.net/ejabberd-1.1.4
-
-  The new code can be downloaded from ejabberd download page:
-     http://www.process-one.net/en/projects/ejabberd/
-
-
-   Recent changes include:
-
- Better LDAP support.
- Support for UTF-8 with MySQL 5.
- Roster migration script bugfixes.
- Performance improvements on user removal.
- Traffic shapers bugfix.
- Configuration: host value is now case insensitive.
- Build: ejabberd.cfg file is not overwritten with 'make install' command.
-
-
-Bugs report
-
-  You can officially report bugs on Process-one support site:
-  http://support.process-one.net/
-
-END
@@ -1,208 +0,0 @@
-
-                              Release Notes
-                             ejabberd 2.0.0
-                            21 February 2008
-
-  ejabberd 2.0.0 is a major new version for ejabberd adding plenty of
-  new features, performance and scalability improvements and
-  architectural changes.
-
-  ejabberd 2.0.0 includes more than 200 improvements over ejabberd
-  1.1.x. A complete list of changes can be retrieved from:
-   http://redir.process-one.net/ejabberd-2.0.0
-
-  The new code can be downloaded from ejabberd downloads page:
-     http://www.process-one.net/en/ejabberd/
-
-
-   Recent changes include:
-
-
-* Clustering and Architecture
-
- New front-end and back-end cluster architecture for better
-  scalability and robustness. Back-end nodes are able to run a fully
-  fault-tolerant XMPP router and services, but you can now deploy
-  many front-end nodes to share the load without needing to synchronize
-  any state with the back-ends.
- All components now run in cluster mode (For example, Multi-User chat
-  service and file transfer proxy).
- New load balancing algorithm to support Multi-User chat and gateways
-  clustering. More generally it supports any external component load
-  balancing.
- ejabberd watchdog to receive warning on suspicious resources consumption.
- Traffic shapers are now supported on components. This protect
-  ejabberd from components and gateways abuses.
-
-
-* Publish and Subscribe
-
- Complete rewrite of the PubSub module. The new PubSub module is
-  plugin-based, allowing developers to create new nodes type. Any
-  application can be plugged to ejabberd and can provide rich presence
-  as a pubsub plugin.
- Personal Eventing via Pubsub support (XEP-0163). This module is
-  implemented as a PubSub service. It supports user mood (XEP-107),
-  User Tune (XEP-118), user location (XEP-0080) or user avatar
-  (XEP-0084) for example.
-
-
-* Server to Server (s2s)
-
- More robust code with connection timeout implementation.
- Support for multiple s2s connections per domain.
- s2s whitelist and blacklist support.
- s2s retrial interval.
-
-
-* LDAP
-
- Many enterprise-class enhancements such as better behaviour under
-  heavy load.
- Support for LDAP servers pool.
- Simplified use of virtual hosting with LDAP with domain substitution
-  in config.
- Ability to match on several userid attributes.
-
-
-* Multi-User Chat
-
- Clustering and load balancing support.
- Ability to define default room configuration in ejabberd config file.
- Many anti abuse features have been added:
-  . New ACL to limit the creation of persistent room to authorized users.
-  . Ability to define the maximum number of users per room.
-  . Limitation of the rate of message and presence packets.
-  . Limitation of the maximum number of room a user can join at the same time.
-
-
-* File Transfer
-
- XEP-0065 - Proxy65 file transfer proxy. The proxy can run in
-  cluster mode.
-
-
-* Authentication
-
- PAM (Pluggable Authentication Modules) support on *nix systems.
- External Authentication protocol is now fully documented.
-
-
-* Web Client Support
-
- XEP-0124 - BOSH support: BOSH (Bidirectional-streams Over
-  Synchronous HTTP) was formerly known as "HTTP binding". It provides
-  an efficient alternative to HTTP polling for scalable Web based chat
-  solutions.
- HTTP module can now serve static documents (with
-  mod_http_fileserver). It is needed for high-performance Web 2.0 chat
-  / IM application. System administrators can now avoid using a proxy
-  (like Apache) that handles much less simultaneous than ejabberd HTTP
-  module.
- Added limitations enforcement on HTTP poll and HTTP bind modules
-  (bandwidth, packet size).
-
-
-* System Administration
-
- XEP-0133 - Service administration support. System administrators can
-  now perform lot of ejabberd related admin tasks from their XMPP
-  client, through adhoc commands.
- Dynamic log levels: Improved logging with more log levels. You can
-  now change the loglevel at run time. No performance penalty is
-  involved when less verbose levels are used.
- The ejabberdctl command-line administration script now can start 
-  and stop ejabberd. It also includes other useful options.
-
-
-* Localization
-
- ejabberd is now translated to 24 languages: Catalan, Chinese, Czech,
-  Dutch, English, Esperanto, French, Galician, German, Italian, Japanese, 
-  Norwegian, Polish, Portuguese, Portuguese (Brazil), Russian, Slovak, 
-  Spanish, Swedish, Thai, Turkish, Ukrainian, Vietnamese, Walloon.
-
-
-* Build and Installer
-
- Many launch script improvements.
- New translations. The binary installer is now available in Chinese,
-  Dutch, English, French, German, Spanish, Russian.
- Makefile now implements uninstall command.
- Full MacOSX compliance in Makefile.
- Configure script is clever at finding libraries in unusual places.
-
-
-* Development API
-
- Several hooks have been added for module developers (most notably
-  presence related hooks).
- HTTP request handler to write HTTP based plugins.
- Manage connections IP address.
-
-
-* Bugfixes
-
- ejabberd 2.0.0 also fixes numerous small bugs :) Read the full
-  changelog for details.
-
-
-
-   Important Note:
-
- Since this release, ejabberd requires Erlang R10B-5 or higher. 
-  R11B-5 is the recommended version. R12 is not yet officially 
-  supported, and is not recommended for production servers.
-
-
-
-   Upgrading From ejabberd 1.x:
-
- If you upgrade from a version older than 1.1.4, please check the
-  Release Notes of the intermediate versions for additional
-  information about database or configuration changes.
-
- The database schemas didn't change since ejabberd 1.1.4. Of course,
-  you are encouraged to make a database backup of your SQL database,
-  or your Mnesia spool directory before upgrading ejabberd.
-
- The ejabberdctl command line administration script is improved in
-  ejabberd 2.0.0, and now it can start and stop ejabberd. If you
-  already wrote your own start script for ejabberd 1.x, you can
-  continue using it, or try ejabberdctl. For your convenience, the
-  ejabberd Guide describes all the ejabberd and Erlang options used by
-  ejabberdctl.
-
- The example ejabberd.cfg file has been reorganized, but its format
-  and syntax rules are the same. So, you can continue using your
-  ejabberd.cfg file from 1.x if you want. The most important changes
-  are described now.
-
- The 'ssl' option is no longer available in the listening ports. For
-  legacy SSL encryption use the option 'tls'. For STARTTLS encryption
-  as defined in RFC 3920 XMPP-CORE use the option 'starttls'. Check
-  the ejabberd Guide for more information about configuring listening
-  ports.
-
- The options 'welcome_message' and 'registration_watchers' are now
-  options of the module mod_register. Check in the ejabberd Guide how
-  to configure that module.
-
- To enable PEP support in mod_pubsub, you need to enable it in the
-  mod_pubsub configuration, and also enable the new module
-  mod_caps. Check the section about mod_pubsub in the ejabberd Guide.
-
- Other new features and improvements also require changes in the
-  ejabberd.cfg, like mod_http_bind, mod_http_fileserver, mod_proxy65,
-  loglevel, pam_service, and watchdog_admins. Search for those words
-  in the ejabberd Guide and the example ejabberd.cfg.
-
-
-
-   Bug Reports
-
-  You can officially report bugs on Process-one support site:
-  https://support.process-one.net/
-
-
-END
@@ -1,30 +0,0 @@
-
-                              Release Notes
-                             ejabberd 2.0.1
-                               20 May 2008
-
-  ejabberd 2.0.1 is a bugfix release for ejabberd 2.0.x branch.
-
-  ejabberd 2.0.1 includes 10 improvements and 32 bugfixes.
-  A complete list of changes can be retrieved from:
-     http://redir.process-one.net/ejabberd-2.0.1
-
-  The new code can be downloaded from ejabberd download page:
-     http://www.process-one.net/en/projects/ejabberd/
-
-
-   Recent changes include:
-
- Erlang R12 support.
- Better LDAP handling.
- PubSub bugfixes.
- Documentation improvements.
- inband registration limitation per IP.
- s2s improvements.
-
-Bugs report
-
-  You can officially report bugs on Process-one support site:
-  http://support.process-one.net/
-
-END
@@ -1,34 +0,0 @@
-
-                              Release Notes
-                             ejabberd 2.0.2
-                             28 August 2008
-
-  ejabberd 2.0.2 is the second bug fix release for ejabberd 2.0.x branch.
-
-  ejabberd 2.0.2 includes many bugfixes and a few improvements.
-  A complete list of changes can be retrieved from:
-     http://redir.process-one.net/ejabberd-2.0.2
-
-  The new code can be downloaded from ejabberd download page:
-     http://www.process-one.net/en/ejabberd/
-
-
-  Recent changes include:
-
- Anti-abuse feature: client blacklist support by IP.
- Guide: new section Securing ejabberd; improved usability.
- LDAP filter optimisation: ability to filter user in ejabberd and not LDAP.
- MUC improvements: room options to restrict visitors; broadcast reasons.
- Privacy rules: fix MySQL storage.
- Pub/Sub and PEP: many improvements in implementation and protocol compliance.
- Proxy65: send valid SOCKS5 reply (removed support for Psi < 0.10).
- Web server embedded: better support for HTTPS.
- Binary installers: SMP on Windows; don't remove config when uninstalling.
-
-
-  Bug reports
-
-  You can officially report bugs on ProcessOne support site:
-  http://support.process-one.net/
-
-END
@@ -1,35 +0,0 @@
-
-                              Release Notes
-                             ejabberd 2.0.3
-                             14 January 2009
-
-  ejabberd 2.0.3 is the third bugfix release for ejabberd 2.0.x branch.
-
-  ejabberd 2.0.3 includes several bugfixes and a few improvements.
-  A complete list of changes can be retrieved from:
-     http://redir.process-one.net/ejabberd-2.0.3
-
-  The new code can be downloaded from ejabberd download page:
-     http://www.process-one.net/en/ejabberd/
-
-
-  Recent changes include:
-
- Do not ask certificate for client (c2s)
- Check digest-uri in SASL digest authentication
- Use send timeout to avoid locking on gen_tcp:send
- Fix ejabberd reconnection to database
- HTTP-Bind: handle wrong order of packets
- MUC: Improve traffic regulation management
- PubSub: Several bugfixes and improvements for best coverage of XEP-0060 v1.12
- Shared Roster Groups: push immediately membership changes
- Rotate also sasl.log on "reopen-log" command
- Binary Windows installer: better detect "Error running Post Install Script"
-
-
-  Bug reports
-
-  You can officially report bugs on ProcessOne support site:
-  http://support.process-one.net/
-
-END
@@ -1,44 +0,0 @@
-
-                              Release Notes
-                             ejabberd 2.0.4
-
-  ejabberd 2.0.4 is the fourth bugfix release for ejabberd 2.0.x branch.
-
-  ejabberd 2.0.4 includes several bugfixes.
-  A detailed list of changes can be retrieved from:
-     http://redir.process-one.net/ejabberd-2.0.4
-
-  The new code can be downloaded from ejabberd download page:
-     http://www.process-one.net/en/ejabberd/
-
-
-  The changes are:
-
- Ensure ID attribute in roster push is unique
- Authentication: Fix Anonymous auth when enabled with broken ODBC
- Authentication: Unquote correctly backslash in DIGEST-MD5 SASL responses
- Authentication: Cancel presence subscriptions on account deletion
- LDAP: Close a connection on tcp_error
- LDAP: Implemented queue for pending queries
- LDAP: On failure of LDAP connection, waiting is done on pending queue
- MUC: Owner of a password protected room must also provide the password
- MUC: Prevent XSS in MUC logs by linkifying only a few known protocols
- Privacy rules: Items are now processed in the specified order
- Privacy rules: Fix to correctly block subscription requests
- Proxy65: If ip option is not defined, take an IP address of a local hostname
- PubSub: Add roster subscription handling; send PEP events to all resources
- PubSub: Allow node creation without configure item
- PubSub: Requesting items on a node which exists, but empty returns an error
- PEP: Fix sending notifications to other domains and s2s
- S2S: Fix problem with encrypted connection to Gtalk and recent Openfire
- S2S: Workaround to get DNS SRV lookup to work on Windows machine
- Shared Roster Groups: Fix to not resend authorization request
- WebAdmin: Fix encryption problem for ejabberd_http after timeout
-
-
-  Bug reports
-
-  You can officially report bugs on ProcessOne support site:
-  http://support.process-one.net/
-
-END
@@ -1,33 +0,0 @@
-
-                              Release Notes
-                             ejabberd 2.0.5
-
-  ejabberd 2.0.5 is the fifth bugfix release in ejabberd 2.0.x branch.
-
-  ejabberd 2.0.5 includes three bugfixes.
-  More details of those fixes can be retrieved from:
-     http://redir.process-one.net/ejabberd-2.0.5
-
-  The new code can be downloaded from ejabberd download page:
-     http://www.process-one.net/en/ejabberd/
-
-
-  The changes are:
-
- Fix two problems introduced in ejabberd 2.0.4: subscription request
-  produced many authorization requests with some clients and
-  transports; and subscription requests were not stored for later
-  delivery when receiver was offline.
-
- Fix warning in expat_erl.c about implicit declaration of x_fix_buff
-
- HTTP-Bind (BOSH): Fix a missing stream:error in the returned
-  remote-stream-error stanza
-
-
-  Bug reports
-
-  You can officially report bugs on ProcessOne support site:
-  http://support.process-one.net/
-
-END
@@ -1,281 +0,0 @@
-
-                              Release Notes
-                             ejabberd 2.1.0
-
-  ejabberd 2.1.0 is a major new version for ejabberd adding many
-  new features, performance and scalability improvements.
-
-  ejabberd 2.1.0 includes many new features, improvements and bug fixes.
-  A complete list of changes can be retrieved from:
-   http://redir.process-one.net/ejabberd-2.1.0
-
-  The new code can be downloaded from ejabberd download page:
-     http://www.process-one.net/en/ejabberd/
-
-
-  New features and improvements:
-
-* Anti-abuse
- Captcha support (XEP-0158). The example script uses ImageMagick.
- New option: registration_timeout to limit registrations by time
- Use send timeout to avoid locking on gen_tcp:send
- mod_ip_blacklist: client blacklist support by IP
-
-* API
- ejabberd_http provides Host, Port, Headers and Protocol in HTTP requests
- Export function to create MUC room
- New events: s2s_send_packet and s2s_receive_packet
- New event: webadmin_user_parse_query when POST in web admin user page
- Support distributed hooks over the cluster
-
-* Authentification
- Extauth responses: log strange responses and add timeout
-
-* Binary Installer
- Includes exmpp library to support import/export XML files
-
-* Caps
- Remove useless caps tables entries
- mod_caps must handle correctly external contacts with several resources
- Complain if mod_caps disabled and mod_pubsub has PEP plugin enabled
-
-* Clustering and Architecture
-
-* Configuration
- Added option access_max_user_messages for mod_offline
- Added option backlog for ejabberd_listener to increase TCP backlog
- Added option define_macro and use_macro
- Added option include_config_file to include additional configuration files
- Added option max_fsm_queue
- Added option outgoing_s2s_options to define IP address families and timeout
- Added option registration_timeout to ejabberd.cfg.example
- Added option s2s_dns_options to define DNS timeout and retries
- Added option ERL_OPTIONS to ejabberdctl.cfg
- Added option FIREWALL_WINDOW to ejabberdctl.cfg
- Added option EJABBERD_PID_PATH to ejabberdctl.cfg
- Deleted option user_max_messages of mod_offline
- Check certfiles are readable on server start and listener start
- Config file management mix file reading and sanity check
- Include example PAM configuration file: ejabberd.pam
- New ejabberd listener: ejabberd_stun
- Support to bind the same port to multiple interfaces
- New syntax to specify the IP address and IPv6 in listeners
-  configuration. The old options {ip,{1,2,3,4}} and inet6 are
-  supported even if they aren't documented.
- New syntax to specify the network protocol: tcp or udp
- Report error at startup if a listener module isn't available
- Only listen in a port when actually ready to serve requests
- In default config, only local accounts can create rooms and PubSub nodes
-
-* Core architecture
- More verbose error reporting for xml:element_to_string
- Deliver messages when first presence is Invisible
- Better log message when config file is not found
- Include original timestamp on delayed presences
-
-* Crypto
- Do not ask certificate for client (c2s)
- SSL code remove from ejabberd in favor of TLS
- Support Zlib compression after STARTTLS encryption
- tls v1 client hello
-
-* Documentation
- Document possible default MUC room options
- Document service_check_from in the Guide
- Document s2s_default_policy and s2s_host in the Guide
- new command and guide instructions to change node name in a Mnesia database
-
-* ejabberd commands
- ejabberd commands: separate command definition and calling interface
- access_commands restricts who can execute what commands and arguments
- ejabberdctl script now displays help and categorization of commands
-
-* HTTP Binding and HTTP Polling
- HTTP-Bind: module optimization and clean-up
- HTTP-Bind: allow configuration of max_inactivity timeout
- HTTP-Poll: turn session timeout into a config file parameter
-
-* Jingle
- STUN server that facilitates the client-to-client negotiation process
-
-* LDAP
- Faster reconnection to LDAP servers
- LDAP filter optimisation: Add ability to filter user in ejabberd and not LDAP
- LDAP differentiates failed auth and unavailable auth service
- Improve LDAP logging
- LDAPS support using TLS.
-
-* Localization
- Use Gettext PO for translators, export to ejabberd MSG
- Support translation files for additional projects
- Most translations are updated to latest code
- New translation to Greek language
-
-* Multi-User Chat (MUC)
- Allow admins to send messages to rooms
- Allow to store room description
- Captcha support in MUC: the admin of a room can configure it to
-  require participants to fill a captcha to join the room.
- Limit number of characters in Room ID, Name and Description
- Prevent unvoiced occupants from changing nick
- Support Result Set Management (XEP-0059) for listing rooms
- Support for decline of invitation to MUC room
- mod_muc_log options: plaintext format; filename with only room name
-
-* Performance
- Run roster_get_jid_info only if privacy list has subscription or group item
- Significant PubSub performance improvements
-
-* Publish-Subscribe
- Add nodetree filtering/authorization
- Add subscription option support for collection nodes
- Allow Multiple Subscriptions
- Check option of the nodetree instead of checking configuration
- Implement whitelist authorize and roster access model
- Implicit item deletion is not notified when deleting node
- Make PubSub x-data configuration form handles list value
- Make default node name convention XEP-compatible, document usage of hierarchy
- Node names are used verbatim, without separating by slash, unless a
-  node plugin uses its own separator
- Send authorization update event (XEP-0060, 8.6)
- Support of collection node subscription options
- Support ODBC storage. Experimental, needs more testing.
-
-* Relational databases:
- Added MSSQL 2000 and 2005
- Privacy rules storage in MySQL
- Implement reliable ODBC transaction nesting
-
-* Source Package
- Default installation directories changed. Please see the upgrade notes below.
- Allow more environment variable overrides in ejabberdctl
- ChangeLog is not edited manually anymore; it's generated automatically.
- Install the ejabberd Guide
- Install the ejabberd include files
- New option for the 'configure' script: --enable-user which installs
-  ejabberd granting permission to manage it to a regular system user;
-  no need to use root account to.
- Only try to install epam if pam was enabled in configure script
- Spool, config and log dirs: owner writes, group reads, others do nothing.
- Provides an example ejabberd.init file
-
-* S2S
- Option to define s2s outgoing behaviour: IPv4, IPv6 and timeout
- DNS timeout and retries, configurable with s2s_dns_options.
-
-* Shared rosters
- When a member is added/removed to group, send roster upgrade to group members
-
-* Users management
- When account is deleted, cancel presence subscription for all roster items
-
-* XEP Support
- Added XEP-0059 Result Set Management (for listing rooms)
- Added XEP-0082 Date Time
- Added XEP-0085 Chat State Notifications
- Added XEP-0157 Contact Addresses for XMPP Services
- Added XEP-0158 CAPTCHA Forms (in MUC rooms)
- Added STUN server, for XEP-0176: Jingle ICE-UDP Transport Method
- Added XEP-0199 XMPP Ping
- Added XEP-0202 Entity Time
- Added XEP-0203 Delayed Delivery
- Added XEP-0227 Portable Import/Export Format for XMPP-IM Servers
- Added XEP-0237 Roster Versioning
-
-* Web Admin
- Display the connection method of user sessions
- Cross link of ejabberd users in the list of users and rosters
- Improved the browsing menu: don't disappear when browsing a host or node
- Include Last-Modified HTTP header in responses to allow caching
- Make some Input areas multiline: options of listening ports and modules
- Support PUT and DELETE methods in ejabberd_http
- WebAdmin serves Guide and links to related sections
-
-* Web plugins
- mod_http_fileserver: new option directory_indices, and improve logging
-
-
-   Important Notes:
-
- ejabberd 2.1.0 requires Erlang R10B-9 or higher.
-  R12B-5 is the recommended version. Support for R13B is experimental.
-
-
-   Upgrading From ejabberd 1.x.x:
-
- Check the Release Notes of the intermediate versions for additional
-  information about database or configuration changes.
-
-
-   Upgrading From ejabberd 2.0.x:
-
- The database schemas have three changes since ejabberd 2.0.x.
-  Check the database creation SQL files and update your database.
-  1) New table roster_version to support roster versioning.
-  2) Six new tables for optional pubsub ODBC storage.
-  3) Some tables in the MySQL database have a new created_at column.
-
- As usual, it is recommended to backup the Mnesia spool directory and
-  your SQL database (if used) before upgrading ejabberd.
-
- Between ejabberd 2.0.0 and 2.0.5, mod_pubsub used "default" as the
-  default node plugin. But in 2.1.0 this is renamed to "hometree".
-  You have to edit your ejabberd config file and replace those names.
-  If you used ejabberd 2.0.5 or older, the database will be updated
-  automatically. But if you were using ejabberd from SVN, you must
-  manually run ejabberdctl with the command: rename_default_nodeplugin.
-  Running this command on already updated database does nothing.
-
- The listener options 'ip' and 'inet6' are not documented anymore
-  but they are supported and you can continue using them.
-  There is a new syntax to define IP address and IP version.
-  As usual, check the ejabberd Guide for more information.
-
- The log file sasl.log is now called erlang.log
-
- ejabberdctl commands now have _ characters instead of -.
-  For backwards compatibility, it is still supported -.
-
- mod_offline has a new option: access_max_user_messages.
-  The old option user_max_messages is no longer supported.
-
- If you upgrade from ejabberd trunk SVN, you must execute this:
-  $ ejabberdctl rename_default_nodeplugin
-
- Default installation directories changed a bit:
-  * The Mnesia spool files that were previously stored in
-      /var/lib/ejabberd/db/NODENAME/*
-    are now stored in
-      /var/lib/ejabberd/*
-  * The directories
-      /var/lib/ejabberd/ebin
-      /var/lib/ejabberd/priv
-    and their content is now installed as
-      /lib/ejabberd/ebin
-      /lib/ejabberd/priv
-  * There is a new directory with Erlang header files:
-      /lib/ejabberd/include
-  * There is a new directory for ejabberd documentation,
-    which includes the Admin Guide and the release notes::
-      /share/doc/ejabberd
-
- How to upgrade from previous version to ejabberd 2.1.0:
-  1. Stop the old instance of ejabberd.
-  2. Run 'make install' of new ejabberd 2.1.0 to create the new directories.
-  3. Copy the content of your old directory:
-       /var/lib/ejabberd/db/NODENAME/
-     to the new location:
-       /var/lib/ejabberd/
-     so you will have the files like this:
-       /var/lib/ejabberd/acl.DCD ...
-  4. You can backup the content of those directories and delete them:
-       /var/lib/ejabberd/ebin
-       /var/lib/ejabberd/priv
-       /var/lib/ejabberd/db
-  5. Now try to start your new ejabberd 2.1.0.
-
-
-  Bug reports
-
-  You can officially report bugs on ProcessOne support site:
-  http://support.process-one.net/
@@ -1,47 +0,0 @@
-
-                              Release Notes
-                             ejabberd 2.1.1
-
-  ejabberd 2.1.1 is the first bugfix release in ejabberd 2.1.x branch.
-
-  ejabberd 2.1.1 includes several important bugfixes.
-  More details of those fixes can be retrieved from:
-     http://redir.process-one.net/ejabberd-2.1.1
-
-  The new code can be downloaded from ejabberd download page:
-     http://www.process-one.net/en/ejabberd/
-
-
-  The changes are:
-
-* Core
- Call ejabberd_router:route/3 instead of sending a message
- Can't connect if starttls_required and zlib are set
- Routes vCard request to the occupant full JID, but should to bare JID
- S2S: fix allow_host/2 on subdomains. added hook s2s_allow_host
-
-* MUC
- Support converting one-to-one chat to MUC
- Add support for serving a Unique Room Name
-
-* Publish Subscribe
- Receive same last published PEP items at reconnect if several resources online
- Typo in mod_pubsub_odbc breaks Service Discovery and more
-
-* Web
- Fix memory and port leak when TLS is enabled in HTTP
- WebAdmin doesn't report correct last activity with postgresql backend
- Option to define custom HTTP headers in mod_http_fileserver
- Show informative webpage when browsing the HTTP-Poll page
-
-* Other
- Change captcha.sh to not depend on bash
- Generate main XML file also when exporting only a vhost
- Fix last newline in ejabberdctl result
- Guide: fix -setcookie, mod_pubsub_odbc host, content_types
-
-
-  Bug reports
-
-  You can officially report bugs on ProcessOne support site:
-  http://support.process-one.net/
@@ -1,51 +0,0 @@
-
-                              Release Notes
-                             ejabberd 2.1.2
-
-  ejabberd 2.1.2 is the second bugfix release in ejabberd 2.1.x branch.
-
-  ejabberd 2.1.2 includes several bugfixes.
-  More details of those fixes can be retrieved from:
-     http://redir.process-one.net/ejabberd-2.1.2
-
-  The new code can be downloaded from ejabberd download page:
-     http://www.process-one.net/en/ejabberd/
-
-
-  The major changes are:
-
-* Core
- Close sessions that were half connected
- Fix SASL PLAIN authentication message for RFC4616 compliance
- Fix support for old Erlang/OTP R10 and R11
- Return proper error (not 'conflict') when register is forbidden by ACL
- When ejabberd stops, send stream close to clients
-
-* ejabberdctl
- Check for EGID in ejabberdctl command
- Command to stop ejabberd informing users, with grace period
- If there's a problem in config file, display config lines and stop node
-
-* MUC
- Kick occupants with reason when room is stopped due to MUC shutdown
- Write in room log when a room is created, destroyed, started, stopped
-
-* PubSub and PEP
- Don't call gen_server on internal event (improves performance and scalability)
- Fix duplicate SHIM header in Pubsub message
- Notification messages of Pubsub node config change contained a SHIM header
- SubID SHIM header missing in Pubsub message with multiple
-  subscriptions on the same node
- PEP: last published item not sent from unavailable users when the
-  subscription is implicit (XEP-0115)
- pep_mapping not working due to Node type mismatch
-
-* WebAdmin
- If big offline message queue, show only subset on WebAdmin
- Support in user list page of WebAdmin when mod_offline is disabled
-
-
-  Bug reports
-
-  You can officially report bugs on ProcessOne support site:
-  http://support.process-one.net/
@@ -1,2 +0,0 @@
-% ejabberd version (automatically generated).
-\newcommand{\version}{2.1.2}
@@ -1,6 +1,20 @@
 #! /bin/sh
+
+### BEGIN INIT INFO
+# Provides:          ejabberd
+# Required-Start:    $remote_fs $network $named $time
+# Required-Stop:     $remote_fs $network $named $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Starts ejabberd jabber server
+# Description:       Starts ejabberd jabber server, an XMPP
+#                    compliant server written in Erlang.
+### END INIT INFO
+
+# chkconfig: 2345 90 10
+# description: ejabberd XMPP server
+
 set -o errexit
-set -o nounset

 DIR=@ctlscriptpath@
 CTL="$DIR"/ejabberdctl
@@ -10,7 +24,7 @@ test -x "$CTL" || {
 	echo "ERROR: ejabberd not found: $DIR"
 	exit 1
 }
-grep ^"$USER": /etc/passwd >/dev/null || {
+getent passwd "$USER" >/dev/null || {
 	echo "ERROR: System user not found: $USER"
 	exit 2
 }
@@ -32,14 +46,17 @@ case "$1" in
    su - $USER -c "$CTL stopped"
    echo "done."
    ;;
-
+  status)
+    test -x "$CTL" || exit 0
+    echo "Getting ejabberd status..."
+    su - $USER -c "$CTL status"
+    ;;
  force-reload|restart)
    "$0" stop
    "$0" start
    ;;
-
  *)
-    echo "Usage: $0 {start|stop|restart|force-reload}"
+    echo "Usage: $0 {start|stop|restart|force-reload|status}"
    exit 1
 esac

@@ -0,0 +1,17 @@
+[Unit]
+Description=XMPP Server
+After=network.target
+
+[Service]
+User=ejabberd
+Group=ejabberd
+LimitNOFILE=16000
+RestartSec=5
+ExecStart=/bin/sh @ctlscriptpath@/ejabberdctl start
+ExecStop=@ctlscriptpath@/ejabberdctl stop
+ExecReload=@ctlscriptpath@/ejabberdctl reload_config
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
@@ -0,0 +1,688 @@
+###
+###'              ejabberd configuration file
+###
+###
+
+### The parameters used in this configuration file are explained in more detail
+### in the ejabberd Installation and Operation Guide.
+### Please consult the Guide in case of doubts, it is included with
+### your copy of ejabberd, and is also available online at
+### http://www.process-one.net/en/ejabberd/docs/
+
+### The configuration file is written in YAML.
+### Refer to http://en.wikipedia.org/wiki/YAML for the brief description.
+### However, ejabberd treats different literals as different types:
+###
+### - unquoted or single-quoted strings. They are called "atoms".
+###   Example: dog, 'Jupiter', '3.14159', YELLOW
+###
+### - numeric literals. Example: 3, -45.0, .0
+###
+### - quoted or folded strings.
+###   Examples of quoted string: "Lizzard", "orange".
+###   Example of folded string:
+###   > Art thou not Romeo,
+###     and a Montague?
+
+###.  =======
+###'  LOGGING
+
+##
+## loglevel: Verbosity of log files generated by ejabberd.
+## 0: No ejabberd log at all (not recommended)
+## 1: Critical
+## 2: Error
+## 3: Warning
+## 4: Info
+## 5: Debug
+##
+loglevel: 4
+
+##
+## rotation: Describe how to rotate logs. Either size and/or date can trigger
+## log rotation. Setting count to N keeps N rotated logs. Setting count to 0
+## does not disable rotation, it instead rotates the file and keeps no previous
+## versions around. Setting size to X rotate log when it reaches X bytes.
+## To disable rotation set the size to 0 and the date to ""
+## Date syntax is taken from the syntax newsyslog uses in newsyslog.conf.
+## Some examples:
+##  $D0     rotate every night at midnight
+##  $D23    rotate every day at 23:00 hr
+##  $W0D23  rotate every week on Sunday at 23:00 hr
+##  $W5D16  rotate every week on Friday at 16:00 hr
+##  $M1D0   rotate on the first day of every month at midnight
+##  $M5D6   rotate on every 5th day of the month at 6:00 hr
+##
+log_rotate_size: 10485760
+log_rotate_date: ""
+log_rotate_count: 1
+
+##
+## overload protection: If you want to limit the number of messages per second
+## allowed from error_logger, which is a good idea if you want to avoid a flood
+## of messages when system is overloaded, you can set a limit.
+## 100 is ejabberd's default.
+log_rate_limit: 100
+
+##
+## watchdog_admins: Only useful for developers: if an ejabberd process
+## consumes a lot of memory, send live notifications to these XMPP
+## accounts.
+##
+## watchdog_admins:
+##   - "bob@example.com"
+
+###.  ===============
+###'  NODE PARAMETERS
+
+##
+## net_ticktime: Specifies net_kernel tick time in seconds. This options must have
+## identical value on all nodes, and in most cases shouldn't be changed at all from
+## default value.
+##
+## net_ticktime: 60
+
+###.  ================
+###'  SERVED HOSTNAMES
+
+##
+## hosts: Domains served by ejabberd.
+## You can define one or several, for example:
+## hosts: 
+##   - "example.net"
+##   - "example.com"
+##   - "example.org"
+##
+hosts:
+  - "localhost"
+
+##
+## route_subdomains: Delegate subdomains to other XMPP servers.
+## For example, if this ejabberd serves example.org and you want
+## to allow communication with an XMPP server called im.example.org.
+##
+## route_subdomains: s2s
+
+###.  ===============
+###'  LISTENING PORTS
+
+##
+## listen: The ports ejabberd will listen on, which service each is handled
+## by and what options to start it with.
+##
+listen: 
+  - 
+    port: 5222
+    module: ejabberd_c2s
+    ##
+    ## If TLS is compiled in and you installed a SSL
+    ## certificate, specify the full path to the
+    ## file and uncomment these lines:
+    ##
+    ## certfile: "/path/to/ssl.pem"
+    ## starttls: true
+    ##
+    ## To enforce TLS encryption for client connections,
+    ## use this instead of the "starttls" option:
+    ##
+    ## starttls_required: true
+    ##
+    ## Custom OpenSSL options
+    ##
+    ## protocol_options:
+    ##   - "no_sslv3"
+    ##   - "no_tlsv1"
+    max_stanza_size: 65536
+    shaper: c2s_shaper
+    access: c2s
+  - 
+    port: 5269
+    module: ejabberd_s2s_in
+  ##
+  ## ejabberd_service: Interact with external components (transports, ...)
+  ##
+  ## - 
+  ##   port: 8888
+  ##   module: ejabberd_service
+  ##   access: all
+  ##   shaper_rule: fast
+  ##   ip: "127.0.0.1"
+  ##   hosts:
+  ##     "icq.example.org":
+  ##       password: "secret"
+  ##     "sms.example.org":
+  ##       password: "secret"
+
+  ##
+  ## ejabberd_stun: Handles STUN Binding requests
+  ##
+  ## - 
+  ##   port: 3478
+  ##   transport: udp
+  ##   module: ejabberd_stun
+
+  ##
+  ## To handle XML-RPC requests that provide admin credentials:
+  ##
+  ## - 
+  ##   port: 4560
+  ##   module: ejabberd_xmlrpc
+  - 
+    port: 5280
+    module: ejabberd_http
+    request_handlers:
+      "/websocket": ejabberd_http_ws
+    ##  "/pub/archive": mod_http_fileserver
+    web_admin: true
+    http_bind: true
+    ## register: true
+    captcha: true
+
+###.  ==================
+###'  S2S GLOBAL OPTIONS
+
+##
+## s2s_use_starttls: Enable STARTTLS + Dialback for S2S connections.
+## Allowed values are: false optional required required_trusted
+## You must specify a certificate file.
+##
+## s2s_use_starttls: optional
+
+##
+## s2s_certfile: Specify a certificate file.
+##
+## s2s_certfile: "/path/to/ssl.pem"
+
+## Custom OpenSSL options
+##
+## s2s_protocol_options:
+##   - "no_sslv3"
+##   - "no_tlsv1"
+
+##
+## domain_certfile: Specify a different certificate for each served hostname.
+##
+## host_config:
+##   "example.org":
+##     domain_certfile: "/path/to/example_org.pem"
+##   "example.com":
+##     domain_certfile: "/path/to/example_com.pem"
+
+##
+## S2S whitelist or blacklist
+##
+## Default s2s policy for undefined hosts.
+##
+## s2s_access: s2s
+
+##
+## Outgoing S2S options
+##
+## Preferred address families (which to try first) and connect timeout
+## in milliseconds.
+##
+## outgoing_s2s_families:
+##   - ipv4
+##   - ipv6
+## outgoing_s2s_timeout: 10000
+
+###.  ==============
+###'  AUTHENTICATION
+
+##
+## auth_method: Method used to authenticate the users.
+## The default method is the internal.
+## If you want to use a different method,
+## comment this line and enable the correct ones.
+##
+auth_method: internal
+
+##
+## Store the plain passwords or hashed for SCRAM:
+## auth_password_format: plain
+## auth_password_format: scram
+##
+## Define the FQDN if ejabberd doesn't detect it:
+## fqdn: "server3.example.com"
+
+##
+## Authentication using external script
+## Make sure the script is executable by ejabberd.
+##
+## auth_method: external
+## extauth_program: "/path/to/authentication/script"
+
+##
+## Authentication using ODBC
+## Remember to setup a database in the next section.
+##
+## auth_method: odbc
+
+##
+## Authentication using PAM
+##
+## auth_method: pam
+## pam_service: "pamservicename"
+
+##
+## Authentication using LDAP
+##
+## auth_method: ldap
+##
+## List of LDAP servers:
+## ldap_servers:
+##   - "localhost"
+##
+## Encryption of connection to LDAP servers:
+## ldap_encrypt: none
+## ldap_encrypt: tls
+##
+## Port to connect to on LDAP servers:
+## ldap_port: 389
+## ldap_port: 636
+##
+## LDAP manager:
+## ldap_rootdn: "dc=example,dc=com"
+##
+## Password of LDAP manager:
+## ldap_password: "******"
+##
+## Search base of LDAP directory:
+## ldap_base: "dc=example,dc=com"
+##
+## LDAP attribute that holds user ID:
+## ldap_uids:
+##   - "mail": "%u@mail.example.org"
+##
+## LDAP filter:
+## ldap_filter: "(objectClass=shadowAccount)"
+
+##
+## Anonymous login support:
+##   auth_method: anonymous
+##   anonymous_protocol: sasl_anon | login_anon | both
+##   allow_multiple_connections: true | false
+##
+## host_config:
+##   "public.example.org":
+##     auth_method: anonymous
+##     allow_multiple_connections: false
+##     anonymous_protocol: sasl_anon
+##
+## To use both anonymous and internal authentication:
+##
+## host_config:
+##   "public.example.org":
+##     auth_method:
+##       - internal
+##       - anonymous
+
+###.  ==============
+###'  DATABASE SETUP
+
+## ejabberd by default uses the internal Mnesia database,
+## so you do not necessarily need this section.
+## This section provides configuration examples in case
+## you want to use other database backends.
+## Please consult the ejabberd Guide for details on database creation.
+
+##
+## MySQL server:
+##
+## odbc_type: mysql
+## odbc_server: "server"
+## odbc_database: "database"
+## odbc_username: "username"
+## odbc_password: "password"
+##
+## If you want to specify the port:
+## odbc_port: 1234
+
+##
+## PostgreSQL server:
+##
+## odbc_type: pgsql
+## odbc_server: "server"
+## odbc_database: "database"
+## odbc_username: "username"
+## odbc_password: "password"
+##
+## If you want to specify the port:
+## odbc_port: 1234
+##
+## If you use PostgreSQL, have a large database, and need a
+## faster but inexact replacement for "select count(*) from users"
+##
+## pgsql_users_number_estimate: true
+
+##
+## SQLite:
+##
+## odbc_type: sqlite
+## odbc_database: "/path/to/database.db"
+
+##
+## ODBC compatible or MSSQL server:
+##
+## odbc_type: odbc
+## odbc_server: "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"
+
+##
+## Number of connections to open to the database for each virtual host
+##
+## odbc_pool_size: 10
+
+##
+## Interval to make a dummy SQL request to keep the connections to the
+## database alive. Specify in seconds: for example 28800 means 8 hours
+##
+## odbc_keepalive_interval: undefined
+
+###.  ===============
+###'  TRAFFIC SHAPERS
+
+shaper:
+  ##
+  ## The "normal" shaper limits traffic speed to 1000 B/s
+  ##
+  normal: 1000
+
+  ##
+  ## The "fast" shaper limits traffic speed to 50000 B/s
+  ##
+  fast: 50000
+
+##
+## This option specifies the maximum number of elements in the queue
+## of the FSM. Refer to the documentation for details.
+##
+max_fsm_queue: 1000
+
+###.   ====================
+###'   ACCESS CONTROL LISTS
+acl:
+  ##
+  ## The 'admin' ACL grants administrative privileges to XMPP accounts.
+  ## You can put here as many accounts as you want.
+  ##
+  ## admin:
+  ##   user:
+  ##     - "aleksey": "localhost"
+  ##     - "ermine": "example.org"
+  ##
+  ## Blocked users
+  ##
+  ## blocked:
+  ##   user:
+  ##     - "baduser": "example.org"
+  ##     - "test"
+
+  ## Local users: don't modify this.
+  ##
+  local: 
+    user_regexp: ""
+
+  ##
+  ## More examples of ACLs
+  ##
+  ## jabberorg:
+  ##   server:
+  ##     - "jabber.org"
+  ## aleksey:
+  ##   user:
+  ##     - "aleksey": "jabber.ru"
+  ## test:
+  ##   user_regexp: "^test"
+  ##   user_glob: "test*"
+
+  ##
+  ## Loopback network
+  ##
+  loopback:
+    ip:
+      - "127.0.0.0/8"
+
+  ##
+  ## Bad XMPP servers
+  ##
+  ## bad_servers:
+  ##   server:
+  ##     - "xmpp.zombie.org"
+  ##     - "xmpp.spam.com"
+
+##
+## Define specific ACLs in a virtual host.
+##
+## host_config:
+##   "localhost":
+##     acl:
+##       admin:
+##         user:
+##           - "bob-local": "localhost"
+
+###.  ============
+###'  ACCESS RULES
+access:
+  ## Maximum number of simultaneous sessions allowed for a single user:
+  max_user_sessions: 
+    all: 10
+  ## Maximum number of offline messages that users can have:
+  max_user_offline_messages: 
+    admin: 5000
+    all: 100
+  ## This rule allows access only for local users:
+  local: 
+    local: allow
+  ## Only non-blocked users can use c2s connections:
+  c2s: 
+    blocked: deny
+    all: allow
+  ## For C2S connections, all users except admins use the "normal" shaper
+  c2s_shaper: 
+    admin: none
+    all: normal
+  ## All S2S connections use the "fast" shaper
+  s2s_shaper: 
+    all: fast
+  ## Only admins can send announcement messages:
+  announce: 
+    admin: allow
+  ## Only admins can use the configuration interface:
+  configure: 
+    admin: allow
+  ## Admins of this server are also admins of the MUC service:
+  muc_admin: 
+    admin: allow
+  ## Only accounts of the local ejabberd server can create rooms:
+  muc_create: 
+    local: allow
+  ## All users are allowed to use the MUC service:
+  muc: 
+    all: allow
+  ## Only accounts on the local ejabberd server can create Pubsub nodes:
+  pubsub_createnode: 
+    local: allow
+  ## In-band registration allows registration of any possible username.
+  ## To disable in-band registration, replace 'allow' with 'deny'.
+  register: 
+    all: allow
+  ## Only allow to register from localhost
+  trusted_network: 
+    loopback: allow
+  ## Do not establish S2S connections with bad servers
+  ## s2s: 
+  ##   bad_servers: deny
+  ##   all: allow
+
+## By default the frequency of account registrations from the same IP
+## is limited to 1 account every 10 minutes. To disable, specify: infinity
+## registration_timeout: 600
+  
+##
+## Define specific Access Rules in a virtual host.
+##
+## host_config:
+##   "localhost":
+##     access:
+##       c2s:
+##         admin: allow
+##         all: deny
+##       register:
+##         all: deny
+
+###.  ================
+###'  DEFAULT LANGUAGE
+
+##
+## language: Default language used for server messages.
+##
+language: "en"
+
+##
+## Set a different default language in a virtual host.
+##
+## host_config:
+##   "localhost":
+##     language: "ru"
+
+###.  =======
+###'  CAPTCHA
+
+##
+## Full path to a script that generates the image.
+##
+## captcha_cmd: "/lib/ejabberd/priv/bin/captcha.sh"
+
+##
+## Host for the URL and port where ejabberd listens for CAPTCHA requests.
+##
+## captcha_host: "example.org:5280"
+
+##
+## Limit CAPTCHA calls per minute for JID/IP to avoid DoS.
+##
+## captcha_limit: 5
+
+###.  =======
+###'  MODULES
+
+##
+## Modules enabled in all ejabberd virtual hosts.
+##
+modules: 
+  mod_adhoc: {}
+  ## mod_admin_extra: {}
+  mod_announce: # recommends mod_adhoc
+    access: announce
+  mod_blocking: {} # requires mod_privacy
+  mod_caps: {}
+  mod_carboncopy: {}
+  mod_client_state:
+    drop_chat_states: true
+    queue_presence: false
+  mod_configure: {} # requires mod_adhoc
+  mod_disco: {}
+  ## mod_echo: {}
+  mod_irc: {}
+  mod_http_bind: {}
+  ## mod_http_fileserver:
+  ##   docroot: "/var/www"
+  ##   accesslog: "/var/log/ejabberd/access.log"
+  mod_last: {}
+  mod_muc: 
+    ## host: "conference.@HOST@"
+    access: muc
+    access_create: muc_create
+    access_persistent: muc_create
+    access_admin: muc_admin
+  ## mod_muc_log: {}
+  ## mod_multicast: {}
+  mod_offline: 
+    access_max_user_messages: max_user_offline_messages
+  mod_ping: {}
+  ## mod_pres_counter:
+  ##   count: 5
+  ##   interval: 60
+  mod_privacy: {}
+  mod_private: {}
+  ## mod_proxy65: {}
+  mod_pubsub: 
+    access_createnode: pubsub_createnode
+    ## reduces resource comsumption, but XEP incompliant
+    ignore_pep_from_offline: true
+    ## XEP compliant, but increases resource comsumption
+    ## ignore_pep_from_offline: false
+    last_item_cache: false
+    plugins: 
+      - "flat"
+      - "hometree"
+      - "pep" # pep requires mod_caps
+  mod_register: 
+    ##
+    ## Protect In-Band account registrations with CAPTCHA.
+    ##
+    ## captcha_protected: true
+
+    ##
+    ## Set the minimum informational entropy for passwords.
+    ##
+    ## password_strength: 32
+
+    ##
+    ## After successful registration, the user receives
+    ## a message with this subject and body.
+    ##
+    welcome_message: 
+      subject: "Welcome!"
+      body: |-
+        Hi.
+        Welcome to this XMPP server.
+
+    ##
+    ## When a user registers, send a notification to
+    ## these XMPP accounts.
+    ##
+    ## registration_watchers:
+    ##   - "admin1@example.org"
+
+    ##
+    ## Only clients in the server machine can register accounts
+    ##
+    ip_access: trusted_network
+
+    ##
+    ## Local c2s or remote s2s users cannot register accounts
+    ##
+    ## access_from: deny
+
+    access: register
+  mod_roster: {}
+  mod_shared_roster: {}
+  mod_stats: {}
+  mod_time: {}
+  mod_vcard: {}
+  mod_version: {}
+
+##
+## Enable modules with custom options in a specific virtual host
+##
+## host_config:
+##   "localhost":
+##     modules:
+##       mod_echo:
+##         host: "mirror.localhost"
+
+##
+## Enable modules management via ejabberdctl for installation and
+## uninstallation of public/private contributed modules
+## (enabled by default)
+##
+
+allow_contrib_modules: true
+
+###.
+###'
+### Local Variables:
+### mode: yaml
+### End:
+### vim: set filetype=yaml tabstop=8 foldmarker=###',###. foldmethod=marker:
@@ -51,18 +51,44 @@
 #FIREWALL_WINDOW=

 #.
-#' PROCESSES: Maximum number of Erlang processes
+#' INET_DIST_INTERFACE: IP address where this Erlang node listens other nodes
+#
+# This communication is used by ejabberdctl command line tool,
+# and in a cluster of several ejabberd nodes.
+#
+# Default: 0.0.0.0
+#
+#INET_DIST_INTERFACE=127.0.0.1
+
+#.
+#' ERL_EPMD_ADDRESS: IP addresses where epmd listens for connections
+#
+# IMPORTANT: This option works only in Erlang/OTP R14B03 and newer.
+#
+# This environment variable may be set to a comma-separated
+# list of IP addresses, in which case the epmd daemon
+# will listen only on the specified address(es) and on the
+# loopback address (which is implicitly added to the list if it
+# has not been specified). The default behaviour is to listen on
+# all available IP addresses.
+#
+# Default: 0.0.0.0
+#
+#ERL_EPMD_ADDRESS=127.0.0.1
+
+#.
+#' ERL_PROCESSES: Maximum number of Erlang processes
 #
 # Erlang consumes a lot of lightweight processes. If there is a lot of activity
 # on ejabberd so that the maximum number of processes is reached, people will
-# experiment greater latency times. As these processes are implemented in
+# experience greater latency times. As these processes are implemented in
 # Erlang, and therefore not related to the operating system processes, you do
 # not have to worry about allowing a huge number of them.
 #
 # Default: 250000
 # Maximum: 268435456
 #
-#PROCESSES=250000
+#ERL_PROCESSES=250000

 #.
 #' ERL_MAX_ETS_TABLES: Maximum number of ETS and Mnesia tables
@@ -106,9 +132,9 @@
 #   The same as previous, but erlang will use long hostname
 #   (see erl (1) manual for details)
 #
-# Default: ejabberd
+# Default: ejabberd@localhost
 #
-#ERLANG_NODE=ejabberd
+#ERLANG_NODE=ejabberd@localhost

 #.
 #' EJABBERD_PID_PATH: ejabberd PID file
@@ -122,6 +148,27 @@
 #
 #EJABBERD_PID_PATH=/var/run/ejabberd/ejabberd.pid

+#.
+#' EJABBERD_CONFIG_PATH: ejabberd configuration file
+#
+# Specify the full path to the ejabberd configuration file. If the file name has
+# yml or yaml extension, it is parsed as a YAML file; otherwise, Erlang syntax is
+# expected.
+#
+# Default: $ETC_DIR/ejabberd.yml
+#
+#EJABBERD_CONFIG_PATH=/etc/ejabberd/ejabberd.yml
+
+#.
+#' CONTRIB_MODULES_PATH: contributed ejabberd modules path
+#
+# Specify the full path to the contributed ejabberd modules. If the path is not
+# defined, ejabberd will use ~/.ejabberd-modules in home of user running ejabberd.
+#
+# Default: $HOME/.ejabberd-modules
+#
+#CONTRIB_MODULES_PATH=/opt/ejabberd-modules
+
 #.
 #'
 # vim: foldmarker=#',#. foldmethod=marker:
@@ -0,0 +1,488 @@
+#!/bin/sh
+
+# define default configuration
+POLL=true
+SMP=auto
+ERL_MAX_PORTS=32000
+ERL_PROCESSES=250000
+ERL_MAX_ETS_TABLES=1400
+FIREWALL_WINDOW=""
+ERLANG_NODE=ejabberd@localhost
+
+# define default environment variables
+SCRIPT_DIR=`cd ${0%/*} && pwd`
+ERL={{erl}}
+IEX={{bindir}}/iex
+EPMD={{bindir}}/epmd
+INSTALLUSER={{installuser}}
+
+# check the proper system user is used if defined
+if [ "$INSTALLUSER" != "" ] ; then
+    EXEC_CMD="false"
+    for GID in `id -G`; do
+        if [ $GID -eq 0 ] ; then
+            INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6)
+            if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then
+                mkdir -p "$INSTALLUSER_HOME"
+                chown "$INSTALLUSER" "$INSTALLUSER_HOME"
+            fi
+            EXEC_CMD="su $INSTALLUSER -c"
+        fi
+    done
+    if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
+        EXEC_CMD="sh -c"
+    fi
+    if [ "$EXEC_CMD" = "false" ] ; then
+        echo "This command can only be run by root or the user $INSTALLUSER" >&2
+        exit 4
+    fi
+else
+    EXEC_CMD="sh -c"
+fi
+
+# parse command line parameters
+ARGS=""
+while [ $# -ne 0 ] ; do
+    PARAM=$1
+    shift
+    case $PARAM in
+        --) break ;;
+        --node) ERLANG_NODE_ARG=$1 ; shift ;;
+        --config-dir) ETC_DIR="$1" ; shift ;;
+        --config) EJABBERD_CONFIG_PATH="$1" ; shift ;;
+        --ctl-config) EJABBERDCTL_CONFIG_PATH="$1" ; shift ;;
+        --logs) LOGS_DIR="$1" ; shift ;;
+        --spool) SPOOL_DIR="$1" ; shift ;;
+        *) ARGS="$ARGS $PARAM" ;;
+    esac
+done
+
+# Define ejabberd variable if they have not been defined from the command line
+if [ "$ETC_DIR" = "" ] ; then
+    ETC_DIR={{sysconfdir}}/ejabberd
+fi
+if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ; then
+    EJABBERDCTL_CONFIG_PATH=$ETC_DIR/ejabberdctl.cfg
+fi
+if [ -f "$EJABBERDCTL_CONFIG_PATH" ] ; then
+    . "$EJABBERDCTL_CONFIG_PATH"
+fi
+if [ "$EJABBERD_CONFIG_PATH" = "" ] ; then
+    EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml
+fi
+if [ "$LOGS_DIR" = "" ] ; then
+    LOGS_DIR={{localstatedir}}/log/ejabberd
+fi
+if [ "$SPOOL_DIR" = "" ] ; then
+    SPOOL_DIR={{localstatedir}}/lib/ejabberd
+fi
+if [ "$EJABBERD_DOC_PATH" = "" ] ; then
+    EJABBERD_DOC_PATH={{docdir}}
+fi
+if [ "$ERLANG_NODE_ARG" != "" ] ; then
+    ERLANG_NODE=$ERLANG_NODE_ARG
+    NODE=${ERLANG_NODE%@*}
+fi
+if [ "{{release}}" != "true" ] ; then
+    if [ "$EJABBERDDIR" = "" ] ; then
+        EJABBERDDIR={{libdir}}/ejabberd
+    fi
+    if [ "$EJABBERD_EBIN_PATH" = "" ] ; then
+        EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
+    fi
+    if [ "$EJABBERD_PRIV_PATH" = "" ] ; then
+        EJABBERD_PRIV_PATH=$EJABBERDDIR/priv
+    fi
+    if [ "$EJABBERD_BIN_PATH" = "" ] ; then
+        EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin
+    fi
+    if [ "$EJABBERD_SO_PATH" = "" ] ; then
+        EJABBERD_SO_PATH=$EJABBERD_PRIV_PATH/lib
+    fi
+    if [ "$EJABBERD_MSGS_PATH" = "" ] ; then
+        EJABBERD_MSGS_PATH=$EJABBERD_PRIV_PATH/msgs
+    fi
+fi
+EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
+SASL_LOG_PATH=$LOGS_DIR/erlang.log
+DATETIME=`date "+%Y%m%d-%H%M%S"`
+ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump
+ERL_INETRC=$ETC_DIR/inetrc
+
+# define mnesia options
+MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS"
+# define erl parameters
+ERL_OPTIONS=$(echo $ERL_OPTIONS | sed 's/ /\\ /g')
+ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS"
+KERNEL_OPTS=""
+if [ "$FIREWALL_WINDOW" != "" ] ; then
+    KERNEL_OPTS="${KERNEL_OPTS} -kernel inet_dist_listen_min ${FIREWALL_WINDOW%-*} inet_dist_listen_max ${FIREWALL_WINDOW#*-}"
+fi
+if [ "$INET_DIST_INTERFACE" != "" ] ; then
+    INET_DIST_INTERFACE2="$(echo $INET_DIST_INTERFACE | sed 's/\./,/g')"
+    if [ "$INET_DIST_INTERFACE" != "$INET_DIST_INTERFACE2" ] ; then
+        INET_DIST_INTERFACE2="{$INET_DIST_INTERFACE2}"
+    fi
+    KERNEL_OPTS="${KERNEL_OPTS} -kernel inet_dist_use_interface \"${INET_DIST_INTERFACE2}\""
+fi
+if [ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] ; then
+    NAME="-sname"
+else
+    NAME="-name"
+fi
+IEXNAME="-$NAME"
+
+# define ejabberd environment parameters
+if [ "$EJABBERD_CONFIG_PATH" != "${EJABBERD_CONFIG_PATH%.yml}" ] ; then
+    rate=$(sed '/^[ 	]*log_rate_limit/!d;s/.*://;s/ *//' $EJABBERD_CONFIG_PATH)
+    rotate=$(sed '/^[ 	]*log_rotate_size/!d;s/.*://;s/ *//' $EJABBERD_CONFIG_PATH)
+    count=$(sed '/^[ 	]*log_rotate_count/!d;s/.*://;s/ *//' $EJABBERD_CONFIG_PATH)
+    date=$(sed '/^[ 	]*log_rotate_date/!d;s/.*://;s/ *//' $EJABBERD_CONFIG_PATH)
+else
+    rate=$(sed '/^[ 	]*log_rate_limit/!d;s/.*,//;s/ *//;s/}\.//' $EJABBERD_CONFIG_PATH)
+    rotate=$(sed '/^[ 	]*log_rotate_size/!d;s/.*,//;s/ *//;s/}\.//' $EJABBERD_CONFIG_PATH)
+    count=$(sed '/^[ 	]*log_rotate_count/!d;s/.*,//;s/ *//;s/}\.//' $EJABBERD_CONFIG_PATH)
+    date=$(sed '/^[ 	]*log_rotate_date/!d;s/.*,//;s/ *//;s/}\.//' $EJABBERD_CONFIG_PATH)
+fi
+[ -z "$rate" ] || EJABBERD_OPTS="log_rate_limit $rate"
+[ -z "$rotate" ] || EJABBERD_OPTS="${EJABBERD_OPTS} log_rotate_size $rotate"
+[ -z "$count" ] || EJABBERD_OPTS="${EJABBERD_OPTS} log_rotate_count $count"
+[ -z "$date" ] || EJABBERD_OPTS="${EJABBERD_OPTS} log_rotate_date '$date'"
+[ -z "$EJABBERD_OPTS" ] || EJABBERD_OPTS="-ejabberd ${EJABBERD_OPTS}"
+
+[ -d $SPOOL_DIR ] || $EXEC_CMD "mkdir -p $SPOOL_DIR"
+cd $SPOOL_DIR
+
+# export global variables
+export EJABBERD_CONFIG_PATH
+export EJABBERD_MSGS_PATH
+export EJABBERD_LOG_PATH
+export EJABBERD_SO_PATH
+export EJABBERD_BIN_PATH
+export EJABBERD_DOC_PATH
+export EJABBERD_PID_PATH
+export ERL_CRASH_DUMP
+export ERL_EPMD_ADDRESS
+export ERL_INETRC
+export ERL_MAX_PORTS
+export ERL_MAX_ETS_TABLES
+export CONTRIB_MODULES_PATH
+
+# start server
+start()
+{
+    check_start
+    $EXEC_CMD "$ERL \
+      $NAME $ERLANG_NODE \
+      -noinput -detached \
+      -pa $EJABBERD_EBIN_PATH \
+      $MNESIA_OPTS \
+      $KERNEL_OPTS \
+      $EJABBERD_OPTS \
+      -s ejabberd \
+      -sasl sasl_error_logger \\{file,\\\"$SASL_LOG_PATH\\\"\\} \
+      $ERLANG_OPTS $ARGS \"$@\""
+}
+
+# attach to server
+debug()
+{
+    debugwarning
+    TTY=`tty | sed -e  's/.*\///g'`
+    $EXEC_CMD "$ERL \
+      $NAME debug-${TTY}-${ERLANG_NODE} \
+      -remsh $ERLANG_NODE \
+      -hidden \
+      $KERNEL_OPTS \
+      $ERLANG_OPTS $ARGS \"$@\""
+}
+
+# attach to server using Elixir
+iexdebug()
+{
+    debugwarning
+    TTY=`tty | sed -e  's/.*\///g'`
+    # Elixir shell is hidden as default
+    $EXEC_CMD "$IEX \
+      $IEXNAME debug-${TTY}-${ERLANG_NODE} \
+      --remsh $ERLANG_NODE \
+      --erl \"$KERNEL_OPTS\" \
+      --erl \"$ERLANG_OPTS\" --erl \"$ARGS\" --erl \"$@\""
+}
+
+# start interactive server
+live()
+{
+    livewarning
+    $EXEC_CMD "$ERL \
+      $NAME $ERLANG_NODE \
+      -pa $EJABBERD_EBIN_PATH \
+      $MNESIA_OPTS \
+      $KERNEL_OPTS \
+      $EJABBERD_OPTS \
+      -s ejabberd \
+      $ERLANG_OPTS $ARGS \"$@\""
+}
+
+# start interactive server with Elixir
+iexlive()
+{
+    livewarning
+    $EXEC_CMD "$IEX \
+      $IEXNAME $ERLANG_NODE \
+      -pa $EJABBERD_EBIN_PATH \
+      --erl \"-mnesia dir \\\"$SPOOL_DIR\\\"\" \
+      --erl \"$KERNEL_OPTS\" \
+      --erl \"$EJABBERD_OPTS\" \
+      --app ejabberd \
+      --erl \"$ERLANG_OPTS\" --erl $ARGS --erl \"$@\""
+}
+
+debugwarning()
+{
+    if [ "$EJABBERD_BYPASS_WARNINGS" != "true" ] ; then
+        echo "--------------------------------------------------------------------"
+        echo ""
+        echo "IMPORTANT: we will attempt to attach an INTERACTIVE shell"
+        echo "to an already running ejabberd node."
+        echo "If an ERROR is printed, it means the connection was not successful."
+        echo "You can interact with the ejabberd node if you know how to use it."
+        echo "Please be extremely cautious with your actions,"
+        echo "and exit immediately if you are not completely sure."
+        echo ""
+        echo "To detach this shell from ejabberd, press:"
+        echo "  control+c, control+c"
+        echo ""
+        echo "--------------------------------------------------------------------"
+        echo "To bypass permanently this warning, add to ejabberdctl.cfg the line:"
+        echo "  EJABBERD_BYPASS_WARNINGS=true"
+        echo "Press return to continue"
+        read foo
+        echo ""
+    fi
+}
+
+livewarning()
+{
+    check_start
+    if [ "$EJABBERD_BYPASS_WARNINGS" != "true" ] ; then
+        echo "--------------------------------------------------------------------"
+        echo ""
+        echo "IMPORTANT: ejabberd is going to start in LIVE (interactive) mode."
+        echo "All log messages will be shown in the command shell."
+        echo "You can interact with the ejabberd node if you know how to use it."
+        echo "Please be extremely cautious with your actions,"
+        echo "and exit immediately if you are not completely sure."
+        echo ""
+        echo "To exit this LIVE mode and stop ejabberd, press:"
+        echo "  q().  and press the Enter key"
+        echo ""
+        echo "--------------------------------------------------------------------"
+        echo "To bypass permanently this warning, add to ejabberdctl.cfg the line:"
+        echo "  EJABBERD_BYPASS_WARNINGS=true"
+        echo "Press return to continue"
+        read foo
+        echo ""
+    fi
+}
+
+etop()
+{
+    TTY=`tty | sed -e  's/.*\///g'`
+    $EXEC_CMD "$ERL \
+      $NAME debug-${TTY}-${ERLANG_NODE} \
+      -hidden -s etop -s erlang halt -output text -node $ERLANG_NODE"
+}
+
+ping()
+{
+    TTY=`tty | sed -e  's/.*\///g'`
+    $EXEC_CMD "$ERL \
+      $NAME ping-${TTY}-${ERLANG_NODE} \
+      -hidden \
+      -pa $EJABBERD_EBIN_PATH \
+      $KERNEL_OPTS $ERLANG_OPTS \
+      -eval 'io:format(\"~p~n\",[net_adm:ping($1)])' \
+      -s erlang halt -output text -noinput"
+}
+
+help()
+{
+    echo ""
+    echo "Commands to start an ejabberd node:"
+    echo "  start    Start an ejabberd node in server mode"
+    echo "  debug    Attach an interactive Erlang shell to a running ejabberd node"
+    echo "  iexdebug Attach an interactive Elixir shell to a running ejabberd node"
+    echo "  live     Start an ejabberd node in live (interactive) mode"
+    echo "  iexlive  Start an ejabberd node in live (interactive) mode, within an Elixir shell"
+    echo ""
+    echo "Optional parameters when starting an ejabberd node:"
+    echo "  --config-dir dir   Config ejabberd:    $ETC_DIR"
+    echo "  --config file      Config ejabberd:    $EJABBERD_CONFIG_PATH"
+    echo "  --ctl-config file  Config ejabberdctl: $EJABBERDCTL_CONFIG_PATH"
+    echo "  --logs dir         Directory for logs: $LOGS_DIR"
+    echo "  --spool dir        Database spool dir: $SPOOL_DIR"
+    echo "  --node nodename    ejabberd node name: $ERLANG_NODE"
+    echo ""
+}
+
+# common control function
+ctl()
+{
+    COMMAND=$@
+
+    # Control number of connections identifiers
+    # using flock if available. Expects a linux-style
+    # flock that can lock a file descriptor.
+    MAXCONNID=100
+    CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl
+    FLOCK=/usr/bin/flock
+    if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
+        JOT=/usr/bin/jot
+        if [ ! -x "$JOT" ] ; then
+            # no flock or jot, simply invoke ctlexec()
+            CTL_CONN="ctl-${ERLANG_NODE}"
+            ctlexec $CTL_CONN $COMMAND
+            result=$?
+        else
+            # no flock, but at least there is jot
+            RAND=`jot -r 1 0 $MAXCONNID`
+            CTL_CONN="ctl-${RAND}-${ERLANG_NODE}"
+            ctlexec $CTL_CONN $COMMAND
+            result=$?
+        fi
+    else
+        # we have flock so we get a lock
+        # on one of a limited number of
+        # conn names -- this allows
+        # concurrent invocations using a bound
+        # number of atoms
+        for N in `seq 1 $MAXCONNID`; do
+            CTL_CONN="ejabberdctl-$N"
+            CTL_LOCKFILE="$CONNLOCKDIR/$CTL_CONN"
+            (
+                exec 8>"$CTL_LOCKFILE"
+                if flock --nb 8; then
+                    ctlexec $CTL_CONN $COMMAND
+                    ssresult=$?
+                    # segregate from possible flock exit(1)
+                    ssresult=`expr $ssresult \* 10`
+                    exit $ssresult
+                else
+                    exit 1
+                fi
+            )
+            result=$?
+            if [ $result -eq 1 ] ; then
+                # means we errored out in flock
+                # rather than in the exec - stay in the loop
+                # trying other conn names...
+                badlock=1
+            else
+                badlock=""
+                break;
+            fi
+        done
+        result=`expr $result / 10`
+    fi
+
+    if [ "$badlock" ] ;then
+        echo "Ran out of connections to try. Your ejabberd processes" >&2
+        echo "may be stuck or this is a very busy server. For very"   >&2
+        echo "busy servers, consider raising MAXCONNID in ejabberdctl">&2
+        exit 1;
+    fi
+
+    case $result in
+        0) :;;
+        1) :;;
+        2) help;;
+        3) help;;
+    esac
+    return $result
+}
+
+ctlexec()
+{
+    CONN_NAME=$1; shift
+    COMMAND=$(echo $@ | sed 's/;/\\;/g')
+    $EXEC_CMD "$ERL \
+      $NAME ${CONN_NAME} \
+      -noinput \
+      -hidden \
+      -pa $EJABBERD_EBIN_PATH \
+      $KERNEL_OPTS \
+      -s ejabberd_ctl -extra $ERLANG_NODE $COMMAND"
+}
+
+# stop epmd if there is no other running node
+stop_epmd()
+{
+    $EPMD -names 2>/dev/null | grep -q name || $EPMD -kill >/dev/null
+}
+
+# make sure node not already running and node name unregistered
+check_start()
+{
+    $EPMD -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && {
+        ps ux | grep -v grep | grep -q " $ERLANG_NODE " && {
+            echo "ERROR: The ejabberd node '$ERLANG_NODE' is already running."
+            exit 4
+        } || {
+            ps ux | grep -v grep | grep -q beam && {
+                echo "ERROR: The ejabberd node '$ERLANG_NODE' is registered,"
+                echo "       but no related beam process has been found."
+                echo "Shutdown all other erlang nodes, and call 'epmd -kill'."
+                exit 5
+            } || {
+                $EPMD -kill >/dev/null
+            }
+        }
+    }
+}
+
+# cluster setup
+join_cluster()
+{
+    $EJABBERD_BIN_PATH/joincluster $*
+}
+leave_cluster()
+{
+    $EJABBERD_BIN_PATH/leavecluster $*
+}
+
+# allow sync calls
+wait_for_status()
+{
+    # args: status try delay
+    # return: 0 OK, 1 KO
+    timeout=$2
+    status=4
+    while [ $status -ne $1 ] ; do
+        sleep $3
+        timeout=`expr $timeout - 1`
+        [ $timeout -eq 0 ] && {
+            status=$1
+        } || {
+            ctl status > /dev/null
+            status=$?
+        }
+    done
+    [ $timeout -eq 0 ] && return 1 || return 0
+}
+
+# main handler
+case $ARGS in
+    ' start') start;;
+    ' debug') debug;;
+    ' iexdebug') iexdebug;;
+    ' live') live;;
+    ' iexlive') iexlive;;
+    ' ping'*) ping ${ARGS# ping};;
+    ' etop') etop;;
+    ' started') wait_for_status 0 30 2;; # wait 30x2s before timeout
+    ' stopped') wait_for_status 3 15 2 && stop_epmd;; # wait 15x2s before timeout
+    ' join_cluster'*) join_cluster ${ARGS# join_cluster};;
+    ' leave_cluster'*) leave_cluster ${ARGS# leave_cluster};;
+    *) ctl $ARGS;;
+esac
@@ -42,6 +42,22 @@ while(1)
             # password is null. Return 1 if the user $user\@$domain exitst.
             $result = 1;
          },last SWITCH;
+
+        $op eq 'tryregister' and do
+          {
+             $result = 1;
+          },last SWITCH;
+
+        $op eq 'removeuser' and do
+          {
+             # password is null. Return 1 if the user $user\@$domain exitst.
+             $result = 1;
+          },last SWITCH;
+
+        $op eq 'removeuser3' and do
+          {
+             $result = 1;
+          },last SWITCH;
      };
    my $out = pack "nn",2,$result ? 1 : 0;
    syswrite STDOUT,$out;
@@ -0,0 +1,81 @@
+%% Generated by the Erlang ASN.1 compiler version:2.0.1
+%% Purpose: Erlang record definitions for each named and unnamed
+%% SEQUENCE and SET, and macro definitions for each value
+%% definition,in module ELDAPv3
+
+
+
+-record('LDAPMessage',{
+messageID, protocolOp, controls = asn1_NOVALUE}).
+
+-record('AttributeValueAssertion',{
+attributeDesc, assertionValue}).
+
+-record('Attribute',{
+type, vals}).
+
+-record('LDAPResult',{
+resultCode, matchedDN, errorMessage, referral = asn1_NOVALUE}).
+
+-record('Control',{
+controlType, criticality = asn1_DEFAULT, controlValue = asn1_NOVALUE}).
+
+-record('BindRequest',{
+version, name, authentication}).
+
+-record('SaslCredentials',{
+mechanism, credentials = asn1_NOVALUE}).
+
+-record('BindResponse',{
+resultCode, matchedDN, errorMessage, referral = asn1_NOVALUE, serverSaslCreds = asn1_NOVALUE}).
+
+-record('SearchRequest',{
+baseObject, scope, derefAliases, sizeLimit, timeLimit, typesOnly, filter, attributes}).
+
+-record('SubstringFilter',{
+type, substrings}).
+
+-record('MatchingRuleAssertion',{
+matchingRule = asn1_NOVALUE, type = asn1_NOVALUE, matchValue, dnAttributes = asn1_DEFAULT}).
+
+-record('SearchResultEntry',{
+objectName, attributes}).
+
+-record('PartialAttributeList_SEQOF',{
+type, vals}).
+
+-record('ModifyRequest',{
+object, modification}).
+
+-record('ModifyRequest_modification_SEQOF',{
+operation, modification}).
+
+-record('AttributeTypeAndValues',{
+type, vals}).
+
+-record('AddRequest',{
+entry, attributes}).
+
+-record('AttributeList_SEQOF',{
+type, vals}).
+
+-record('ModifyDNRequest',{
+entry, newrdn, deleteoldrdn, newSuperior = asn1_NOVALUE}).
+
+-record('CompareRequest',{
+entry, ava}).
+
+-record('ExtendedRequest',{
+requestName, requestValue = asn1_NOVALUE}).
+
+-record('ExtendedResponse',{
+resultCode, matchedDN, errorMessage, referral = asn1_NOVALUE, responseName = asn1_NOVALUE, response = asn1_NOVALUE}).
+
+-record('PasswdModifyRequestValue',{
+userIdentity = asn1_NOVALUE, oldPasswd = asn1_NOVALUE, newPasswd = asn1_NOVALUE}).
+
+-record('PasswdModifyResponseValue',{
+genPasswd = asn1_NOVALUE}).
+
+-define('maxInt', 2147483647).
+-define('passwdModifyOID', [49,46,51,46,54,46,49,46,52,46,49,46,52,50,48,51,46,49,46,49,49,46,49]).
@@ -0,0 +1,44 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-record(adhoc_request,
+{
+    lang = <<"">>      :: binary(),
+    node = <<"">>      :: binary(),
+    sessionid = <<"">> :: binary(),
+    action = <<"">>    :: binary(),
+    xdata = false      :: false | xmlel(),
+    others = []        :: [xmlel()]
+}).
+
+-record(adhoc_response,
+{
+    lang = <<"">>          :: binary(),
+    node = <<"">>          :: binary(),
+    sessionid = <<"">>     :: binary(),
+    status                 :: atom(),
+    defaultaction = <<"">> :: binary(),
+    actions       = []     :: [binary()],
+    notes         = []     :: [{binary(), binary()}],
+    elements      = []     :: [xmlel()]
+}).
+
+-type adhoc_request() :: #adhoc_request{}.
+-type adhoc_response() :: #adhoc_response{}.
@@ -0,0 +1,72 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-ifndef(EJABBERD_HRL).
+-define(EJABBERD_HRL, true).
+
+-define(VERSION, ejabberd_config:get_version()).
+
+-define(MYHOSTS, ejabberd_config:get_myhosts()).
+
+-define(MYNAME, hd(ejabberd_config:get_myhosts())).
+
+-define(MYLANG, ejabberd_config:get_mylang()).
+
+-define(MSGS_DIR, filename:join(["priv", "msgs"])).
+
+-define(SQL_DIR, filename:join(["priv", "sql"])).
+
+-define(CONFIG_PATH, <<"ejabberd.cfg">>).
+
+-define(LOG_PATH, <<"ejabberd.log">>).
+
+-define(EJABBERD_URI, <<"http://www.process-one.net/en/ejabberd/">>).
+
+-define(S2STIMEOUT, 600000).
+
+%%-define(DBGFSM, true).
+
+-record(scram,
+	{storedkey = <<"">>,
+         serverkey = <<"">>,
+         salt = <<"">>,
+         iterationcount = 0 :: integer()}).
+
+-type scram() :: #scram{}.
+
+-define(SCRAM_DEFAULT_ITERATION_COUNT, 4096).
+
+-ifdef(ERL_DEPRECATED_TYPES).
+
+-define(TDICT, dict()).
+-define(TGB_TREE, gb_tree()).
+-define(TGB_SET, gb_set()).
+-define(TQUEUE, queue()).
+
+-else.
+
+-define(TDICT, dict:dict()).
+-define(TGB_TREE, gb_trees:tree()).
+-define(TGB_SET, gb_set:set()).
+-define(TQUEUE, queue:queue()).
+
+-endif.
+
+-endif.
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2010   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -12,17 +12,38 @@
 %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %%% General Public License for more details.
 %%%
-%%% You should have received a copy of the GNU General Public License
-%%% along with this program; if not, write to the Free Software
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-%%% 02111-1307 USA
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------

-record(ejabberd_commands, {name, tags = [],
-			   desc = "", longdesc = "",
-			   module, function,
-			   args = [], result = rescode}).
+-type aterm() :: {atom(), atype()}.
+-type atype() :: integer | string | binary |
+                 {tuple, [aterm()]} | {list, aterm()}.
+-type rterm() :: {atom(), rtype()}.
+-type rtype() :: integer | string | atom |
+                 {tuple, [rterm()]} | {list, rterm()} |
+                 rescode | restuple.
+
+-record(ejabberd_commands,
+	{name                    :: atom(),
+         tags = []               :: [atom()] | '_' | '$2',
+         desc = ""               :: string() | '_' | '$3',
+         longdesc = ""           :: string() | '_',
+	 module                  :: atom(),
+         function                :: atom(),
+         args = []               :: [aterm()] | '_' | '$1' | '$2',
+         result = {res, rescode} :: rterm() | '_' | '$2'}).
+
+-type ejabberd_commands() :: #ejabberd_commands{name :: atom(),
+                                                tags :: [atom()],
+                                                desc :: string(),
+                                                longdesc :: string(),
+                                                module :: atom(),
+                                                function :: atom(),
+                                                args :: [aterm()],
+                                                result :: rterm()}.

 %% @type ejabberd_commands() = #ejabberd_commands{
 %%    name = atom(),
@@ -50,3 +71,4 @@

 %% @type rterm() = {Name::atom(), Type::rtype()}.
 %% A result term is a tuple with the term name and the term type.
+
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2010   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -12,26 +12,19 @@
 %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %%% General Public License for more details.
 %%%
-%%% You should have received a copy of the GNU General Public License
-%%% along with this program; if not, write to the Free Software
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-%%% 02111-1307 USA
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------

-record(privacy, {us,
-		  default = none,
-		  lists = []}).
+-record(local_config, {key :: any(), value :: any()}).

-record(listitem, {type = none,
-		   value = none,
-		   action,
-		   order,
-		   match_all = false,
-		   match_iq = false,
-		   match_message = false,
-		   match_presence_in = false,
-		   match_presence_out = false
-		  }).
+-type local_config() :: #local_config{}.

-record(userlist, {name = none, list = [], needdb = false }).
+-record(state,
+	{opts = []               :: [acl:acl() | local_config()],
+         hosts = []              :: [binary()],
+         override_local = false  :: boolean(),
+	 override_global = false :: boolean(),
+         override_acls = false   :: boolean()}).
@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2010   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -12,14 +12,16 @@
 %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %%% General Public License for more details.
 %%%
-%%% You should have received a copy of the GNU General Public License
-%%% along with this program; if not, write to the Free Software
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-%%% 02111-1307 USA
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------

 -define(STATUS_SUCCESS, 0).
-define(STATUS_ERROR,   1).
-define(STATUS_USAGE,   2).
-define(STATUS_BADRPC,  3).
+
+-define(STATUS_ERROR, 1).
+
+-define(STATUS_USAGE, 2).
+
+-define(STATUS_BADRPC, 3).
@@ -0,0 +1,48 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-record(request,
+	{method, %            :: method(),
+	 path = []         :: [binary()],
+	 q = []            :: [{binary() | nokey, binary()}],
+	 us = {<<>>, <<>>} :: {binary(), binary()},
+	 auth              :: {binary(), binary()} |
+	 {auth_jid, {binary(), binary()}, jlib:jid()},
+	 lang = <<"">>     :: binary(),
+	 data = <<"">>     :: binary(),
+	 ip                :: {inet:ip_address(), inet:port_number()},
+	 host = <<"">>     :: binary(),
+	 port = 5280       :: inet:port_number(),
+	 tp = http, %         :: protocol(),
+	 opts = []         :: list(),
+	 headers = []      :: [{atom() | binary(), binary()}]}).
+
+
+-record(ws,
+	{socket                  :: inet:socket() | p1_tls:tls_socket(),
+	 sockmod = gen_tcp       :: gen_tcp | p1_tls,
+	 ip                      :: {inet:ip_address(), inet:port_number()},
+	 host = <<"">>           :: binary(),
+	 port = 5280             :: inet:port_number(),
+	 path = []               :: [binary()],
+	 headers = []            :: [{atom() | binary(), binary()}],
+	 local_path = []         :: [binary()],
+	 q = []                  :: [{binary() | nokey, binary()}],
+	 buf                     :: binary()}).
@@ -0,0 +1,12 @@
+-ifndef(EJABBERD_SM_HRL).
+-define(EJABBERD_SM_HRL, true).
+
+-record(session, {sid, usr, us, priority, info}).
+-record(session_counter, {vhost, count}).
+-type sid() :: {erlang:timestamp(), pid()}.
+-type ip() :: {inet:ip_address(), inet:port_number()} | undefined.
+-type info() :: [{conn, atom()} | {ip, ip()} | {node, atom()}
+                 | {oor, boolean()} | {auth_module, atom()}].
+-type prio() :: undefined | integer().
+
+-endif.
@@ -0,0 +1,104 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-define(X(Name),
+	#xmlel{name = Name, attrs = [], children = []}).
+
+-define(XA(Name, Attrs),
+	#xmlel{name = Name, attrs = Attrs, children = []}).
+
+-define(XE(Name, Els),
+	#xmlel{name = Name, attrs = [], children = Els}).
+
+-define(XAE(Name, Attrs, Els),
+	#xmlel{name = Name, attrs = Attrs, children = Els}).
+
+-define(C(Text), {xmlcdata, Text}).
+
+-define(XC(Name, Text), ?XE(Name, [?C(Text)])).
+
+-define(XAC(Name, Attrs, Text),
+	?XAE(Name, Attrs, [?C(Text)])).
+
+-define(T(Text), translate:translate(Lang, Text)).
+
+-define(CT(Text), ?C((?T(Text)))).
+
+-define(XCT(Name, Text), ?XC(Name, (?T(Text)))).
+
+-define(XACT(Name, Attrs, Text),
+	?XAC(Name, Attrs, (?T(Text)))).
+
+-define(LI(Els), ?XE(<<"li">>, Els)).
+
+-define(A(URL, Els),
+	?XAE(<<"a">>, [{<<"href">>, URL}], Els)).
+
+-define(AC(URL, Text), ?A(URL, [?C(Text)])).
+
+-define(ACT(URL, Text), ?AC(URL, (?T(Text)))).
+
+-define(P, ?X(<<"p">>)).
+
+-define(BR, ?X(<<"br">>)).
+
+-define(INPUT(Type, Name, Value),
+	?XA(<<"input">>,
+	    [{<<"type">>, Type}, {<<"name">>, Name},
+	     {<<"value">>, Value}])).
+
+-define(INPUTT(Type, Name, Value),
+	?INPUT(Type, Name, (?T(Value)))).
+
+-define(INPUTS(Type, Name, Value, Size),
+	?XA(<<"input">>,
+	    [{<<"type">>, Type}, {<<"name">>, Name},
+	     {<<"value">>, Value}, {<<"size">>, Size}])).
+
+-define(INPUTST(Type, Name, Value, Size),
+	?INPUT(Type, Name, (?T(Value)), Size)).
+
+-define(ACLINPUT(Text),
+	?XE(<<"td">>,
+	    [?INPUT(<<"text">>, <<"value", ID/binary>>, Text)])).
+
+-define(TEXTAREA(Name, Rows, Cols, Value),
+	?XAC(<<"textarea">>,
+	     [{<<"name">>, Name}, {<<"rows">>, Rows},
+	      {<<"cols">>, Cols}],
+	     Value)).
+
+%% Build an xmlelement for result
+-define(XRES(Text),
+	?XAC(<<"p">>, [{<<"class">>, <<"result">>}], Text)).
+
+%% Guide Link
+-define(XREST(Text), ?XRES((?T(Text)))).
+
+-define(GL(Ref, Title),
+	?XAE(<<"div">>, [{<<"class">>, <<"guidelink">>}],
+	     [?XAE(<<"a">>,
+		   [{<<"href">>, <<"/admin/doc/guide.html#", Ref/binary>>},
+		    {<<"target">>, <<"_blank">>}],
+		   [?C(<<"[Guide: ", Title/binary, "]">>)])])).
+
+%% h1 with a Guide Link
+-define(H1GL(Name, Ref, Title),
+	[?XC(<<"h1">>, Name), ?GL(Ref, Title)]).
@@ -0,0 +1,63 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-define(LDAP_PORT, 389).
+
+-define(LDAPS_PORT, 636).
+
+-type scope() :: baseObject | singleLevel | wholeSubtree.
+
+-record(eldap_search,
+	{scope = wholeSubtree              :: scope(),
+         base = <<"">>                     :: binary(),
+         filter                            :: eldap:filter(),
+         limit = 0                         :: non_neg_integer(),
+	 attributes = []                   :: [binary()],
+         types_only = false                :: boolean(),
+	 deref_aliases = neverDerefAliases :: neverDerefAliases |
+                                              derefInSearching |
+                                              derefFindingBaseObj |
+                                              derefAlways,
+         timeout = 0                       :: non_neg_integer()}).
+
+-record(eldap_search_result, {entries = []   :: [eldap_entry()],
+                              referrals = [] :: list()}).
+
+-record(eldap_entry, {object_name = <<>> :: binary(),
+                      attributes = []    :: [{binary(), [binary()]}]}).
+
+-type tlsopts() :: [{encrypt, tls | starttls | none} |
+                    {tls_cacertfile, binary() | undefined} |
+                    {tls_depth, non_neg_integer() | undefined} |
+                    {tls_verify, hard | soft | false}].
+
+-record(eldap_config, {servers = [] :: [binary()],
+                       backups = [] :: [binary()],
+                       tls_options = [] :: tlsopts(),
+                       port = ?LDAP_PORT :: inet:port_number(),
+                       dn = <<"">> :: binary(),
+                       password = <<"">> :: binary(),
+                       base = <<"">> :: binary(),
+                       deref_aliases = never :: never | searching |
+                                                finding | always}).
+
+-type eldap_config() :: #eldap_config{}.
+-type eldap_search() :: #eldap_search{}.
+-type eldap_entry() :: #eldap_entry{}.
@@ -0,0 +1,46 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-define(CT_XML,
+	{<<"Content-Type">>, <<"text/xml; charset=utf-8">>}).
+
+-define(CT_PLAIN,
+	{<<"Content-Type">>, <<"text/plain">>}).
+
+-define(AC_ALLOW_ORIGIN,
+	{<<"Access-Control-Allow-Origin">>, <<"*">>}).
+
+-define(AC_ALLOW_METHODS,
+	{<<"Access-Control-Allow-Methods">>,
+	 <<"GET, POST, OPTIONS">>}).
+
+-define(AC_ALLOW_HEADERS,
+	{<<"Access-Control-Allow-Headers">>,
+	 <<"Content-Type">>}).
+
+-define(AC_MAX_AGE,
+	{<<"Access-Control-Max-Age">>, <<"86400">>}).
+
+-define(OPTIONS_HEADER,
+	[?CT_PLAIN, ?AC_ALLOW_ORIGIN, ?AC_ALLOW_METHODS,
+	 ?AC_ALLOW_HEADERS, ?AC_MAX_AGE]).
+
+-define(HEADER,
+	[?CT_XML, ?AC_ALLOW_ORIGIN, ?AC_ALLOW_HEADERS]).
@@ -0,0 +1,505 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-include("ns.hrl").
+-ifdef(NO_EXT_LIB).
+-include("xml.hrl").
+-else.
+-include_lib("p1_xml/include/xml.hrl").
+-endif.
+
+-define(STANZA_ERROR(Code, Type, Condition),
+	#xmlel{name = <<"error">>,
+	       attrs = [{<<"code">>, Code}, {<<"type">>, Type}],
+	       children =
+		   [#xmlel{name = Condition,
+			   attrs = [{<<"xmlns">>, ?NS_STANZAS}],
+			   children = []}]}).
+
+-define(ERR_BAD_FORMAT,
+	?STANZA_ERROR(<<"406">>, <<"modify">>,
+		      <<"bad-format">>)).
+
+-define(ERR_BAD_REQUEST,
+	?STANZA_ERROR(<<"400">>, <<"modify">>,
+		      <<"bad-request">>)).
+
+-define(ERR_CONFLICT,
+	?STANZA_ERROR(<<"409">>, <<"cancel">>, <<"conflict">>)).
+
+-define(ERR_FEATURE_NOT_IMPLEMENTED,
+	?STANZA_ERROR(<<"501">>, <<"cancel">>,
+		      <<"feature-not-implemented">>)).
+
+-define(ERR_FORBIDDEN,
+	?STANZA_ERROR(<<"403">>, <<"auth">>, <<"forbidden">>)).
+
+-define(ERR_GONE,
+	?STANZA_ERROR(<<"302">>, <<"modify">>, <<"gone">>)).
+
+-define(ERR_INTERNAL_SERVER_ERROR,
+	?STANZA_ERROR(<<"500">>, <<"wait">>,
+		      <<"internal-server-error">>)).
+
+-define(ERR_ITEM_NOT_FOUND,
+	?STANZA_ERROR(<<"404">>, <<"cancel">>,
+		      <<"item-not-found">>)).
+
+-define(ERR_JID_MALFORMED,
+	?STANZA_ERROR(<<"400">>, <<"modify">>,
+		      <<"jid-malformed">>)).
+
+-define(ERR_NOT_ACCEPTABLE,
+	?STANZA_ERROR(<<"406">>, <<"modify">>,
+		      <<"not-acceptable">>)).
+
+-define(ERR_NOT_ALLOWED,
+	?STANZA_ERROR(<<"405">>, <<"cancel">>,
+		      <<"not-allowed">>)).
+
+-define(ERR_NOT_AUTHORIZED,
+	?STANZA_ERROR(<<"401">>, <<"auth">>,
+		      <<"not-authorized">>)).
+
+-define(ERR_PAYMENT_REQUIRED,
+	?STANZA_ERROR(<<"402">>, <<"auth">>,
+		      <<"payment-required">>)).
+
+-define(ERR_RECIPIENT_UNAVAILABLE,
+	?STANZA_ERROR(<<"404">>, <<"wait">>,
+		      <<"recipient-unavailable">>)).
+
+-define(ERR_REDIRECT,
+	?STANZA_ERROR(<<"302">>, <<"modify">>, <<"redirect">>)).
+
+-define(ERR_REGISTRATION_REQUIRED,
+	?STANZA_ERROR(<<"407">>, <<"auth">>,
+		      <<"registration-required">>)).
+
+-define(ERR_REMOTE_SERVER_NOT_FOUND,
+	?STANZA_ERROR(<<"404">>, <<"cancel">>,
+		      <<"remote-server-not-found">>)).
+
+-define(ERR_REMOTE_SERVER_TIMEOUT,
+	?STANZA_ERROR(<<"504">>, <<"wait">>,
+		      <<"remote-server-timeout">>)).
+
+-define(ERR_RESOURCE_CONSTRAINT,
+	?STANZA_ERROR(<<"500">>, <<"wait">>,
+		      <<"resource-constraint">>)).
+
+-define(ERR_SERVICE_UNAVAILABLE,
+	?STANZA_ERROR(<<"503">>, <<"cancel">>,
+		      <<"service-unavailable">>)).
+
+-define(ERR_SUBSCRIPTION_REQUIRED,
+	?STANZA_ERROR(<<"407">>, <<"auth">>,
+		      <<"subscription-required">>)).
+
+-define(ERR_UNEXPECTED_REQUEST,
+	?STANZA_ERROR(<<"400">>, <<"wait">>,
+		      <<"unexpected-request">>)).
+
+-define(ERR_UNEXPECTED_REQUEST_CANCEL,
+	?STANZA_ERROR(<<"401">>, <<"cancel">>,
+		      <<"unexpected-request">>)).
+
+%-define(ERR_,
+%	?STANZA_ERROR("", "", "")).
+
+-define(STANZA_ERRORT(Code, Type, Condition, Lang,
+		      Text),
+	#xmlel{name = <<"error">>,
+	       attrs = [{<<"code">>, Code}, {<<"type">>, Type}],
+	       children =
+		   [#xmlel{name = Condition,
+			   attrs = [{<<"xmlns">>, ?NS_STANZAS}], children = []},
+		    #xmlel{name = <<"text">>,
+			   attrs = [{<<"xmlns">>, ?NS_STANZAS}],
+			   children =
+			       [{xmlcdata,
+				 translate:translate(Lang, Text)}]}]}).
+
+-define(ERRT_BAD_FORMAT(Lang, Text),
+	?STANZA_ERRORT(<<"406">>, <<"modify">>,
+		       <<"bad-format">>, Lang, Text)).
+
+-define(ERRT_BAD_REQUEST(Lang, Text),
+	?STANZA_ERRORT(<<"400">>, <<"modify">>,
+		       <<"bad-request">>, Lang, Text)).
+
+-define(ERRT_CONFLICT(Lang, Text),
+	?STANZA_ERRORT(<<"409">>, <<"cancel">>, <<"conflict">>,
+		       Lang, Text)).
+
+-define(ERRT_FEATURE_NOT_IMPLEMENTED(Lang, Text),
+	?STANZA_ERRORT(<<"501">>, <<"cancel">>,
+		       <<"feature-not-implemented">>, Lang, Text)).
+
+-define(ERRT_FORBIDDEN(Lang, Text),
+	?STANZA_ERRORT(<<"403">>, <<"auth">>, <<"forbidden">>,
+		       Lang, Text)).
+
+-define(ERRT_GONE(Lang, Text),
+	?STANZA_ERRORT(<<"302">>, <<"modify">>, <<"gone">>,
+		       Lang, Text)).
+
+-define(ERRT_INTERNAL_SERVER_ERROR(Lang, Text),
+	?STANZA_ERRORT(<<"500">>, <<"wait">>,
+		       <<"internal-server-error">>, Lang, Text)).
+
+-define(ERRT_ITEM_NOT_FOUND(Lang, Text),
+	?STANZA_ERRORT(<<"404">>, <<"cancel">>,
+		       <<"item-not-found">>, Lang, Text)).
+
+-define(ERRT_JID_MALFORMED(Lang, Text),
+	?STANZA_ERRORT(<<"400">>, <<"modify">>,
+		       <<"jid-malformed">>, Lang, Text)).
+
+-define(ERRT_NOT_ACCEPTABLE(Lang, Text),
+	?STANZA_ERRORT(<<"406">>, <<"modify">>,
+		       <<"not-acceptable">>, Lang, Text)).
+
+-define(ERRT_NOT_ALLOWED(Lang, Text),
+	?STANZA_ERRORT(<<"405">>, <<"cancel">>,
+		       <<"not-allowed">>, Lang, Text)).
+
+-define(ERRT_NOT_AUTHORIZED(Lang, Text),
+	?STANZA_ERRORT(<<"401">>, <<"auth">>,
+		       <<"not-authorized">>, Lang, Text)).
+
+-define(ERRT_PAYMENT_REQUIRED(Lang, Text),
+	?STANZA_ERRORT(<<"402">>, <<"auth">>,
+		       <<"payment-required">>, Lang, Text)).
+
+-define(ERRT_RECIPIENT_UNAVAILABLE(Lang, Text),
+	?STANZA_ERRORT(<<"404">>, <<"wait">>,
+		       <<"recipient-unavailable">>, Lang, Text)).
+
+-define(ERRT_REDIRECT(Lang, Text),
+	?STANZA_ERRORT(<<"302">>, <<"modify">>, <<"redirect">>,
+		       Lang, Text)).
+
+-define(ERRT_REGISTRATION_REQUIRED(Lang, Text),
+	?STANZA_ERRORT(<<"407">>, <<"auth">>,
+		       <<"registration-required">>, Lang, Text)).
+
+-define(ERRT_REMOTE_SERVER_NOT_FOUND(Lang, Text),
+	?STANZA_ERRORT(<<"404">>, <<"cancel">>,
+		       <<"remote-server-not-found">>, Lang, Text)).
+
+-define(ERRT_REMOTE_SERVER_TIMEOUT(Lang, Text),
+	?STANZA_ERRORT(<<"504">>, <<"wait">>,
+		       <<"remote-server-timeout">>, Lang, Text)).
+
+-define(ERRT_RESOURCE_CONSTRAINT(Lang, Text),
+	?STANZA_ERRORT(<<"500">>, <<"wait">>,
+		       <<"resource-constraint">>, Lang, Text)).
+
+-define(ERRT_SERVICE_UNAVAILABLE(Lang, Text),
+	?STANZA_ERRORT(<<"503">>, <<"cancel">>,
+		       <<"service-unavailable">>, Lang, Text)).
+
+-define(ERRT_SUBSCRIPTION_REQUIRED(Lang, Text),
+	?STANZA_ERRORT(<<"407">>, <<"auth">>,
+		       <<"subscription-required">>, Lang, Text)).
+
+-define(ERRT_UNEXPECTED_REQUEST(Lang, Text),
+	?STANZA_ERRORT(<<"400">>, <<"wait">>,
+		       <<"unexpected-request">>, Lang, Text)).
+
+-define(ERR_AUTH_NO_RESOURCE_PROVIDED(Lang),
+	?ERRT_NOT_ACCEPTABLE(Lang, <<"No resource provided">>)).
+
+-define(ERR_AUTH_BAD_RESOURCE_FORMAT(Lang),
+	?ERRT_NOT_ACCEPTABLE(Lang,
+			     <<"Illegal resource format">>)).
+
+-define(ERR_AUTH_RESOURCE_CONFLICT(Lang),
+	?ERRT_CONFLICT(Lang, <<"Resource conflict">>)).
+
+-define(STREAM_ERROR(Condition, Cdata),
+	#xmlel{name = <<"stream:error">>, attrs = [],
+	       children =
+		   [#xmlel{name = Condition,
+			   attrs = [{<<"xmlns">>, ?NS_STREAMS}],
+			   children = [{xmlcdata, Cdata}]}]}).
+
+-define(SERR_BAD_FORMAT,
+	?STREAM_ERROR(<<"bad-format">>, <<"">>)).
+
+-define(SERR_BAD_NAMESPACE_PREFIX,
+	?STREAM_ERROR(<<"bad-namespace-prefix">>, <<"">>)).
+
+-define(SERR_CONFLICT,
+	?STREAM_ERROR(<<"conflict">>, <<"">>)).
+
+-define(SERR_CONNECTION_TIMEOUT,
+	?STREAM_ERROR(<<"connection-timeout">>, <<"">>)).
+
+-define(SERR_HOST_GONE,
+	?STREAM_ERROR(<<"host-gone">>, <<"">>)).
+
+-define(SERR_HOST_UNKNOWN,
+	?STREAM_ERROR(<<"host-unknown">>, <<"">>)).
+
+-define(SERR_IMPROPER_ADDRESSING,
+	?STREAM_ERROR(<<"improper-addressing">>, <<"">>)).
+
+-define(SERR_INTERNAL_SERVER_ERROR,
+	?STREAM_ERROR(<<"internal-server-error">>, <<"">>)).
+
+-define(SERR_INVALID_FROM,
+	?STREAM_ERROR(<<"invalid-from">>, <<"">>)).
+
+-define(SERR_INVALID_ID,
+	?STREAM_ERROR(<<"invalid-id">>, <<"">>)).
+
+-define(SERR_INVALID_NAMESPACE,
+	?STREAM_ERROR(<<"invalid-namespace">>, <<"">>)).
+
+-define(SERR_INVALID_XML,
+	?STREAM_ERROR(<<"invalid-xml">>, <<"">>)).
+
+-define(SERR_NOT_AUTHORIZED,
+	?STREAM_ERROR(<<"not-authorized">>, <<"">>)).
+
+-define(SERR_POLICY_VIOLATION,
+	?STREAM_ERROR(<<"policy-violation">>, <<"">>)).
+
+-define(SERR_REMOTE_CONNECTION_FAILED,
+	?STREAM_ERROR(<<"remote-connection-failed">>, <<"">>)).
+
+-define(SERR_RESOURSE_CONSTRAINT,
+	?STREAM_ERROR(<<"resource-constraint">>, <<"">>)).
+
+-define(SERR_RESTRICTED_XML,
+	?STREAM_ERROR(<<"restricted-xml">>, <<"">>)).
+
+-define(SERR_SEE_OTHER_HOST(Host),
+	?STREAM_ERROR(<<"see-other-host">>, Host)).
+
+-define(SERR_SYSTEM_SHUTDOWN,
+	?STREAM_ERROR(<<"system-shutdown">>, <<"">>)).
+
+-define(SERR_UNSUPPORTED_ENCODING,
+	?STREAM_ERROR(<<"unsupported-encoding">>, <<"">>)).
+
+-define(SERR_UNSUPPORTED_STANZA_TYPE,
+	?STREAM_ERROR(<<"unsupported-stanza-type">>, <<"">>)).
+
+-define(SERR_UNSUPPORTED_VERSION,
+	?STREAM_ERROR(<<"unsupported-version">>, <<"">>)).
+
+-define(SERR_XML_NOT_WELL_FORMED,
+	?STREAM_ERROR(<<"xml-not-well-formed">>, <<"">>)).
+
+%-define(SERR_,
+%	?STREAM_ERROR("", "")).
+
+-define(STREAM_ERRORT(Condition, Cdata, Lang, Text),
+	#xmlel{name = <<"stream:error">>, attrs = [],
+	       children =
+		   [#xmlel{name = Condition,
+			   attrs = [{<<"xmlns">>, ?NS_STREAMS}],
+			   children = [{xmlcdata, Cdata}]},
+		    #xmlel{name = <<"text">>,
+			   attrs =
+			       [{<<"xml:lang">>, Lang},
+				{<<"xmlns">>, ?NS_STREAMS}],
+			   children =
+			       [{xmlcdata,
+				 translate:translate(Lang, Text)}]}]}).
+
+-define(SERRT_BAD_FORMAT(Lang, Text),
+	?STREAM_ERRORT(<<"bad-format">>, <<"">>, Lang, Text)).
+
+-define(SERRT_BAD_NAMESPACE_PREFIX(Lang, Text),
+	?STREAM_ERRORT(<<"bad-namespace-prefix">>, <<"">>, Lang,
+		       Text)).
+
+-define(SERRT_CONFLICT(Lang, Text),
+	?STREAM_ERRORT(<<"conflict">>, <<"">>, Lang, Text)).
+
+-define(SERRT_CONNECTION_TIMEOUT(Lang, Text),
+	?STREAM_ERRORT(<<"connection-timeout">>, <<"">>, Lang,
+		       Text)).
+
+-define(SERRT_HOST_GONE(Lang, Text),
+	?STREAM_ERRORT(<<"host-gone">>, <<"">>, Lang, Text)).
+
+-define(SERRT_HOST_UNKNOWN(Lang, Text),
+	?STREAM_ERRORT(<<"host-unknown">>, <<"">>, Lang, Text)).
+
+-define(SERRT_IMPROPER_ADDRESSING(Lang, Text),
+	?STREAM_ERRORT(<<"improper-addressing">>, <<"">>, Lang,
+		       Text)).
+
+-define(SERRT_INTERNAL_SERVER_ERROR(Lang, Text),
+	?STREAM_ERRORT(<<"internal-server-error">>, <<"">>,
+		       Lang, Text)).
+
+-define(SERRT_INVALID_FROM(Lang, Text),
+	?STREAM_ERRORT(<<"invalid-from">>, <<"">>, Lang, Text)).
+
+-define(SERRT_INVALID_ID(Lang, Text),
+	?STREAM_ERRORT(<<"invalid-id">>, <<"">>, Lang, Text)).
+
+-define(SERRT_INVALID_NAMESPACE(Lang, Text),
+	?STREAM_ERRORT(<<"invalid-namespace">>, <<"">>, Lang,
+		       Text)).
+
+-define(SERRT_INVALID_XML(Lang, Text),
+	?STREAM_ERRORT(<<"invalid-xml">>, <<"">>, Lang, Text)).
+
+-define(SERRT_NOT_AUTHORIZED(Lang, Text),
+	?STREAM_ERRORT(<<"not-authorized">>, <<"">>, Lang,
+		       Text)).
+
+-define(SERRT_POLICY_VIOLATION(Lang, Text),
+	?STREAM_ERRORT(<<"policy-violation">>, <<"">>, Lang,
+		       Text)).
+
+-define(SERRT_REMOTE_CONNECTION_FAILED(Lang, Text),
+	?STREAM_ERRORT(<<"remote-connection-failed">>, <<"">>,
+		       Lang, Text)).
+
+-define(SERRT_RESOURSE_CONSTRAINT(Lang, Text),
+	?STREAM_ERRORT(<<"resource-constraint">>, <<"">>, Lang,
+		       Text)).
+
+-define(SERRT_RESTRICTED_XML(Lang, Text),
+	?STREAM_ERRORT(<<"restricted-xml">>, <<"">>, Lang,
+		       Text)).
+
+-define(SERRT_SEE_OTHER_HOST(Host, Lang, Text),
+	?STREAM_ERRORT(<<"see-other-host">>, Host, Lang, Text)).
+
+-define(SERRT_SYSTEM_SHUTDOWN(Lang, Text),
+	?STREAM_ERRORT(<<"system-shutdown">>, <<"">>, Lang,
+		       Text)).
+
+-define(SERRT_UNSUPPORTED_ENCODING(Lang, Text),
+	?STREAM_ERRORT(<<"unsupported-encoding">>, <<"">>, Lang,
+		       Text)).
+
+-define(SERRT_UNSUPPORTED_STANZA_TYPE(Lang, Text),
+	?STREAM_ERRORT(<<"unsupported-stanza-type">>, <<"">>,
+		       Lang, Text)).
+
+-define(SERRT_UNSUPPORTED_VERSION(Lang, Text),
+	?STREAM_ERRORT(<<"unsupported-version">>, <<"">>, Lang,
+		       Text)).
+
+-define(SERRT_XML_NOT_WELL_FORMED(Lang, Text),
+	?STREAM_ERRORT(<<"xml-not-well-formed">>, <<"">>, Lang,
+		       Text)).
+
+-record(jid, {user = <<"">> :: binary(),
+              server = <<"">> :: binary(),
+              resource = <<"">> :: binary(),
+              luser = <<"">> :: binary(),
+              lserver = <<"">> :: binary(),
+              lresource = <<"">> :: binary()}).
+
+-type(jid() :: #jid{}).
+
+-type(ljid() :: {binary(), binary(), binary()}).
+
+-record(iq, {id = <<"">>       :: binary(),
+             type = get        :: get | set | result | error,
+             xmlns = <<"">>    :: binary(),
+             lang  = <<"">>    :: binary(),
+             sub_el = #xmlel{} :: xmlel() | [xmlel()]}).
+
+-type(iq_get()
+  :: #iq{
+         id     :: binary(),
+         type   :: get,
+         xmlns  :: binary(),
+         lang   :: binary(),
+         sub_el :: xmlel()
+     }
+).
+
+-type(iq_set()
+  :: #iq{
+         id     :: binary(),
+         type   :: set,
+         xmlns  :: binary(),
+         lang   :: binary(),
+         sub_el :: xmlel()
+     }
+).
+
+-type iq_request() :: iq_get() | iq_set().
+
+-type(iq_result()
+  :: #iq{
+         id     :: binary(),
+         type   :: result,
+         xmlns  :: binary(),
+         lang   :: binary(),
+         sub_el :: [xmlel()]
+     }
+).
+
+-type(iq_error()
+  :: #iq{
+         id     :: binary(),
+         type   :: error,
+         xmlns  :: binary(),
+         lang   :: binary(),
+         sub_el :: [xmlel()]
+     }
+).
+
+-type iq_reply() :: iq_result() | iq_error() .
+
+-type(iq() :: iq_request() | iq_reply()).
+
+-record(rsm_in, {max :: integer() | error,
+                 direction :: before | aft,
+                 id :: binary(),
+                 index :: integer() | error}).
+
+-record(rsm_out, {count :: integer(),
+                  index :: integer(),
+                  first :: binary(),
+                  last :: binary()}).
+
+-type(rsm_in() :: #rsm_in{}).
+
+-type(rsm_out() :: #rsm_out{}).
+
+-type broadcast() :: {broadcast, broadcast_data()}.
+
+-type broadcast_data() ::
+        {rebind, pid(), binary()} | %% ejabberd_c2s
+        {item, ljid(), mod_roster:subscription()} | %% mod_roster/mod_shared_roster
+        {exit, binary()} | %% mod_roster/mod_shared_roster
+        {privacy_list, mod_privacy:userlist(), binary()} | %% mod_privacy
+        {blocking, unblock_all | {block | unblock, [ljid()]}}. %% mod_blocking
+
+-record(xmlelement, {name = ""     :: string(),
+                     attrs = []    :: [{string(), string()}],
+                     children = [] :: [{xmlcdata, iodata()} | xmlelement()]}).
+
+-type xmlelement() :: #xmlelement{}.
@@ -0,0 +1,56 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+-define(PRINT(Format, Args), io:format(Format, Args)).
+
+-ifdef(LAGER).
+-compile([{parse_transform, lager_transform}]).
+
+-define(DEBUG(Format, Args),
+	lager:debug(Format, Args)).
+
+-define(INFO_MSG(Format, Args),
+	lager:info(Format, Args)).
+
+-define(WARNING_MSG(Format, Args),
+	lager:warning(Format, Args)).
+
+-define(ERROR_MSG(Format, Args),
+	lager:error(Format, Args)).
+
+-define(CRITICAL_MSG(Format, Args),
+	lager:critical(Format, Args)).
+
+-else.
+
+-define(DEBUG(Format, Args),
+	p1_logger:debug_msg(?MODULE, ?LINE, Format, Args)).
+
+-define(INFO_MSG(Format, Args),
+	p1_logger:info_msg(?MODULE, ?LINE, Format, Args)).
+
+-define(WARNING_MSG(Format, Args),
+	p1_logger:warning_msg(?MODULE, ?LINE, Format, Args)).
+
+-define(ERROR_MSG(Format, Args),
+	p1_logger:error_msg(?MODULE, ?LINE, Format, Args)).
+
+-define(CRITICAL_MSG(Format, Args),
+	p1_logger:critical_msg(?MODULE, ?LINE, Format, Args)).
+-endif.
@@ -0,0 +1,118 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-include("ejabberd.hrl").
+
+-define(MAX_USERS_DEFAULT, 200).
+
+-define(SETS, gb_sets).
+
+-define(DICT, dict).
+
+-record(lqueue,
+{
+    queue :: ?TQUEUE,
+    len :: integer(),
+    max :: integer()
+}).
+
+-type lqueue() :: #lqueue{}.
+
+-record(config,
+{
+    title                                = <<"">> :: binary(),
+    description                          = <<"">> :: binary(),
+    allow_change_subj                    = true :: boolean(),
+    allow_query_users                    = true :: boolean(),
+    allow_private_messages               = true :: boolean(),
+    allow_private_messages_from_visitors = anyone :: anyone | moderators | nobody ,
+    allow_visitor_status                 = true :: boolean(),
+    allow_visitor_nickchange             = true :: boolean(),
+    public                               = true :: boolean(),
+    public_list                          = true :: boolean(),
+    persistent                           = false :: boolean(),
+    moderated                            = true :: boolean(),
+    captcha_protected                    = false :: boolean(),
+    members_by_default                   = true :: boolean(),
+    members_only                         = false :: boolean(),
+    allow_user_invites                   = false :: boolean(),
+    password_protected                   = false :: boolean(),
+    password                             = <<"">> :: binary(),
+    anonymous                            = true :: boolean(),
+    allow_voice_requests                 = true :: boolean(),
+    voice_request_min_interval           = 1800 :: non_neg_integer(),
+    max_users                            = ?MAX_USERS_DEFAULT :: non_neg_integer() | none,
+    logging                              = false :: boolean(),
+    vcard                                = <<"">> :: binary(),
+    captcha_whitelist                    = (?SETS):empty() :: ?TGB_SET
+}).
+
+-type config() :: #config{}.
+
+-type role() :: moderator | participant | visitor | none.
+
+-record(user,
+{
+    jid :: jid(),
+    nick :: binary(),
+    role :: role(),
+    last_presence :: xmlel()
+}).
+
+-record(activity,
+{
+    message_time    = 0 :: integer(),
+    presence_time   = 0 :: integer(),
+    message_shaper :: shaper:shaper(),
+    presence_shaper :: shaper:shaper(),
+    message :: xmlel(),
+    presence :: {binary(), xmlel()}
+}).
+
+-record(state,
+{
+    room                    = <<"">> :: binary(),
+    host                    = <<"">> :: binary(),
+    server_host             = <<"">> :: binary(),
+    access                  = {none,none,none,none} :: {atom(), atom(), atom(), atom()},
+    jid                     = #jid{} :: jid(),
+    config                  = #config{} :: config(),
+    users                   = (?DICT):new() :: ?TDICT,
+    last_voice_request_time = treap:empty() :: treap:treap(),
+    robots                  = (?DICT):new() :: ?TDICT,
+    nicks                   = (?DICT):new() :: ?TDICT,
+    affiliations            = (?DICT):new() :: ?TDICT,
+    history                 :: lqueue(),
+    subject                 = <<"">> :: binary(),
+    subject_author          = <<"">> :: binary(),
+    just_created            = false :: boolean(),
+    activity                = treap:empty() :: treap:treap(),
+    room_shaper             = none :: shaper:shaper(),
+    room_queue              = queue:new() :: ?TQUEUE
+}).
+
+-record(muc_online_users, {us = {<<>>, <<>>} :: {binary(), binary()},
+                           resource = <<>> :: binary() | '_',
+                           room = <<>> :: binary() | '_' | '$1',
+                           host = <<>> :: binary() | '_' | '$2'}).
+
+-type muc_online_users() :: #muc_online_users{}.
+
+-type muc_room_state() :: #state{}.
@@ -0,0 +1,43 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-record(privacy, {us = {<<"">>, <<"">>} :: {binary(), binary()},
+                  default = none        :: none | binary(),
+                  lists = []            :: [{binary(), [listitem()]}]}).
+
+-record(listitem, {type = none :: none | jid | group | subscription,
+                   value = none :: none | both | from | to | ljid() | binary(),
+                   action = allow :: allow | deny,
+                   order = 0 :: integer(),
+                   match_all = false :: boolean(),
+                   match_iq = false :: boolean(),
+                   match_message = false :: boolean(),
+                   match_presence_in = false :: boolean(),
+                   match_presence_out = false :: boolean()}).
+
+-type listitem() :: #listitem{}.
+
+-record(userlist, {name = none :: none | binary(),
+                   list = [] :: [listitem()],
+                   needdb = false :: boolean()}).
+
+-type userlist() :: #userlist{}.
+
+-export_type([userlist/0]).
@@ -2,7 +2,7 @@
 %%% RFC 1928 constants.
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2010   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -14,10 +14,9 @@
 %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %%% General Public License for more details.
 %%%
-%%% You should have received a copy of the GNU General Public License
-%%% along with this program; if not, write to the Free Software
-%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-%%% 02111-1307 USA
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------

@@ -26,36 +25,49 @@

 %% Authentication methods
 -define(AUTH_ANONYMOUS, 0).
+
 -define(AUTH_GSSAPI, 1).
+
 -define(AUTH_PLAIN, 2).
-define(AUTH_NO_METHODS, 16#FF).

 %% Address Type
+-define(AUTH_NO_METHODS, 255).
+
 -define(ATYP_IPV4, 1).
+
 -define(ATYP_DOMAINNAME, 3).
+
 -define(ATYP_IPV6, 4).

 %% Commands
 -define(CMD_CONNECT, 1).
+
 -define(CMD_BIND, 2).
+
 -define(CMD_UDP, 3).

 %% RFC 1928 replies
 -define(SUCCESS, 0).
+
 -define(ERR_GENERAL_FAILURE, 1).
+
 -define(ERR_NOT_ALLOWED, 2).
+
 -define(ERR_NETWORK_UNREACHABLE, 3).
+
 -define(ERR_HOST_UNREACHABLE, 4).
+
 -define(ERR_CONNECTION_REFUSED, 5).
+
 -define(ERR_TTL_EXPIRED, 6).
+
 -define(ERR_COMMAND_NOT_SUPPORTED, 7).
+
 -define(ERR_ADDRESS_TYPE_NOT_SUPPORTED, 8).

 %% RFC 1928 defined timeout.
 -define(SOCKS5_REPLY_TIMEOUT, 10000).

-record(s5_request, {
-	  rsv = 0,
-	  cmd,
-	  sha1
-	 }).
+-record(s5_request, {rsv = 0 :: integer(),
+                     cmd = connect :: connect | udp,
+                     sha1 = <<"">> :: binary()}).
@@ -0,0 +1,41 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-record(roster,
+{
+    usj = {<<>>, <<>>, {<<>>, <<>>, <<>>}} :: {binary(), binary(), ljid()} | '_',
+    us = {<<>>, <<>>}                      :: {binary(), binary()} | '_',
+    jid = {<<>>, <<>>, <<>>}               :: ljid(),
+    name = <<>>                            :: binary() | '_',
+    subscription = none                    :: subscription() | '_',
+    ask = none                             :: ask() | '_',
+    groups = []                            :: [binary()] | '_',
+    askmessage = <<"">>                    :: binary() | '_',
+    xs = []                                :: [xmlel()] | '_'
+}).
+
+-record(roster_version,
+{
+    us = {<<>>, <<>>} :: {binary(), binary()},
+    version = <<>>    :: binary()
+}).
+
+-type ask() :: none | in | out | both | subscribe | unsubscribe.
+-type subscription() :: none | both | from | to | remove.
@@ -0,0 +1,152 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-define(NS_DISCO_ITEMS,
+	<<"http://jabber.org/protocol/disco#items">>).
+-define(NS_DISCO_INFO,
+	<<"http://jabber.org/protocol/disco#info">>).
+-define(NS_VCARD, <<"vcard-temp">>).
+-define(NS_VCARD_UPDATE, <<"vcard-temp:x:update">>).
+-define(NS_AUTH, <<"jabber:iq:auth">>).
+-define(NS_AUTH_ERROR, <<"jabber:iq:auth:error">>).
+-define(NS_REGISTER, <<"jabber:iq:register">>).
+-define(NS_SEARCH, <<"jabber:iq:search">>).
+-define(NS_ROSTER, <<"jabber:iq:roster">>).
+-define(NS_ROSTER_VER,
+	<<"urn:xmpp:features:rosterver">>).
+-define(NS_PRIVACY, <<"jabber:iq:privacy">>).
+-define(NS_BLOCKING, <<"urn:xmpp:blocking">>).
+-define(NS_PRIVATE, <<"jabber:iq:private">>).
+-define(NS_VERSION, <<"jabber:iq:version">>).
+-define(NS_TIME, <<"urn:xmpp:time">>).
+-define(NS_LAST, <<"jabber:iq:last">>).
+-define(NS_XDATA, <<"jabber:x:data">>).
+-define(NS_IQDATA, <<"jabber:iq:data">>).
+-define(NS_DELAY, <<"urn:xmpp:delay">>).
+-define(NS_HINTS, <<"urn:xmpp:hints">>).
+-define(NS_EXPIRE, <<"jabber:x:expire">>).
+-define(NS_EVENT, <<"jabber:x:event">>).
+-define(NS_CHATSTATES,
+	<<"http://jabber.org/protocol/chatstates">>).
+-define(NS_XCONFERENCE, <<"jabber:x:conference">>).
+-define(NS_STATS,
+	<<"http://jabber.org/protocol/stats">>).
+-define(NS_MUC, <<"http://jabber.org/protocol/muc">>).
+-define(NS_MUC_USER,
+	<<"http://jabber.org/protocol/muc#user">>).
+-define(NS_MUC_ADMIN,
+	<<"http://jabber.org/protocol/muc#admin">>).
+-define(NS_MUC_OWNER,
+	<<"http://jabber.org/protocol/muc#owner">>).
+-define(NS_MUC_UNIQUE,
+	<<"http://jabber.org/protocol/muc#unique">>).
+-define(NS_PUBSUB,
+	<<"http://jabber.org/protocol/pubsub">>).
+-define(NS_PUBSUB_EVENT,
+	<<"http://jabber.org/protocol/pubsub#event">>).
+-define(NS_PUBSUB_META_DATA,
+	<<"http://jabber.org/protocol/pubsub#meta-data">>).
+-define(NS_PUBSUB_OWNER,
+	<<"http://jabber.org/protocol/pubsub#owner">>).
+-define(NS_PUBSUB_NMI,
+	<<"http://jabber.org/protocol/pubsub#node-meta-info">>).
+-define(NS_PUBSUB_ERRORS,
+	<<"http://jabber.org/protocol/pubsub#errors">>).
+-define(NS_PUBSUB_NODE_CONFIG,
+	<<"http://jabber.org/protocol/pubsub#node_config">>).
+-define(NS_PUBSUB_SUB_OPTIONS,
+	<<"http://jabber.org/protocol/pubsub#subscribe_options">>).
+-define(NS_PUBSUB_SUBSCRIBE_OPTIONS,
+	<<"http://jabber.org/protocol/pubsub#subscribe_options">>).
+-define(NS_PUBSUB_PUBLISH_OPTIONS,
+	<<"http://jabber.org/protocol/pubsub#publish_options">>).
+-define(NS_PUBSUB_SUB_AUTH,
+	<<"http://jabber.org/protocol/pubsub#subscribe_authorization">>).
+-define(NS_PUBSUB_GET_PENDING,
+	<<"http://jabber.org/protocol/pubsub#get-pending">>).
+-define(NS_COMMANDS,
+	<<"http://jabber.org/protocol/commands">>).
+-define(NS_BYTESTREAMS,
+	<<"http://jabber.org/protocol/bytestreams">>).
+-define(NS_ADMIN,
+	<<"http://jabber.org/protocol/admin">>).
+-define(NS_ADMIN_ANNOUNCE,
+	<<"http://jabber.org/protocol/admin#announce">>).
+-define(NS_ADMIN_ANNOUNCE_ALL,
+	<<"http://jabber.org/protocol/admin#announce-all">>).
+-define(NS_ADMIN_SET_MOTD,
+	<<"http://jabber.org/protocol/admin#set-motd">>).
+-define(NS_ADMIN_EDIT_MOTD,
+	<<"http://jabber.org/protocol/admin#edit-motd">>).
+-define(NS_ADMIN_DELETE_MOTD,
+	<<"http://jabber.org/protocol/admin#delete-motd">>).
+-define(NS_ADMIN_ANNOUNCE_ALLHOSTS,
+	<<"http://jabber.org/protocol/admin#announce-allhosts">>).
+-define(NS_ADMIN_ANNOUNCE_ALL_ALLHOSTS,
+	<<"http://jabber.org/protocol/admin#announce-all-allhosts">>).
+-define(NS_ADMIN_SET_MOTD_ALLHOSTS,
+	<<"http://jabber.org/protocol/admin#set-motd-allhosts">>).
+-define(NS_ADMIN_EDIT_MOTD_ALLHOSTS,
+	<<"http://jabber.org/protocol/admin#edit-motd-allhosts">>).
+-define(NS_ADMIN_DELETE_MOTD_ALLHOSTS,
+	<<"http://jabber.org/protocol/admin#delete-motd-allhosts">>).
+-define(NS_SERVERINFO,
+	<<"http://jabber.org/network/serverinfo">>).
+-define(NS_RSM, <<"http://jabber.org/protocol/rsm">>).
+-define(NS_EJABBERD_CONFIG, <<"ejabberd:config">>).
+-define(NS_STREAM,
+	<<"http://etherx.jabber.org/streams">>).
+-define(NS_STANZAS,
+	<<"urn:ietf:params:xml:ns:xmpp-stanzas">>).
+-define(NS_STREAMS,
+	<<"urn:ietf:params:xml:ns:xmpp-streams">>).
+-define(NS_TLS, <<"urn:ietf:params:xml:ns:xmpp-tls">>).
+-define(NS_SASL,
+	<<"urn:ietf:params:xml:ns:xmpp-sasl">>).
+-define(NS_SESSION,
+	<<"urn:ietf:params:xml:ns:xmpp-session">>).
+-define(NS_BIND,
+	<<"urn:ietf:params:xml:ns:xmpp-bind">>).
+-define(NS_FEATURE_IQAUTH,
+	<<"http://jabber.org/features/iq-auth">>).
+-define(NS_FEATURE_IQREGISTER,
+	<<"http://jabber.org/features/iq-register">>).
+-define(NS_FEATURE_COMPRESS,
+	<<"http://jabber.org/features/compress">>).
+-define(NS_FEATURE_MSGOFFLINE, <<"msgoffline">>).
+-define(NS_COMPRESS,
+	<<"http://jabber.org/protocol/compress">>).
+-define(NS_CAPS, <<"http://jabber.org/protocol/caps">>).
+-define(NS_SHIM, <<"http://jabber.org/protocol/shim">>).
+-define(NS_ADDRESS,
+	<<"http://jabber.org/protocol/address">>).
+-define(NS_OOB, <<"jabber:x:oob">>).
+-define(NS_CAPTCHA, <<"urn:xmpp:captcha">>).
+-define(NS_MEDIA, <<"urn:xmpp:media-element">>).
+-define(NS_BOB, <<"urn:xmpp:bob">>).
+-define(NS_MAM_TMP, <<"urn:xmpp:mam:tmp">>).
+-define(NS_MAM_0, <<"urn:xmpp:mam:0">>).
+-define(NS_PING, <<"urn:xmpp:ping">>).
+-define(NS_CARBONS_2, <<"urn:xmpp:carbons:2">>).
+-define(NS_CARBONS_1, <<"urn:xmpp:carbons:1">>).
+-define(NS_FORWARD, <<"urn:xmpp:forward:0">>).
+-define(NS_CLIENT_STATE,  <<"urn:xmpp:csi:0">>).
+-define(NS_STREAM_MGMT_2,  <<"urn:xmpp:sm:2">>).
+-define(NS_STREAM_MGMT_3,  <<"urn:xmpp:sm:3">>).
@@ -0,0 +1,173 @@
+%%% ====================================================================
+%%% ``The contents of this file are subject to the Erlang Public License,
+%%% Version 1.1, (the "License"); you may not use this file except in
+%%% compliance with the License. You should have received a copy of the
+%%% Erlang Public License along with this software. If not, it can be
+%%% retrieved via the world wide web at http://www.erlang.org/.
+%%% 
+%%%
+%%% Software distributed under the License is distributed on an "AS IS"
+%%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%%% the License for the specific language governing rights and limitations
+%%% under the License.
+%%% 
+%%%
+%%% The Initial Developer of the Original Code is ProcessOne.
+%%% Portions created by ProcessOne are Copyright 2006-2015, ProcessOne
+%%% All Rights Reserved.''
+%%% This software is copyright 2006-2015, ProcessOne.
+%%%
+%%%
+%%% copyright 2006-2015 ProcessOne
+%%%
+%%% This file contains pubsub types definition.
+%%% ====================================================================
+
+-include("ejabberd.hrl").
+
+%% -------------------------------
+%% Pubsub constants
+-define(ERR_EXTENDED(E, C), mod_pubsub:extended_error(E, C)).
+
+%% The actual limit can be configured with mod_pubsub's option max_items_node
+-define(MAXITEMS, 10).
+
+%% this is currently a hard limit.
+%% Would be nice to have it configurable. 
+-define(MAX_PAYLOAD_SIZE, 60000).
+
+%% -------------------------------
+%% Pubsub types
+
+-type(hostPubsub() :: binary()).
+%% <p><tt>hostPubsub</tt> is the name of the PubSub service. For example, it can be
+%% <tt>"pubsub.localhost"</tt>.</p>
+
+-type(hostPEP() :: {binary(), binary(), <<>>}).
+%% @type hostPEP() = {User, Server, Resource}
+%%     User     = string()
+%%     Server   = string()
+%%     Resource = [].
+%% <p>For example, it can be :
+%% ```{"bob", "example.org", []}'''.</p>
+
+-type(host() :: hostPubsub() | hostPEP()).
+%% @type host() = hostPubsub() | hostPEP().
+
+-type(nodeId() :: binary()).
+%% @type nodeId() = binary().
+%% <p>A node is defined by a list of its ancestors. The last element is the name
+%% of the current node. For example:
+%% ```<<"/home/localhost/user">>'''</p>
+
+-type(nodeIdx() :: pos_integer() | binary()).
+%% @type nodeIdx() = integer() | binary().
+%% note: pos_integer() should always be used, but we allow anything else coded
+%% as binary, so one can have a custom implementation of nodetree with custom
+%% indexing (see nodetree_virtual). this also allows to use any kind of key for
+%% indexing nodes, as this can be usefull with external backends such as odbc.
+
+-type(itemId() :: binary()).
+%% @type itemId() = string().
+
+-type(subId() :: binary()).
+%% @type subId() = string().
+
+-type(nodeOption() ::
+    {Option::atom(),
+     Value::atom() | [binary()] | boolean() | non_neg_integer()
+}).
+
+-type(nodeOptions() :: [mod_pubsub:nodeOption(),...]).
+
+%% @type nodeOption() = {Option, Value}
+%%    Option = atom()
+%%    Value = term().
+%% Example:
+%% ```{deliver_payloads, true}'''
+
+-type(subOption() ::
+    {Option::atom(),
+     Value::binary() | [binary()] | boolean()
+}).
+
+-type(subOptions() :: [mod_pubsub:subOption(),...]).
+
+
+
+-type(affiliation() :: 'none'
+                     | 'owner'
+                     | 'publisher'
+                     | 'publish_only'
+                     | 'member'
+                     | 'outcast'
+).
+%% @type affiliation() = 'none' | 'owner' | 'publisher' | 'publish-only' | 'member' | 'outcast'.
+
+-type(subscription() :: 'none'
+                      | 'pending'
+                      | 'unconfigured'
+                      | 'subscribed'
+).
+%% @type subscription() = 'none' | 'pending' | 'unconfigured' | 'subscribed'.
+
+-type(accessModel() :: 'open'
+                     | 'presence'
+                     | 'roster'
+                     | 'authorize'
+                     | 'whitelist'
+).
+%% @type accessModel() = 'open' | 'presence' | 'roster' | 'authorize' | 'whitelist'.
+
+-type(publishModel() :: 'publishers'
+                      | 'subscribers'
+                      | 'open'
+).
+%% @type publishModel() = 'publishers' | 'subscribers' | 'open'
+
+-record(pubsub_index,
+{
+    index :: atom(),
+    last  :: mod_pubsub:nodeIdx(),
+    free  :: [mod_pubsub:nodeIdx()]
+}).
+
+-record(pubsub_node,
+{
+    nodeid              ,% :: {mod_pubsub:host(), mod_pubsub:nodeId()},
+    id                  ,% :: mod_pubsub:nodeIdx(),
+    parents = []        ,% :: [mod_pubsub:nodeId(),...],
+    type    = <<"flat">>,% :: binary(),
+    owners  = []        ,% :: [jlib:ljid(),...],
+    options = []        % :: mod_pubsub:nodeOptions()
+}).
+
+-record(pubsub_state,
+{
+    stateid               ,% :: {jlib:ljid(), mod_pubsub:nodeIdx()},
+    items         = []    ,% :: [mod_pubsub:itemId(),...],
+    affiliation   = 'none',% :: mod_pubsub:affiliation(),
+    subscriptions = []    % :: [{mod_pubsub:subscription(), mod_pubsub:subId()}]
+}).
+
+-record(pubsub_item,
+{
+    itemid                           ,% :: {mod_pubsub:itemId(), mod_pubsub:nodeIdx()},
+    creation     = {unknown, unknown},% :: {erlang:timestamp(), jlib:ljid()},
+    modification = {unknown, unknown},% :: {erlang:timestamp(), jlib:ljid()},
+    payload      = []                % :: mod_pubsub:payload()
+}).
+
+-record(pubsub_subscription,
+{
+    subid        ,% :: mod_pubsub:subId(),
+    options = [] % :: mod_pubsub:subOptions()
+}).
+
+-record(pubsub_last_item,
+{
+    nodeid   ,% :: mod_pubsub:nodeIdx(),
+    itemid   ,% :: mod_pubsub:itemId(),
+    creation ,% :: {erlang:timestamp(), jlib:ljid()},
+    payload  % :: mod_pubsub:payload()
+}).
@@ -0,0 +1,13 @@
+defmodule Ejabberd.Hooks do
+
+  # Generic hook setting features
+  def add(hook_name, host, module, function, priority) do
+    :ejabberd_hooks.add(hook_name, host, module, function, priority)
+  end
+
+  # Should be named 'removed'
+  def delete(hook_name, host, module, function, priority) do
+    :ejabberd_hooks.delete(hook_name, host, module, function, priority)
+  end
+
+end
@@ -0,0 +1,9 @@
+defmodule Ejabberd.Logger do
+
+  def critical(message, args \\ []), do: :lager.log(:critical, [], message, args)
+  def error(message, args \\ []),    do: :lager.log(:error, [], message, args)
+  def warning(message, args \\ []),  do: :lager.log(:warning, [], message, args)
+  def info(message, args \\ []),     do: :lager.log(:info, [], message, args)
+  def debug(message, args \\ []),    do: :lager.log(:debug, [], message, args)
+
+end
@@ -0,0 +1,2 @@
+defmodule Ejabberd do
+end
@@ -0,0 +1,21 @@
+defmodule ModPresenceDemo do
+  import Ejabberd.Logger # this allow using info, error, etc for logging
+  @behaviour :gen_mod
+
+  def start(host, _opts) do
+    info('Starting ejabberd module Presence Demo')
+    Ejabberd.Hooks.add(:set_presence_hook, host, __ENV__.module, :on_presence, 50)
+    :ok
+  end
+  
+  def stop(host) do
+    info('Stopping ejabberd module Presence Demo')
+    Ejabberd.Hooks.delete(:set_presence_hook, host, __ENV__.module, :on_presence, 50)
+    :ok
+  end
+  
+  def on_presence(user, _server, _resource, _packet) do
+    info('Receive presence for #{user}')
+    :none
+  end 
+end
@@ -0,0 +1,156 @@
+# ===========================================================================
+#      http://www.gnu.org/software/autoconf-archive/ax_lib_sqlite3.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_LIB_SQLITE3([MINIMUM-VERSION])
+#
+# DESCRIPTION
+#
+#   Test for the SQLite 3 library of a particular version (or newer)
+#
+#   This macro takes only one optional argument, required version of SQLite
+#   3 library. If required version is not passed, 3.0.0 is used in the test
+#   of existance of SQLite 3.
+#
+#   If no intallation prefix to the installed SQLite library is given the
+#   macro searches under /usr, /usr/local, and /opt.
+#
+#   This macro calls:
+#
+#     AC_SUBST(SQLITE3_CFLAGS)
+#     AC_SUBST(SQLITE3_LDFLAGS)
+#     AC_SUBST(SQLITE3_VERSION)
+#
+#   And sets:
+#
+#     HAVE_SQLITE3
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Mateusz Loskot <mateusz@loskot.net>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 14
+
+AC_DEFUN([AX_LIB_SQLITE3],
+[
+    AC_ARG_WITH([sqlite3],
+        AS_HELP_STRING(
+            [--with-sqlite3=@<:@ARG@:>@],
+            [use SQLite 3 library @<:@default=yes@:>@, optionally specify the prefix for sqlite3 library]
+        ),
+        [
+        if test "$withval" = "no"; then
+            WANT_SQLITE3="no"
+        elif test "$withval" = "yes"; then
+            WANT_SQLITE3="yes"
+            ac_sqlite3_path=""
+        else
+            WANT_SQLITE3="yes"
+            ac_sqlite3_path="$withval"
+        fi
+        ],
+        [WANT_SQLITE3="yes"]
+    )
+
+    SQLITE3_CFLAGS=""
+    SQLITE3_LDFLAGS=""
+    SQLITE3_VERSION=""
+
+    if test "x$WANT_SQLITE3" = "xyes"; then
+
+        ac_sqlite3_header="sqlite3.h"
+
+        sqlite3_version_req=ifelse([$1], [], [3.0.0], [$1])
+        sqlite3_version_req_shorten=`expr $sqlite3_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
+        sqlite3_version_req_major=`expr $sqlite3_version_req : '\([[0-9]]*\)'`
+        sqlite3_version_req_minor=`expr $sqlite3_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
+        sqlite3_version_req_micro=`expr $sqlite3_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+        if test "x$sqlite3_version_req_micro" = "x" ; then
+            sqlite3_version_req_micro="0"
+        fi
+
+        sqlite3_version_req_number=`expr $sqlite3_version_req_major \* 1000000 \
+                                   \+ $sqlite3_version_req_minor \* 1000 \
+                                   \+ $sqlite3_version_req_micro`
+
+        AC_MSG_CHECKING([for SQLite3 library >= $sqlite3_version_req])
+
+        if test "$ac_sqlite3_path" != ""; then
+            ac_sqlite3_ldflags="-L$ac_sqlite3_path/lib"
+            ac_sqlite3_cppflags="-I$ac_sqlite3_path/include"
+        else
+            for ac_sqlite3_path_tmp in /usr /usr/local /opt ; do
+                if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \
+                    && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then
+                    ac_sqlite3_path=$ac_sqlite3_path_tmp
+                    ac_sqlite3_cppflags="-I$ac_sqlite3_path_tmp/include"
+                    ac_sqlite3_ldflags="-L$ac_sqlite3_path_tmp/lib"
+                    break;
+                fi
+            done
+        fi
+
+        ac_sqlite3_ldflags="$ac_sqlite3_ldflags -lsqlite3"
+
+        saved_CPPFLAGS="$CPPFLAGS"
+        CPPFLAGS="$CPPFLAGS $ac_sqlite3_cppflags"
+
+        AC_LANG_PUSH(C)
+        AC_COMPILE_IFELSE(
+            [
+            AC_LANG_PROGRAM([[@%:@include <sqlite3.h>]],
+                [[
+#if (SQLITE_VERSION_NUMBER >= $sqlite3_version_req_number)
+/* Everything is okay */
+#else
+#  error SQLite version is too old
+#endif
+                ]]
+            )
+            ],
+            [
+            AC_MSG_RESULT([yes])
+            success="yes"
+            ],
+            [
+            AC_MSG_RESULT([not found])
+            success="no"
+            ]
+        )
+        AC_LANG_POP(C)
+
+        CPPFLAGS="$saved_CPPFLAGS"
+
+        if test "$success" = "yes"; then
+
+            SQLITE3_CFLAGS="$ac_sqlite3_cppflags"
+            SQLITE3_LDFLAGS="$ac_sqlite3_ldflags"
+
+            ac_sqlite3_header_path="$ac_sqlite3_path/include/$ac_sqlite3_header"
+
+            dnl Retrieve SQLite release version
+            if test "x$ac_sqlite3_header_path" != "x"; then
+                ac_sqlite3_version=`cat $ac_sqlite3_header_path \
+                    | grep '#define.*SQLITE_VERSION.*\"' | sed -e 's/.* "//' \
+                        | sed -e 's/"//'`
+                if test $ac_sqlite3_version != ""; then
+                    SQLITE3_VERSION=$ac_sqlite3_version
+                else
+                    AC_MSG_WARN([Cannot find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!])
+                fi
+            fi
+
+            AC_SUBST(SQLITE3_CFLAGS)
+            AC_SUBST(SQLITE3_LDFLAGS)
+            AC_SUBST(SQLITE3_VERSION)
+            AC_DEFINE([HAVE_SQLITE3], [], [Have the SQLITE3 library])
+        fi
+    fi
+])
@@ -0,0 +1,103 @@
+dnl erlang-extra.m4
+
+AC_DEFUN([ERLANG_SUBST_LIB_VER],
+[AC_ERLANG_CHECK_LIB([$1])
+ERLANG_LIB_VER_SUBST="$ERLANG_LIB_VER_SUBST -e 's,[@]ERLANG_LIB_VER_$1[@],\$(ERLANG_LIB_VER_$1),g'"
+AC_SUBST([ERLANG_LIB_VER_SUBST])
+]) # ERLANG_SUBST_LIB_VER
+
+AC_DEFUN([ERLANG_VERSION_CHECK],
+[		AC_MSG_CHECKING([Erlang/OTP version])
+		cat > conftest.erl <<EOF
+-module(conftest).
+-export([[start/0]]).
+
+start() ->
+    ERTS = erlang:system_info(version),
+    RequiredMin = "$1",
+    RequiredMax = "$2",
+    Status =
+        case {string:tokens(RequiredMin, " "),
+              string:tokens(RequiredMax, " ")} of
+	    {[[MinStr | _]], [[MaxStr | _]]} ->
+                case check(ERTS, {MinStr, MaxStr}) of
+                    less ->
+                         list_to_binary([[ERTS, " found, ", RequiredMin, " required"]]);
+                    greater ->
+                         list_to_binary([[ERTS, " found, ", RequiredMax, " or earlier required"]]);
+                    ok ->
+	                 <<"ok">>
+                end;
+	    _ ->
+	        list_to_binary([[ERTS, " found, ", RequiredMin, " required"]])
+	end,
+    file:write_file("conftest.out", Status),
+    halt().
+
+check(CurStr, {MinStr, MaxStr}) ->
+    Cur = parse(CurStr),
+    Min = parse(MinStr),
+    Max = parse(MaxStr),
+    case {less_or_equal(Min, Cur), less_or_equal(Cur, Max)} of
+        {false, true} -> less;
+        {true, true} -> ok;
+        {true, false} -> greater
+    end.
+
+parse(Version) ->
+    lists:map(fun(A) -> {Int,[[]]} = string:to_integer(A), Int end,
+              string:tokens(Version, ".")).
+
+less_or_equal([[]], [[]]) ->
+    true;
+less_or_equal([[]], _Any) ->
+    true;
+less_or_equal(_Any, [[]]) ->
+    false;
+less_or_equal([[Left| Rl]], [[Right| Rr]]) ->
+    case {Left < Right, Left == Right} of
+        {true, _}  ->
+            true;
+        {false, false} ->
+            false;
+        {false, true} ->
+            less_or_equal(Rl, Rr)
+    end.
+
+EOF
+
+	$ERLC conftest.erl || AC_MSG_ERROR(["Could not compile Erlang/OTP version check program using '$ERLC'"])
+
+	if ! $ERL -s conftest -noshell -o ! -f conftest.out ; then
+	   AC_MSG_ERROR(["Could not run Erlang/OTP version check program using '$ERL'"])
+	fi
+
+	if test "x`cat conftest.out`" != "xok"; then
+	   AC_MSG_RESULT([failed])
+	   X="`cat conftest.out`"
+	   if test "[$3]" == "warn"; then
+	      AC_MSG_WARN([$X])
+	   else
+	      AC_MSG_FAILURE([$X])
+	   fi
+	else
+	   AC_MSG_RESULT([ok])
+	fi
+]) dnl ERLANG_VERSION_CHECK
+
+AC_DEFUN([ERLANG_DEPRECATED_TYPES_CHECK],
+[		AC_MSG_CHECKING([whether Erlang is using deprecated types])
+		cat > conftest.erl <<EOF
+-module(conftest).
+
+-record(state, {host = dict:new() :: dict:dict()}).
+EOF
+
+	if $ERLC conftest.erl > /dev/null 2>&1; then
+	   AC_MSG_RESULT([no])
+	   AC_SUBST(erlang_deprecated_types, false)
+	else
+	   AC_MSG_RESULT([yes])
+	   AC_SUBST(erlang_deprecated_types, true)
+	fi
+])
@@ -0,0 +1,77 @@
+defmodule Ejabberd.Mixfile do
+  use Mix.Project
+
+  def project do
+    [app: :ejabberd,
+     version: "@PACKAGE_VERSION@",
+     elixir: "~> 1.0",
+     elixirc_paths: ["lib"],
+     compile_path: ".",
+     compilers: [:asn1] ++ Mix.compilers,
+     erlc_options: erlc_options,
+     erlc_paths: ["asn1", "src"],
+     deps: deps]
+  end
+
+  def application do
+    [mod: {:ejabberd_app, []},
+     applications: [:kernel, :stdlib]]
+  end
+  
+  defp erlc_options do
+    includes = Path.wildcard(Path.join("..", "/*/include"))
+    [:debug_info, {:d, :NO_EXT_LIB}] ++ Enum.map(includes, fn(path) -> {:i, path} end)
+  end
+  
+  defp deps do
+    [
+        {:p1_xml, github: "processone/xml"},
+        {:p1_logger, github: "processone/p1_logger"},
+        {:p1_yaml, github: "processone/p1_yaml"},
+        {:p1_tls, github: "processone/tls"},
+        {:p1_stringprep, github: "processone/stringprep"},
+        {:p1_zlib, github: "processone/zlib"},
+        {:p1_cache_tab, github: "processone/cache_tab"},
+        {:p1_utils, github: "processone/p1_utils"},
+        {:p1_iconv, github: "processone/eiconv"},
+        {:esip, github: "processone/p1_sip"},
+        {:p1_stun, github: "processone/stun"},
+        {:ehyperloglog, github: "vaxelfel/eHyperLogLog"},
+        {:p1_mysql, github: "processone/mysql"},
+        {:p1_pgsql, github: "processone/pgsql"},
+        {:eredis, github: "wooga/eredis"}
+     ]
+  end
+end
+
+defmodule Mix.Tasks.Compile.Asn1 do
+  use Mix.Task
+  alias Mix.Compilers.Erlang
+
+  @recursive true
+  @manifest ".compile.asn1"
+
+  def run(args) do
+    {opts, _, _} = OptionParser.parse(args, switches: [force: :boolean])
+
+    project      = Mix.Project.config
+    source_paths = project[:asn1_paths] || ["asn1"]
+    dest_paths    = project[:asn1_target] || ["src"]
+    mappings     = Enum.zip(source_paths, dest_paths)
+    options      = project[:asn1_options] || []
+
+    Erlang.compile(manifest(), mappings, :asn1, :erl, opts[:force], fn
+      input, output ->
+        options = options ++ [:noobj, outdir: Erlang.to_erl_file(Path.dirname(output))]
+        case :asn1ct.compile(Erlang.to_erl_file(input), options) do
+          :ok -> {:ok, :done}
+          error -> error
+        end
+    end)
+  end
+
+  def manifests, do: [manifest]
+  defp manifest, do: Path.join(Mix.Project.manifest_path, @manifest)
+
+  def clean, do: Erlang.clean(manifest())
+end
@@ -1,8 +1,8 @@
+%% -*- coding: latin-1 -*-
 {"Access Configuration","Configuració d'accesos"}.
 {"Access Control List Configuration","Configuració de la Llista de Control d'Accés"}.
 {"Access Control Lists","Llista de Control d'Accés"}.
 {"Access control lists","Llistes de Control de Accés"}.
-{"Access denied by service policy","Accés denegat per la política del servei"}.
 {"Access rules","Regles d'accés"}.
 {"Access Rules","Regles d'Accés"}.
 {"Action on user","Acció en l'usuari"}.
@@ -11,7 +11,6 @@
 {"Add User","Afegir usuari"}.
 {"Administration","Administració"}.
 {"Administration of ","Administració de "}.
-{"Administrator privileges required","Es necessita tenir privilegis d'administrador"}.
 {"A friendly name for the node","Un nom per al node"}.
 {"All activity","Tota l'activitat"}.
 {"Allow this Jabber ID to subscribe to this pubsub node?","Permetre que aquesta Jabber ID es puga subscriure a aquest node pubsub"}.
@@ -20,30 +19,35 @@
 {"Allow users to send invites","Permetre que els usuaris envien invitacions"}.
 {"Allow users to send private messages","Permetre que els usuaris envien missatges privats"}.
 {"Allow visitors to change nickname","Permetre als visitants canviar el Nickname"}.
+{"Allow visitors to send private messages to","Permetre als visitants enviar missatges privats a"}.
 {"Allow visitors to send status text in presence updates","Permetre als visitants enviar text d'estat en les actualitzacions de presència"}.
+{"Allow visitors to send voice requests","Permetre als visitants enviar peticions de veu"}.
 {"All Users","Tots els usuaris"}.
 {"Announcements","Anuncis"}.
 {"anyone","qualsevol"}.
-{"A password is required to enter this room","Es necessita password per a entrar en aquesta sala"}.
 {"April","Abril"}.
 {"August","Agost"}.
 {"Backup","Guardar còpia de seguretat"}.
 {"Backup Management","Gestió de còpia de seguretat"}.
-{"Backup of ","Còpia de seguretat de "}.
 {"Backup to File at ","Desar còpia de seguretat a fitxer en "}.
 {"Bad format","Format erroni"}.
 {"Birthday","Aniversari"}.
-{"Change Password","Canviar password"}.
-{"Change User Password","Canviar Password d'Usuari"}.
+{"CAPTCHA web page","Pàgina web del CAPTCHA"}.
+{"Change Password","Canviar Contrasenya"}.
+{"Change User Password","Canviar Contrasenya d'Usuari"}.
+{"Characters not allowed:","Caràcters no permesos:"}.
 {"Chatroom configuration modified","Configuració de la sala de xat modificada"}.
+{"Chatroom is created","La sala s'ha creat"}.
+{"Chatroom is destroyed","La sala s'ha destruït"}.
+{"Chatroom is started","La sala s'ha iniciat"}.
+{"Chatroom is stopped","La sala s'ha aturat"}.
 {"Chatrooms","Sales de xat"}.
-{"Choose a username and password to register with this server","Tria nom d'usuari i password per a registrar-te en aquest servidor"}.
+{"Choose a username and password to register with this server","Tria nom d'usuari i contrasenya per a registrar-te en aquest servidor"}.
 {"Choose modules to stop","Selecciona mòduls a detindre"}.
 {"Choose storage type of tables","Selecciona el tipus d'almacenament de les taules"}.
 {"Choose whether to approve this entity's subscription.","Tria si aprova aquesta entitat de subscripció"}.
 {"City","Ciutat"}.
 {"Commands","Comandaments"}.
-{"Conference room does not exist","La sala de conferències no existeix"}.
 {"Configuration","Configuració"}.
 {"Configuration of room ~s","Configuració de la sala ~s"}.
 {"Connected Resources:","Recursos connectats:"}.
@@ -51,7 +55,6 @@
 {"Country","Pais"}.
 {"CPU Time:","Temps de CPU"}.
 {"Database","Base de dades"}.
-{"Database Tables at ","Taules de la base de dades en "}.
 {"Database Tables Configuration at ","Configuració de la base de dades en "}.
 {"December","Decembre"}.
 {"Default users as participants","Els usuaris són participants per defecte"}.
@@ -65,15 +68,16 @@
 {"Description:","Descripció:"}.
 {"Disc only copy","Còpia sols en disc"}.
 {"Displayed Groups:","Mostrar grups:"}.
+{"Don't tell your password to anybody, not even the administrators of the Jabber server.","No li donis la teva contrasenya a ningú, ni tan sols als administradors del servidor Jabber."}.
 {"Dump Backup to Text File at ","Exporta còpia de seguretat a fitxer de text en "}.
 {"Dump to Text File","Exportar a fitxer de text"}.
 {"Edit Properties","Editar propietats"}.
+{"Either approve or decline the voice request.","Aprova o denega la petició de veu"}.
 {"ejabberd IRC module","mòdul ejabberd IRC"}.
 {"ejabberd MUC module","mòdul ejabberd MUC"}.
-{"ejabberd Publish-Subscribe module","Mòdul ejannerd Publicar-Subscriure"}.
+{"ejabberd Publish-Subscribe module","Mòdul ejabberd Publicar-Subscriure"}.
 {"ejabberd SOCKS5 Bytestreams module","mòdul ejabberd SOCKS5 Bytestreams"}.
 {"ejabberd vCard module","Mòdul ejabberd vCard"}.
-{"ejabberd virtual hosts","Hosts virtuals del ejabberd"}.
 {"ejabberd Web Admin","Web d'administració del ejabberd"}.
 {"Elements","Elements"}.
 {"Email","Email"}.
@@ -86,12 +90,13 @@
 {"Enter path to jabberd14 spool dir","Introdueix la ruta al directori de jabberd14 spools"}.
 {"Enter path to jabberd14 spool file","Introdueix ruta al fitxer jabberd14 spool"}.
 {"Enter path to text file","Introdueix ruta al fitxer de text"}.
-{"Enter the text you see","Introdueix el textque veus"}.
+{"Enter the text you see","Introdueix el text que veus"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers.  Press 'Next' to get more fields to fill in.  Press 'Complete' to save settings.","Introdueix el nom d'usuari i les codificacions de caràcters per a utilitzar als servidors de IRC. Apreta \"Seguent\" per veure més caps per omplir. Apreta \"Completar\" per guardar la configuració. "}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Introdueix el nom d'usuari, les codificacions de caràcters, els ports i contrassenyes per a utilitzar al connectar als servidors de IRC "}.
+{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Introdueix el nom d'usuari, les codificacions de caràcters, els ports i contrasenyes per a utilitzar al connectar als servidors de IRC"}.
 {"Erlang Jabber Server","Servidor Erlang Jabber"}.
 {"Error","Error"}.
 {"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Exemple: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
+{"Exclude Jabber IDs from CAPTCHA challenge","Excloure Jabber IDs de la comprovació CAPTCHA"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Exportar dades de tots els usuaris del servidor a arxius PIEFXIS (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Exportar dades d'usuaris d'un host a arxius PIEFXIS (XEP-0227):"}.
 {"Family Name","Cognom"}.
@@ -105,8 +110,9 @@
 {"Get Number of Online Users","Obtenir Número d'Usuaris Connectats"}.
 {"Get Number of Registered Users","Obtenir Número d'Usuaris Registrats"}.
 {"Get User Last Login Time","Obtenir la última connexió d'Usuari"}.
-{"Get User Password","Obtenir Password d'usuari"}.
+{"Get User Password","Obtenir Contrasenya d'usuari"}.
 {"Get User Statistics","Obtenir Estadístiques d'Usuari"}.
+{"Grant voice to this person?","Concedir veu a aquesta persona?"}.
 {"Group ","Grup "}.
 {"Groups","Grups"}.
 {"has been banned","Has sigut banejat"}.
@@ -116,7 +122,8 @@
 {"has been kicked","Has sigut expulsat"}.
 {" has set the subject to: "," ha posat l'assumpte: "}.
 {"Host","Host"}.
-{"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Si vols especificar codificacions de caràcters diferents per a cada servidor IRC emplena aquesta llista amb els valors amb el format '{\"servidor irc\", \"codificació\", port, \"contrassenya\"}'.  Aquest servei utilitza per defecte la codificació \"~s\", port ~p, no contrassenya."}.
+{"If you don't see the CAPTCHA image here, visit the web page.","Si no veus la imatge CAPTCHA açí, visita la pàgina web."}.
+{"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Si vols especificar codificacions de caràcters diferents per a cada servidor IRC emplena aquesta llista amb els valors amb el format '{\"servidor irc\", \"codificació\", port, \"contrasenya\"}'.  Aquest servei utilitza per defecte la codificació \"~s\", port ~p, no contrasenya."}.
 {"Import Directory","Importar directori"}.
 {"Import File","Importar fitxer"}.
 {"Import user data from jabberd14 spool file:","Importar dades d'usuaris de l'arxiu de spool de jabberd14"}.
@@ -125,8 +132,6 @@
 {"Import users data from jabberd14 spool directory:","Importar dades d'usuaris del directori de spool de jabberd14:"}.
 {"Import Users from Dir at ","Importar usuaris des del directori en "}.
 {"Import Users From jabberd14 Spool Files","Importar usuaris de jabberd14"}.
-{"Improper message type","Tipus de missatge incorrecte"}.
-{"Incorrect password","Password incorrecte"}.
 {"Invalid affiliation: ~s","Afiliació invàlida: ~s"}.
 {"Invalid role: ~s","Rol invàlid: ~s"}.
 {"IP addresses","Adreça IP"}.
@@ -138,9 +143,7 @@
 {"IRC username","Nom d'usuari al IRC"}.
 {"IRC Username","Nom d'usuari al IRC"}.
 {"is now known as","ara es conegut com"}.
-{"It is not allowed to send private messages","No està permés enviar missatges privats"}.
-{"It is not allowed to send private messages of type \"groupchat\"","No està permés enviar missatges del tipus \"groupchat\""}.
-{"It is not allowed to send private messages to the conference","No està permés l'enviament de missatges privats a la sala"}.
+{"Jabber Account Registration","Registre de compte Jabber"}.
 {"Jabber ID","ID Jabber"}.
 {"Jabber ID ~s is invalid","El Jabber ID ~s no és vàlid"}.
 {"January","Gener"}.
@@ -160,10 +163,10 @@
 {"List of modules to start","Llista de mòduls a iniciar"}.
 {"Low level update script","Script d'actualització de baix nivell"}.
 {"Make participants list public","Crear una llista de participants pública"}.
-{"Make room captcha protected","Crear una sala protegida per captcha"}.
+{"Make room CAPTCHA protected","Crear una sala protegida per CAPTCHA"}.
 {"Make room members-only","Crear una sala de \"només membres\""}.
 {"Make room moderated","Crear una sala moderada"}.
-{"Make room password protected","Crear una sala amb password"}.
+{"Make room password protected","Crear una sala amb contrasenya"}.
 {"Make room persistent","Crear una sala persistent"}.
 {"Make room public searchable","Crear una sala pública"}.
 {"March","Març"}.
@@ -171,28 +174,28 @@
 {"Max # of items to persist","Màxim # d'elements que persistixen"}.
 {"Max payload size in bytes","Màxim tamany del payload en bytes"}.
 {"May","Maig"}.
-{"Membership is required to enter this room","Necessites ser membre d'aquesta sala per a poder entrar"}.
 {"Members:","Membre:"}.
+{"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","Memoritza la teva contrasenya, o escriu-la en un paper guardat a un lloc segur.A Jabber no hi ha una forma automatitzada de recuperar la teva contrasenya si la oblides."}.
 {"Memory","Memòria"}.
 {"Message body","Missatge"}.
 {"Middle Name","Segon nom"}.
-{"Moderator privileges required","Es necessita tenir privilegis de moderador"}.
+{"Minimum interval between voice requests (in seconds)","Interval mínim entre peticions de veu (en segons)"}.
 {"moderators only","només moderadors"}.
 {"Modified modules","Mòduls modificats"}.
 {"Module","Mòdul"}.
-{"Modules at ","Mòduls en "}.
 {"Modules","Mòduls"}.
 {"Monday","Dilluns"}.
 {"Name:","Nom:"}.
 {"Name","Nom"}.
 {"Never","Mai"}.
+{"New Password:","Nova Contrasenya:"}.
 {"Nickname","Nickname"}.
 {"Nickname Registration at ","Registre del Nickname en "}.
 {"Nickname ~s does not exist in the room","El Nickname ~s no existeix a la sala"}.
+{"nobody","ningú"}.
 {"No body provided for announce message","No hi ha proveedor per al missatge anunci"}.
 {"No Data","No hi ha dades"}.
 {"Node ID","ID del Node"}.
-{"Node ","Node "}.
 {"Node not found","Node no trobat"}.
 {"Nodes","Nodes"}.
 {"No limit","Sense Llímit"}.
@@ -210,27 +213,25 @@
 {"Offline Messages:","Missatges fora de línia:"}.
 {"Offline Messages","Missatges offline"}.
 {"OK","Acceptar"}.
+{"Old Password:","Antiga contrasenya:"}.
 {"Online","Connectat"}.
 {"Online Users","Usuaris conectats"}.
 {"Online Users:","Usuaris en línia:"}.
 {"Only deliver notifications to available users","Sols enviar notificacions als usuaris disponibles"}.
 {"Only moderators and participants are allowed to change the subject in this room","Només els moderadors i participants poden canviar l'assumpte d'aquesta sala"}.
 {"Only moderators are allowed to change the subject in this room","Només els moderadors poden canviar l'assumpte d'aquesta sala"}.
-{"Only occupants are allowed to send messages to the conference","Sols els ocupants poden enviar missatges a la sala"}.
-{"Only occupants are allowed to send queries to the conference","Sols els ocupants poden enviar solicituts a la sala"}.
-{"Only service administrators are allowed to send service messages","Sols els administradors del servei tenen permís per a enviar missatges de servei"}.
 {"Options","Opcions"}.
 {"Organization Name","Nom de la organizació"}.
 {"Organization Unit","Unitat de la organizació"}.
 {"Outgoing s2s Connections:","Connexions d'eixida s2s"}.
 {"Outgoing s2s Connections","Connexions s2s d'eixida"}.
 {"Outgoing s2s Servers:","Servidors d'eixida de s2s"}.
-{"Owner privileges required","Es requerixen privilegis de propietari de la sala"}.
 {"Packet","Paquet"}.
-{"Password ~b","Password ~b"}.
-{"Password:","Password:"}.
-{"Password","Password"}.
-{"Password Verification","Verificació del Password"}.
+{"Password ~b","Contrasenya ~b"}.
+{"Password:","Contrasenya:"}.
+{"Password","Contrasenya"}.
+{"Password Verification:","Verificació de la Contrasenya:"}.
+{"Password Verification","Verificació de la Contrasenya"}.
 {"Path to Dir","Ruta al directori"}.
 {"Path to File","Ruta al fitxer"}.
 {"Pending","Pendent"}.
@@ -246,14 +247,15 @@
 {"Protocol","Protocol"}.
 {"Publish-Subscribe","Publicar-subscriure't"}.
 {"PubSub subscriber request","Petició de subscriptor PubSub"}.
-{"Queries to the conference members are not allowed in this room"," En aquesta sala no es permeten solicituts als membres de la sala"}.
+{"Purge all items when the relevant publisher goes offline","Eliminar tots els elements quan el publicant relevant es desconnecti"}.
 {"RAM and disc copy","Còpia en RAM i disc"}.
 {"RAM copy","Còpia en RAM"}.
 {"Raw","en format text"}.
 {"Really delete message of the day?","Segur que vols eliminar el missatge del dia?"}.
-{"Recipient is not in the conference room","El receptor no està en la sala de conferència"}.
+{"Register a Jabber account","Registrar un compte Jabber"}.
 {"Registered Users:","Usuaris registrats:"}.
 {"Registered Users","Usuaris registrats"}.
+{"Register","Registrar"}.
 {"Registration in mod_irc for ","Registre en mod_irc per a"}.
 {"Remote copy","Còpia remota"}.
 {"Remove All Offline Messages","Eliminar tots els missatges offline"}.
@@ -269,7 +271,6 @@
 {"Restore plain text backup immediately:","Restaurar una còpia de seguretat en format de text pla ara mateix:"}.
 {"Restore","Restaurar"}.
 {"Room Configuration","Configuració de la sala"}.
-{"Room creation is denied by service policy","Se t'ha denegat el crear la sala per política del servei"}.
 {"Room description","Descripció de la sala:"}.
 {"Room Occupants","Nombre d'ocupants"}.
 {"Room title","Títol de la sala"}.
@@ -290,6 +291,7 @@
 {"Send announcement to all users on all hosts","Enviar anunci a tots els usuaris de tots els hosts"}.
 {"September","Setembre"}.
 {"Server ~b","Servidor ~b"}.
+{"Server:","Servidor:"}.
 {"Set message of the day and send to online users","Configurar el missatge del dia i enviar a tots els usuaris"}.
 {"Set message of the day on all hosts and send to online users","Escriure missatge del dia en tots els hosts i enviar-ho als usuaris connectats"}.
 {"Shared Roster Groups","Grups de contactes compartits"}.
@@ -297,7 +299,9 @@
 {"Show Ordinary Table","Mostrar Taula Ordinaria"}.
 {"Shut Down Service","Apager el Servei"}.
 {"~s invites you to the room ~s","~s et convida a la sala ~s"}.
+{"Some Jabber clients can store your password in your computer. Use that feature only if you trust your computer is safe.","Alguns clients Jabber poden emmagatzemar la teva contrasenya al teu ordinador. Fes servir aquesta característica només si saps que el teu ordinador és segur."}.
 {"Specify the access model","Especificar el model d'accés"}.
+{"Specify the event message type","Especifica el tipus de missatge d'event"}.
 {"Specify the publisher model","Especificar el model del publicant"}.
 {"~s's Offline Messages Queue","~s's cua de missatges offline"}.
 {"Start","Iniciar"}.
@@ -318,29 +322,30 @@
 {"Subscriber Address","Adreça del Subscriptor"}.
 {"Subscription","Subscripció"}.
 {"Sunday","Diumenge"}.
-{"That nickname is already in use by another occupant","El Nickname està siguent utilitzat per una altra persona"}.
-{"That nickname is registered by another person","El nickname ja està registrat per una altra persona"}.
-{"The captcha is valid.","El captcha es vàlid."}.
+{"The CAPTCHA is valid.","El CAPTCHA es vàlid."}.
 {"The collections with which a node is affiliated","Les col.leccions amb les que un node està afiliat"}.
-{"the password is","el password és"}.
-{"This participant is kicked from the room because he sent an error message","Aquest participant ha sigut expulsat de la sala perque ha enviat un missatge d'error"}.
-{"This participant is kicked from the room because he sent an error message to another participant","Aquest participant ha sigut expulsat de la sala perque ha enviat un missatge erroni a un altre participant"}.
-{"This participant is kicked from the room because he sent an error presence","Aquest participant ha sigut expulsat de la sala perque ha enviat un error de presencia"}.
+{"the password is","la contrasenya és"}.
+{"The password of your Jabber account was successfully changed.","La contrasenya del teu compte Jabber s'ha canviat correctament."}.
+{"There was an error changing the password: ","Hi ha hagut un error canviant la contrasenya: "}.
+{"There was an error creating the account: ","Hi ha hagut un error creant el compte: "}.
+{"There was an error deleting the account: ","Hi ha hagut un error esborrant el compte: "}.
+{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Això no distingeix majúscules de minúscules: macbeth es el mateix que MacBeth i Macbeth."}.
+{"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Aquesta pàgina permet crear un compte Jabber en aquest servidor Jabber. El teu JID (Jabber IDentifier; Identificador Jabber) tindrà aquesta forma: usuari@servidor. Si us plau, llegeix amb cura les instruccions per emplenar correctament els camps."}.
+{"This page allows to unregister a Jabber account in this Jabber server.","Aquesta pàgina permet anul·lar el registre d'un compte Jabber en aquest servidor Jabber."}.
 {"This room is not anonymous","Aquesta sala no és anònima"}.
 {"Thursday","Dijous"}.
 {"Time","Data"}.
 {"Time delay","Temps de retard"}.
 {"To","Per a"}.
 {"To ~s","A ~s"}.
-{"Traffic rate limit is exceeded","El llímit de tràfic ha sigut sobrepassat"}.
 {"Transactions Aborted:","Transaccions Avortades"}.
 {"Transactions Committed:","Transaccions Realitzades:"}.
 {"Transactions Logged:","Transaccions registrades"}.
 {"Transactions Restarted:","Transaccions reiniciades"}.
 {"Tuesday","Dimarts"}.
-{"Unable to generate a captcha","No s'ha pogut generar un captcha"}.
 {"Unauthorized","No autoritzat"}.
-{"Update ","Actualitzar"}.
+{"Unregister a Jabber account","Anul·lar el registre d'un compte Jabber"}.
+{"Unregister","Anul·lar el registre"}.
 {"Update","Actualitzar"}.
 {"Update message of the day (don't send)","Actualitzar el missatge del dia (no enviar)"}.
 {"Update message of the day on all hosts (don't send)","Actualitza el missatge del dia en tots els hosts (no enviar)"}.
@@ -348,24 +353,25 @@
 {"Update script","Script d'actualització"}.
 {"Uptime:","Temps en marxa"}.
 {"Use of STARTTLS required","És obligatori utilitzar STARTTLS"}.
+{"User JID","JID del usuari "}.
 {"User Management","Gestió d'Usuaris"}.
-{"Users are not allowed to register accounts so quickly","Els usuaris no tenen permís per a crear comptes tan depresa"}.
+{"Username:","Nom d'usuari:"}.
 {"Users Last Activity","Última activitat d'usuari"}.
 {"Users","Usuaris"}.
-{"User ","Usuari "}.
 {"User","Usuari"}.
 {"Validate","Validar"}.
 {"vCard User Search","Recerca de vCard d'usuari"}.
-{"Visitors are not allowed to change their nicknames in this room","Els visitants no tenen permés canviar el seus Nicknames en esta sala"}.
-{"Visitors are not allowed to send messages to all occupants","Els visitants no poden enviar missatges a tots els ocupants"}.
+{"Virtual Hosts","Hosts virtuals"}.
+{"Voice request","Petició de veu"}.
 {"Wednesday","Dimecres"}.
 {"When to send the last published item","Quan s'ha enviat l'última publicació"}.
 {"Whether to allow subscriptions","Permetre subscripcions"}.
-{"You have been banned from this room","Has sigut bloquejat en aquesta sala"}.
-{"You must fill in field \"Nickname\" in the form","Deus d'omplir el camp \"Nickname\" al formulari"}.
+{"You can later change your password using a Jabber client.","Podràs canviar la teva contrasenya més endavant utilitzant un client Jabber."}.
+{"You need a client that supports x:data and CAPTCHA to register","Necessites un client amb suport x:data i de CAPTCHA para poder registrar-te"}.
+{"You need a client that supports x:data to register the nickname","Necessites un client amb suport x:data per a poder registrar el Nickname"}.
 {"You need an x:data capable client to configure mod_irc settings","Necessites un client amb suport x:data per a configurar les opcions de mod_irc"}.
 {"You need an x:data capable client to configure room","Necessites un client amb suport x:data per a configurar la sala"}.
-{"You need an x:data capable client to register nickname","Necessites un client amb suport x:data per a poder registrar el Nickname"}.
-{"You need an x:data capable client to search","Necesites un client amb suport x:data per a poder buscar"}.
-{"Your contact offline message queue is full. The message has been discarded.","La cua de missatges offline és plena. El missatge ha sigut descartat"}.
+{"You need an x:data capable client to search","Necessites un client amb suport x:data per a poder buscar"}.
+{"Your Jabber account was successfully created.","El teu compte Jabber ha sigut creat correctament."}.
+{"Your Jabber account was successfully deleted.","El teu compte Jabber ha sigut esborrat correctament."}.
 {"Your messages to ~s are being blocked. To unblock them, visit ~s","Els teus missatges per ~s s'estan bloquejant. Per desbloquejar-los, visita ~s"}.
@@ -1,8 +1,8 @@
+%% -*- coding: latin-1 -*-
 {"Access Configuration","Konfigurace přístupů"}.
 {"Access Control List Configuration","Konfigurace seznamu přístupových práv (ACL)"}.
 {"Access control lists","Seznamy přístupových práv (ACL)"}.
 {"Access Control Lists","Seznamy přístupových práv (ACL)"}.
-{"Access denied by service policy","Přístup byl zamítnut nastavením služby"}.
 {"Access rules","Pravidla přístupů"}.
 {"Access Rules","Pravidla přístupů"}.
 {"Action on user","Akce aplikovaná na uživatele"}.
@@ -11,7 +11,6 @@
 {"Add User","Přidat uživatele"}.
 {"Administration","Administrace"}.
 {"Administration of ","Administrace "}.
-{"Administrator privileges required","Potřebujete práva administrátora"}.
 {"A friendly name for the node","Přívětivé jméno pro uzel"}.
 {"All activity","Všechny aktivity"}.
 {"Allow this Jabber ID to subscribe to this pubsub node?","Povolit tomuto Jabber ID odebírat tento pubsub uzel?"}.
@@ -20,22 +19,28 @@
 {"Allow users to send invites","Povolit uživatelům posílání pozvánek"}.
 {"Allow users to send private messages","Povolit uživatelům odesílat soukromé zprávy"}.
 {"Allow visitors to change nickname","Povolit návštěvníkům měnit přezdívku"}.
+{"Allow visitors to send private messages to","Povolit návštěvníkům odesílat soukromé zprávy"}.
 {"Allow visitors to send status text in presence updates","Povolit návštěvníkům posílat stavové zprávy ve statusu"}.
+{"Allow visitors to send voice requests","Povolit uživatelům posílat žádosti o voice práva"}.
 {"All Users","Všichni uživatelé"}.
 {"Announcements","Oznámení"}.
 {"anyone","každému"}.
-{"A password is required to enter this room","Pro vstup do místnosti musíte zadat heslo"}.
 {"April",". dubna"}.
 {"August",". srpna"}.
 {"Backup Management","Správa zálohování"}.
-{"Backup of ","Záloha na "}.
 {"Backup to File at ","Záloha do souboru na "}.
 {"Backup","Zálohovat"}.
 {"Bad format","Nesprávný formát"}.
 {"Birthday","Datum narození"}.
+{"CAPTCHA web page","Webová stránka CAPTCHA"}.
 {"Change Password","Změnit heslo"}.
 {"Change User Password","Změnit heslo uživatele"}.
+{"Characters not allowed:","Nepřípustné znaky:"}.
 {"Chatroom configuration modified","Nastavení diskuzní místnosti bylo změněno"}.
+{"Chatroom is created","Konference vytvořena"}.
+{"Chatroom is destroyed","Konference zrušena"}.
+{"Chatroom is started","Konference spuštěna"}.
+{"Chatroom is stopped","Konference zastavena"}.
 {"Chatrooms","Konference"}.
 {"Choose a username and password to register with this server","Zadejte jméno uživatele a heslo pro registraci na tomto serveru"}.
 {"Choose modules to stop","Vyberte moduly, které mají být zastaveny"}.
@@ -43,7 +48,6 @@
 {"Choose whether to approve this entity's subscription.","Zvolte, zda chcete schválit odebírání touto entitou"}.
 {"City","Město"}.
 {"Commands","Příkazy"}.
-{"Conference room does not exist","Konferenční místnost neexistuje"}.
 {"Configuration","Konfigurace"}.
 {"Configuration of room ~s","Konfigurace místnosti ~s"}.
 {"Connected Resources:","Připojené zdroje:"}.
@@ -51,7 +55,6 @@
 {"Country","Země"}.
 {"CPU Time:","Čas procesoru"}.
 {"Database","Databáze"}.
-{"Database Tables at ","Databázové tabulky na "}.
 {"Database Tables Configuration at ","Konfigurace databázových tabulek "}.
 {"December",". prosince"}.
 {"Default users as participants","Uživatelé jsou implicitně členy"}.
@@ -65,15 +68,16 @@
 {"Description:","Popis:"}.
 {"Disc only copy","Jen kopie disku"}.
 {"Displayed Groups:","Zobrazené skupiny:"}.
+{"Don't tell your password to anybody, not even the administrators of the Jabber server.","Nikdy nikomu nesdělujte své heslo, ani administrátorovi serveru Jabberu."}.
 {"Dump Backup to Text File at ","Uložit zálohu do textového souboru na "}.
 {"Dump to Text File","Uložit do textového souboru"}.
 {"Edit Properties","Upravit vlastnosti"}.
+{"Either approve or decline the voice request.","Povolit nebo odmítnout voice žádost."}.
 {"ejabberd IRC module","ejabberd IRC modul"}.
 {"ejabberd MUC module","ejabberd MUC modul"}.
 {"ejabberd Publish-Subscribe module","ejabberd Publish-Subscribe modul"}.
 {"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 Bytestreams modul"}.
 {"ejabberd vCard module","ejabberd vCard modul"}.
-{"ejabberd virtual hosts","Virtuální hostitelé ejabberd"}.
 {"ejabberd Web Admin","Webová administrace ejabberd"}.
 {"Elements","Položek"}.
 {"Email","E-mail"}.
@@ -92,6 +96,7 @@
 {"Erlang Jabber Server","Erlang Jabber Server"}.
 {"Error","Chyba"}.
 {"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Příklad: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].2\"}]."}.
+{"Exclude Jabber IDs from CAPTCHA challenge","Vyloučit Jabber ID z procesu CAPTCHA ověřování"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Exportovat všechny uživatele do souboru ve formátu PIEFXIS (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Exportovat uživatele na hostiteli do souboru ve formátu PIEFXIS (XEP-0227):"}.
 {"Family Name","Příjmení"}.
@@ -107,6 +112,7 @@
 {"Get User Last Login Time","Získat čas podleního přihlášení uživatele"}.
 {"Get User Password","Získat heslo uživatele"}.
 {"Get User Statistics","Získat statistiky uživatele"}.
+{"Grant voice to this person?","Udělit voice práva této osobě?"}.
 {"Group ","Skupina "}.
 {"Groups","Skupiny"}.
 {"has been banned","byl(a) zablokován(a)"}.
@@ -116,6 +122,7 @@
 {"has been kicked","byl(a) vyhozen(a) z místnosti"}.
 {" has set the subject to: "," změnil(a) téma na: "}.
 {"Host","Hostitel"}.
+{"If you don't see the CAPTCHA image here, visit the web page.","Pokud zde nevidíte obrázek CAPTCHA, přejděte na webovou stránku."}.
 {"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Pokud chcete zadat jiné kódování pro IRC servery, vyplňte seznam s hodnotami ve formátu '{\"irc server\",\"encoding\", port, \"password\"}'. Výchozí kódování pro tuto službu je \"~s\", port ~p, empty password."}.
 {"Import Directory","Import adresáře"}.
 {"Import File","Import souboru"}.
@@ -125,8 +132,6 @@
 {"Import users data from jabberd14 spool directory:","Importovat uživatele z jabberd14 spool souborů:"}.
 {"Import Users from Dir at ","Importovat uživatele z adresáře na "}.
 {"Import Users From jabberd14 Spool Files","Importovat uživatele z jabberd14 spool souborů"}.
-{"Improper message type","Nesprávný typ zprávy"}.
-{"Incorrect password","Nesprávné heslo"}.
 {"Invalid affiliation: ~s","Neplatné přiřazení: ~s"}.
 {"Invalid role: ~s","Neplatná role: ~s"}.
 {"IP addresses","IP adresy"}.
@@ -138,9 +143,7 @@
 {"IRC username","IRC přezdívka"}.
 {"IRC Username","IRC přezdívka"}.
 {"is now known as","se přejmenoval(a) na"}.
-{"It is not allowed to send private messages","Je zakázáno posílat soukromé zprávy"}.
-{"It is not allowed to send private messages of type \"groupchat\"","Není dovoleno odeslání soukromé zprávy typu \"skupinová zpráva\" "}.
-{"It is not allowed to send private messages to the conference","Není povoleno odesílat soukromé zprávy do konference"}.
+{"Jabber Account Registration","Registrace účtu Jabberu"}.
 {"Jabber ID","Jabber ID"}.
 {"Jabber ID ~s is invalid","Jabber ID ~s je neplatné"}.
 {"January",". ledna"}.
@@ -160,7 +163,7 @@
 {"List of modules to start","Seznam modulů, které mají být spuštěné"}.
 {"Low level update script","Nízkoúrovňový aktualizační skript"}.
 {"Make participants list public","Nastavit seznam účastníků jako veřejný"}.
-{"Make room captcha protected","Chránit místnost pomocí CAPTCHA"}.
+{"Make room CAPTCHA protected","Chránit místnost pomocí CAPTCHA"}.
 {"Make room members-only","Zpřístupnit místnost jen členům"}.
 {"Make room moderated","Nastavit místnost jako moderovanou"}.
 {"Make room password protected","Chránit místnost heslem"}.
@@ -172,29 +175,29 @@
 {"Max payload size in bytes","Maximální náklad v bajtech"}.
 {"May",". května"}.
 {"Members:","Členové:"}.
-{"Membership is required to enter this room","Pro vstup do místnosti musíte být členem"}.
+{"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","Svoje heslo si zapamatujte, nebo si jej poznamenejte na papírek a ten uschovejte v bezpečí. Jabber nemá žádný automatizovaný způsob obnovy hesla."}.
 {"Memory","Paměť"}.
 {"Message body","Tělo zprávy"}.
 {"Middle Name","Druhé jméno"}.
-{"Moderator privileges required","Potřebujete práva moderátora"}.
+{"Minimum interval between voice requests (in seconds)","Minimální interval mezi žádostmi o voice práva (v sekundách)"}.
 {"moderators only","moderátorům"}.
 {"Modified modules","Aktualizované moduly"}.
 {"Module","Modul"}.
-{"Modules at ","Moduly na "}.
 {"Modules","Moduly"}.
 {"Monday","Pondělí"}.
 {"Name:","Jméno:"}.
 {"Name","Jméno"}.
 {"Never","Nikdy"}.
+{"New Password:","Nové heslo:"}.
 {"Nickname","Přezdívka"}.
 {"Nickname Registration at ","Registrace přezdívky na "}.
 {"Nickname ~s does not exist in the room","Přezdívka ~s v místnosti neexistuje"}.
+{"nobody","nikdo"}.
 {"No body provided for announce message","Zpráva neobsahuje text"}.
 {"No Data","Žádná data"}.
 {"Node ID","ID uzlu"}.
 {"Node not found","Uzel nenalezen"}.
 {"Nodes","Uzly"}.
-{"Node ","Uzel "}.
 {"No limit","Bez limitu"}.
 {"None","Nic"}.
 {"No resource provided","Nebyl poskytnut žádný zdroj"}.
@@ -210,26 +213,24 @@
 {"Offline Messages:","Offline zprávy:"}.
 {"Offline Messages","Offline zprávy"}.
 {"OK","OK"}.
+{"Old Password:","Současné heslo:"}.
 {"Online","Online"}.
 {"Online Users:","Online uživatelé:"}.
 {"Online Users","Online uživatelé"}.
 {"Only deliver notifications to available users","Doručovat upozornění jen právě přihlášeným uživatelům"}.
 {"Only moderators and participants are allowed to change the subject in this room","Jen moderátoři a účastníci mají povoleno měnit téma této místnosti"}.
 {"Only moderators are allowed to change the subject in this room","Jen moderátoři mají povoleno měnit téma místnosti"}.
-{"Only occupants are allowed to send messages to the conference","Jen členové mají povolené zasílat zprávy do konference"}.
-{"Only occupants are allowed to send queries to the conference","Jen členové mohou odesílat požadavky (query) do konference"}.
-{"Only service administrators are allowed to send service messages","Pouze správci služby smí odesílat servisní zprávy"}.
 {"Options","Nastavení"}.
 {"Organization Name","Název firmy"}.
 {"Organization Unit","Oddělení"}.
 {"Outgoing s2s Connections:","Odchozí s2s spojení:"}.
 {"Outgoing s2s Connections","Odchozí s2s spojení"}.
 {"Outgoing s2s Servers:","Odchozí s2s servery:"}.
-{"Owner privileges required","Jsou vyžadována práva vlastníka"}.
 {"Packet","Paket"}.
 {"Password ~b","Heslo ~b"}.
 {"Password:","Heslo:"}.
 {"Password","Heslo"}.
+{"Password Verification:","Ověření hesla:"}.
 {"Password Verification","Ověření hesla"}.
 {"Path to Dir","Cesta k adresáři"}.
 {"Path to File","Cesta k souboru"}.
@@ -246,14 +247,15 @@
 {"Protocol","Protokol"}.
 {"Publish-Subscribe","Publish-Subscribe"}.
 {"PubSub subscriber request","Žádost odběratele PubSub"}.
-{"Queries to the conference members are not allowed in this room","Požadavky (queries) na členy konference nejsou v této místnosti povolené"}.
+{"Purge all items when the relevant publisher goes offline","Smazat všechny položky, pokud se příslušný poskytovatel odpojí"}.
 {"RAM and disc copy","Kopie RAM a disku"}.
 {"RAM copy","Kopie RAM"}.
 {"Raw","Zdroj"}.
 {"Really delete message of the day?","Skutečně smazat zprávu dne?"}.
-{"Recipient is not in the conference room","Příjemce se nenachází v konferenční místnosti"}.
+{"Register a Jabber account","Zaregistrujte si účet Jabberu"}.
 {"Registered Users","Registrovaní uživatelé"}.
 {"Registered Users:","Registrovaní živatelé:"}.
+{"Register","Zaregistrovat se"}.
 {"Registration in mod_irc for ","Registrace do mod_irc na "}.
 {"Remote copy","Vzdálená kopie"}.
 {"Remove All Offline Messages","Odstranit všechny offline zprávy"}.
@@ -269,7 +271,6 @@
 {"Restore","Obnovit"}.
 {"Restore plain text backup immediately:","Okamžitě obnovit zálohu z textového souboru:"}.
 {"Room Configuration","Nastavení místnosti"}.
-{"Room creation is denied by service policy","Pravidla služby nepovolují vytvořit místnost"}.
 {"Room description","Popis místnosti"}.
 {"Room Occupants","Počet účastníků"}.
 {"Room title","Název místnosti"}.
@@ -290,6 +291,7 @@
 {"Send announcement to all users on all hosts","Odeslat oznámení všem uživatelům na všech hostitelích"}.
 {"September",". září"}.
 {"Server ~b","Server ~b"}.
+{"Server:","Server:"}.
 {"Set message of the day and send to online users","Nastavit zprávu dne a odeslat ji online uživatelům"}.
 {"Set message of the day on all hosts and send to online users","Nastavit zprávu dne a odeslat ji online uživatelům"}.
 {"Shared Roster Groups","Skupiny pro sdílený seznam kontaktů"}.
@@ -297,7 +299,9 @@
 {"Show Ordinary Table","Zobrazit běžnou tabulku"}.
 {"Shut Down Service","Vypnout službu"}.
 {"~s invites you to the room ~s","~s vás zve do místnosti ~s"}.
+{"Some Jabber clients can store your password in your computer. Use that feature only if you trust your computer is safe.","Někteří klienti umí uložit vaše heslo na disk počítače. Tuto funkci používejte, pouze pokud věříte zabezpečení svého počítače."}.
 {"Specify the access model","Uveďte přístupový model"}.
+{"Specify the event message type","Zvolte typ zpráv pro události"}.
 {"Specify the publisher model","Specifikovat model pro publikování"}.
 {"~s's Offline Messages Queue","Fronta offline zpráv uživatele ~s"}.
 {"Start Modules at ","Spustit moduly na "}.
@@ -318,54 +322,56 @@
 {"Subscriber Address","Adresa odběratele"}.
 {"Subscription","Přihlášení"}.
 {"Sunday","Neděle"}.
-{"That nickname is already in use by another occupant","Přezdívka je již používána jiným členem"}.
-{"That nickname is registered by another person","Přezdívka je zaregistrována jinou osobou"}.
-{"The captcha is valid.","CAPTCHA souhlasí."}.
+{"The CAPTCHA is valid.","CAPTCHA souhlasí."}.
 {"The collections with which a node is affiliated","Kolekce, se kterými je uzel spřízněn"}.
 {"the password is","heslo je"}.
-{"This participant is kicked from the room because he sent an error message","Tento účastník byl vyhozen, protože odeslal chybovou zprávu"}.
-{"This participant is kicked from the room because he sent an error message to another participant","Tento účastník byl vyhozen, protože odeslal chybovou zprávu jinému účastníkovi"}.
-{"This participant is kicked from the room because he sent an error presence","Tento účastník byl vyhozen, protože odeslal chybový status"}.
+{"The password of your Jabber account was successfully changed.","Heslo vašeho účtu Jabberu bylo úspěšně změněno."}.
+{"There was an error changing the password: ","Při změně hesla došlo k chybě: "}.
+{"There was an error creating the account: ","Při vytváření účtu došlo k chybě."}.
+{"There was an error deleting the account: ","Při mazání účtu došlo k chybě: "}.
+{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Zde nezáleží na velikosti písmen: macbeth je stejný jako MacBeth a Macbeth."}.
+{"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Na této stránce si můžete vytvořit účet na tomto serveru Jabberu. Vaše JID (Jabber IDentifikátor) bude mít tvar: uživatelskéjméno@server. Přečtěte si prosím pozorně instrukce pro vyplnění údajů."}.
+{"This page allows to unregister a Jabber account in this Jabber server.","Zde můžete zrušit registraci účtu na tomto serveru Jabberu."}.
 {"This room is not anonymous","Tato místnost není anonymní"}.
 {"Thursday","Čtvrtek"}.
 {"Time","Čas"}.
 {"Time delay","Časový posun"}.
 {"To","Pro"}.
 {"To ~s","Pro ~s"}.
-{"Traffic rate limit is exceeded","Byl překročen limit"}.
 {"Transactions Aborted:","Transakce zrušena"}.
 {"Transactions Committed:","Transakce potvrzena"}.
 {"Transactions Logged:","Transakce zaznamenána"}.
 {"Transactions Restarted:","Transakce restartována"}.
 {"Tuesday","Úterý"}.
-{"Unable to generate a captcha","Nebylo možné vygenerovat CAPTCHA"}.
 {"Unauthorized","Nemáte oprávnění"}.
-{"Update ","Aktualizovat "}.
+{"Unregister a Jabber account","Zrušte registraci účtu Jabberu"}.
+{"Unregister","Zrušit registraci"}.
 {"Update","Aktualizovat"}.
 {"Update message of the day (don't send)","Aktualizovat zprávu dne (neodesílat)"}.
 {"Update message of the day on all hosts (don't send)","Aktualizovat zprávu dne pro všechny hostitele (neodesílat)"}.
 {"Update plan","Aktualizovat plán"}.
 {"Update script","Aktualizované skripty"}.
 {"Uptime:","Čas běhu:"}.
-{"Use of STARTTLS required","Je vyžadováno STARTTLS."}.
+{"Use of STARTTLS required","Je vyžadováno STARTTLS"}.
+{"User JID","Jabber ID uživatele"}.
 {"User Management","Správa uživatelů"}.
-{"Users are not allowed to register accounts so quickly","Je zakázáno registrovat účty v tak rychlém sledu"}.
+{"Username:","Uživatelské jméno:"}.
 {"Users Last Activity","Poslední aktivita uživatele"}.
 {"Users","Uživatelé"}.
-{"User ","Uživatel "}.
 {"User","Uživatel"}.
 {"Validate","Ověřit"}.
 {"vCard User Search","Hledání uživatelů podle vizitek"}.
-{"Visitors are not allowed to change their nicknames in this room","Návštěvníkům této místnosti je zakázáno měnit přezdívku"}.
-{"Visitors are not allowed to send messages to all occupants","Návštevníci nemají povoleno zasílat zprávy všem účastníkům konference"}.
+{"Virtual Hosts","Virtuální hostitelé"}.
+{"Voice request","Žádost o voice práva"}.
 {"Wednesday","Středa"}.
 {"When to send the last published item","Kdy odeslat poslední publikovanou položku"}.
 {"Whether to allow subscriptions","Povolit odebírání"}.
-{"You have been banned from this room","Byl jste vyloučen z této místnosti"}.
-{"You must fill in field \"Nickname\" in the form","Musíte vyplnit políčko \"Přezdívka\" ve formuláři"}.
+{"You can later change your password using a Jabber client.","Později můžete své heslo změnit pomocí klienta Jabberu."}.
+{"You need a client that supports x:data and CAPTCHA to register","Pro registraci potřebujete klienta s podporou x:data a CAPTCHA"}.
+{"You need a client that supports x:data to register the nickname","Pro registraci přezdívky potřebujete klienta s podporou x:data"}.
 {"You need an x:data capable client to configure mod_irc settings","Pro konfiguraci mod_irc potřebujete klienta s podporou x:data"}.
 {"You need an x:data capable client to configure room","Ke konfiguraci místnosti potřebujete klienta podporujícího x:data"}.
-{"You need an x:data capable client to register nickname","K registraci přezdívky potřebujete klienta s podporou x:data"}.
 {"You need an x:data capable client to search","K vyhledávání potřebujete klienta podporujícího x:data"}.
-{"Your contact offline message queue is full. The message has been discarded.","Fronta offline zpráv pro váš kontakt je plná. Zpráva byla zahozena."}.
+{"Your Jabber account was successfully created.","Váš účet Jabberu byl úspěšně vytvořen."}.
+{"Your Jabber account was successfully deleted.","Váš účet Jabberu byl úspěšně smazán."}.
 {"Your messages to ~s are being blocked. To unblock them, visit ~s","Nesmíte posílat zprávy na ~s. Pro povolení navštivte ~s"}.
@@ -1,112 +1,118 @@
+%% -*- coding: latin-1 -*-
 {"Access Configuration","Zugangskonfiguration"}.
-{"Access Control List Configuration","Zugangskontroll-Liste (ACL) Konfiguration"}.
+{"Access Control List Configuration","Konfiguration der Zugangskontrolllisten"}.
 {"Access control lists","Zugangskontroll-Listen (ACL)"}.
 {"Access Control Lists","Zugangskontroll-Listen (ACL)"}.
-{"Access denied by service policy","Zugang aufgrund der Dienstrichtlinien verweigert"}.
 {"Access rules","Zugangsregeln"}.
 {"Access Rules","Zugangsregeln"}.
 {"Action on user","Aktion auf Benutzer"}.
-{"Add Jabber ID","Jabber ID hinzufügen"}.
-{"Add New","Neuen hinzufügen"}.
+{"Add Jabber ID","Jabber-ID hinzufügen"}.
+{"Add New","Neue hinzufügen"}.
 {"Add User","Benutzer hinzufügen"}.
 {"Administration of ","Administration von "}.
 {"Administration","Verwaltung"}.
-{"Administrator privileges required","Administratorenrechte benötigt"}.
-{"A friendly name for the node","Ein passender Name für den Knoten"}.
+{"A friendly name for the node","Ein merkbarer Name für den Knoten"}.
 {"All activity","Alle Aktivitäten"}.
-{"Allow this Jabber ID to subscribe to this pubsub node?","Erlauben sie dieser Jabber ID das Abonnement dieses pubsub Knotens?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Dieser Jabber-ID das Abonnement dieses pubsub-Knotens erlauben?"}.
 {"Allow users to change the subject","Erlaube Benutzern das Thema zu ändern"}.
-{"Allow users to query other users","Erlaube Benutzern andere Benutzer abzufragen"}.
+{"Allow users to query other users","Erlaube Benutzern Informationen über andere Benutzer abzufragen"}.
 {"Allow users to send invites","Erlaube Benutzern Einladungen zu senden"}.
 {"Allow users to send private messages","Erlaube Benutzern private Nachrichten zu senden"}.
 {"Allow visitors to change nickname","Erlaube Besuchern ihren Spitznamen zu ändern"}.
-{"Allow visitors to send status text in presence updates","Erlaube Besuchern einen Text bei Statusänderung zu setzen"}.
+{"Allow visitors to send private messages to","Erlaube Besuchern das Senden von privaten Nachrichten an"}.
+{"Allow visitors to send status text in presence updates","Erlaube Besuchern einen Text bei Statusänderung zu senden"}.
+{"Allow visitors to send voice requests","Anfragen von Sprachrechten für Benutzer erlauben"}.
 {"All Users","Alle Benutzer"}.
 {"Announcements","Ankündigungen"}.
-{"anyone","jeder"}.
-{"A password is required to enter this room","Sie brauchen ein Passwort um diesen Raum zu betreten"}.
+{"anyone","jeden"}.
 {"April","April"}.
 {"August","August"}.
 {"Backup","Datensicherung"}.
-{"Backup Management","Datensicherungsmanagement"}.
-{"Backup of ","Sicherung von "}.
+{"Backup Management","Datensicherungsverwaltung"}.
 {"Backup to File at ","Datensicherung in die Datei "}.
 {"Bad format","Ungültiges Format"}.
 {"Birthday","Geburtsdatum"}.
+{"CAPTCHA web page","CAPTCHA Webseite"}.
 {"Change Password","Passwort ändern"}.
-{"Change User Password","Benutzer Passwort ändern"}.
-{"Chatroom configuration modified","Chatraum Konfiguration geändert"}.
+{"Change User Password","Benutzer-Passwort ändern"}.
+{"Characters not allowed:","Nicht erlaubte Zeichen:"}.
+{"Chatroom configuration modified","Chatraum-Konfiguration geändert"}.
+{"Chatroom is created","Chatraum wurde erstellt"}.
+{"Chatroom is destroyed","Chatraum wurde entfernt"}.
+{"Chatroom is started","Chatraum wurde gestartet"}.
+{"Chatroom is stopped","Chatraum wurde beendet"}.
 {"Chatrooms","Chaträume"}.
 {"Choose a username and password to register with this server","Wählen sie zum Registrieren einen Benutzernamen und ein Passwort"}.
 {"Choose modules to stop","Wähle zu stoppende Module"}.
 {"Choose storage type of tables","Wähle Speichertyp der Tabellen"}.
-{"Choose whether to approve this entity's subscription.","Wähle ob dieses Abonnement bestätigt wird."}.
+{"Choose whether to approve this entity's subscription.","Wähle Sie, ob dieses Abonnement akzeptiert werden soll."}.
 {"City","Stadt"}.
 {"Commands","Befehle"}.
-{"Conference room does not exist","Konferenzraum existiert nicht"}.
 {"Configuration","Konfiguration"}.
 {"Configuration of room ~s","Konfiguration für Raum ~s"}.
-{"Connected Resources:","Verbundene Resourcen"}.
+{"Connected Resources:","Verbundene Ressourcen:"}.
 {"Connections parameters","Verbindungsparameter"}.
 {"Country","Land"}.
-{"CPU Time:","CPU Zeit:"}.
+{"CPU Time:","CPU-Zeit:"}.
 {"Database","Datenbank"}.
-{"Database Tables at ","Datenbank Tabellen bei "}.
-{"Database Tables Configuration at ","Datenbank Tabellen Konfiguration bei "}.
+{"Database Tables Configuration at ","Datenbanktabellen-Konfiguration auf "}.
 {"December","Dezember"}.
 {"Default users as participants","Standardbenutzer als Teilnehmer"}.
 {"Delete","Löschen"}.
 {"Delete message of the day","Lösche Nachricht des Tages"}.
 {"Delete message of the day on all hosts","Lösche Nachricht des Tages auf allen Hosts"}.
-{"Delete Selected","Markiertes löschen"}.
+{"Delete Selected","Markierte löschen"}.
 {"Delete User","Benutzer löschen"}.
-{"Deliver event notifications","Versende Ereignisbenachrichtigungen"}.
-{"Deliver payloads with event notifications","Versende Nutzlast mit Ereignisbenachrichtigungen"}.
+{"Deliver event notifications","Ereignisbenachrichtigung zustellen"}.
+{"Deliver payloads with event notifications","Nachrichten mit Ereignis-Benachrichtigungen zustellen"}.
 {"Description:","Beschreibung:"}.
-{"Disc only copy","Festplatten Kopie"}.
+{"Disc only copy","Nur auf Festplatte"}.
 {"Displayed Groups:","Angezeigte Gruppen:"}.
+{"Don't tell your password to anybody, not even the administrators of the Jabber server.","Geben sie niemandem ihr Passwort, auch nicht den Administratoren des Jabber Servers."}.
 {"Dump Backup to Text File at ","Ausgabe der Sicherung in diese Textdatei "}.
 {"Dump to Text File","Ausgabe in Textdatei"}.
 {"Edit Properties","Einstellungen ändern"}.
-{"ejabberd IRC module","ejabberd IRC Modul"}.
-{"ejabberd MUC module","ejabberd MUC Modul"}.
-{"ejabberd Publish-Subscribe module","ejabberd Publish-Subscribe Modul"}.
-{"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 Bytestreams Modul"}.
-{"ejabberd vCard module","ejabberd vCard Modul"}.
-{"ejabberd virtual hosts","ejabberd virtuelle Hosts"}.
-{"ejabberd Web Admin","ejabberd Web Admin"}.
+{"Either approve or decline the voice request.","Diese Anfrage für Sprachrechte bestätigen oder ablehnen."}.
+{"ejabberd IRC module","ejabberd IRC-Modul"}.
+{"ejabberd MUC module","ejabberd MUC-Modul"}.
+{"ejabberd Publish-Subscribe module","ejabberd Publish-Subscribe-Modul"}.
+{"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5-Bytestreams-Modul"}.
+{"ejabberd vCard module","ejabberd vCard-Modul"}.
+{"ejabberd Web Admin","ejabberd Web-Admin"}.
 {"Elements","Elemente"}.
 {"Email","E-Mail"}.
-{"Enable logging","Log-Funktion aktivieren"}.
+{"Enable logging","Protokollierung aktivieren"}.
 {"Encoding for server ~b","Kodierung für Server ~b"}.
-{"End User Session","Benutzer Sitzung beenden"}.
+{"End User Session","Benutzer-Sitzung beenden"}.
 {"Enter list of {Module, [Options]}","Geben sie eine Liste bestehend aus {Modul, [Optionen]} ein"}.
-{"Enter nickname you want to register","Geben sie den zu registrierenden Spitznamen ein"}.
+{"Enter nickname you want to register","Geben sie den zu registrierenden Benutzernamen ein"}.
 {"Enter path to backup file","Geben sie den Pfad zur Datensicherung ein"}.
-{"Enter path to jabberd14 spool dir","Geben sie den Pfad zum jabberd14 spool Verzeichnis ein"}.
-{"Enter path to jabberd14 spool file","Geben sie den Pfad zur jabberd14 spool Datei ein"}.
+{"Enter path to jabberd14 spool dir","Geben Sie den Pfad zum jabberd14-Spool-Verzeichnis ein"}.
+{"Enter path to jabberd14 spool file","Geben Sie den Pfad zur jabberd14-Spool-Datei ein"}.
 {"Enter path to text file","Geben sie den Pfad zur Textdatei ein"}.
 {"Enter the text you see","Geben sie den Text den sie sehen ein"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers.  Press 'Next' to get more fields to fill in.  Press 'Complete' to save settings.","Geben sie Benutzernamen und Kodierung für Verbindungen zu IRC Servern an. Drücken sie 'Mehr' um leere Felder hinzuzufügen. Drücken sie 'Beenden' um die Einstellungen zu speichern."}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Geben sie Benutzernamen, Kodierungen, Ports und Passwörter für die Verbindung zu IRC Servern an"}.
+{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Geben Sie Benutzernamen und Zeichenkodierung für die Verbindung zum IRC-Server an"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
 {"Error","Fehler"}.
 {"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Beispiel: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
+{"Exclude Jabber IDs from CAPTCHA challenge","Von CAPTCHA Überprüfung ausgeschlossene Jabber IDs"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Alle Benutzerdaten des Servers in PIEFXIS Dateien (XEP-0227) exportieren:"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Alle Benutzerdaten des Hosts in PIEFXIS Dateien (XEP-0227) exportieren:"}.
 {"Family Name","Nachname"}.
 {"February","Februar"}.
-{"Fill in fields to search for any matching Jabber User","Felder ausfüllen, um nach passenden Jabber Benutzern zu suchen"}.
-{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","Füllen sie die Felder aus, um nach passenden Jabber Benutzern zu suchen (beenden sie ein Feld mit *, um auch nach Teilzeichenketten zu suchen)"}.
+{"Fill in fields to search for any matching Jabber User","Füllen Sie die Felder aus, um nach passenden Jabber-Benutzern zu suchen"}.
+{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","Füllen Sie die Felder aus, um nach passenden Jabber-Benutzern zu suchen (beenden Sie ein Feld mit *, um auch nach Teilzeichenketten zu suchen)"}.
 {"Friday","Freitag"}.
 {"From ~s","Von ~s"}.
 {"From","Von"}.
-{"Full Name","Gesamter Name"}.
+{"Full Name","Vollständiger Name"}.
 {"Get Number of Online Users","Anzahl der angemeldeten Benutzer abrufen"}.
 {"Get Number of Registered Users","Anzahl der registrierten Benutzer abrufen"}.
 {"Get User Last Login Time","letzte Anmeldezeit abrufen"}.
-{"Get User Password","Benutzer Passwort abrufen"}.
-{"Get User Statistics","Benutzer Statistik abrufen"}.
+{"Get User Password","Benutzer-Passwort abrufen"}.
+{"Get User Statistics","Benutzer-Statistiken abrufen"}.
+{"Grant voice to this person?","Sprachrechte dieser Person erteilen?"}.
 {"Group ","Gruppe "}.
 {"Groups","Gruppen"}.
 {"has been banned","wurde gebannt"}.
@@ -116,41 +122,38 @@
 {"has been kicked","wurde gekickt"}.
 {" has set the subject to: "," hat das Thema geändert auf: "}.
 {"Host","Host"}.
-{"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Wenn sie verschiedene Ports, Passwörter und Kodierungen für IRC Server angeben wollen, erstellen sie die Liste mit folgendem Format '{\"IRC Server\", \"Kodierung\", Port, \"Passwort\"}'.  Standardmässig benutzt dieser Dienst die \"~s\" Kodierung, den Port ~p und kein Passwort."}.
+{"If you don't see the CAPTCHA image here, visit the web page.","Wenn sie das CAPTCHA Bild nicht sehen, besuchen sie bitte die Webseite."}.
+{"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Wenn sie verschiedene Ports, Passwörter und Kodierungen für IRC Server angeben wollen, erstellen sie die Liste mit folgendem Format '{\"IRC Server\", \"Kodierung\", Port, \"Passwort\"}'.  Standardmäßig benutzt dieser Dienst die \"~s\" Kodierung, den Port ~p und kein Passwort."}.
 {"Import Directory","Verzeichnis importieren"}.
 {"Import File","Datei importieren"}.
 {"Import user data from jabberd14 spool file:","Importiere Benutzer von jabberd14 Spool Datei:"}.
 {"Import User from File at ","Benutzer aus dieser Datei importieren "}.
 {"Import users data from a PIEFXIS file (XEP-0227):","Benutzerdaten von einer PIEFXIS Datei (XEP-0227) importieren:"}.
 {"Import users data from jabberd14 spool directory:","Importiere Benutzer von jabberd14 Spool Verzeichnis:"}.
-{"Import Users from Dir at ","Benutzer vom Verzeichnis importieren "}.
-{"Import Users From jabberd14 Spool Files","Importiere Benutzer von jabberd14 Spool Dateien"}.
-{"Improper message type","Unzulässiger Nachrichtentyp"}.
-{"Incorrect password","Falsches Passwort"}.
+{"Import Users from Dir at ","Benutzer importieren aus dem Verzeichnis "}.
+{"Import Users From jabberd14 Spool Files","Importiere Benutzer aus jabberd14-Spool-Dateien"}.
 {"Invalid affiliation: ~s","Ungültige Mitgliedschaft: ~s"}.
 {"Invalid role: ~s","Ungültige Rolle: ~s"}.
-{"IP addresses","IP Addresse"}.
+{"IP addresses","IP Adressen"}.
 {"IP","IP"}.
 {"IRC channel (don't put the first #)","IRC Channel (ohne dem ersten #)"}.
 {"IRC server","IRC Server"}.
 {"IRC settings","IRC Einstellungen"}.
 {"IRC Transport","IRC Transport"}.
 {"IRC username","IRC Benutzername"}.
-{"IRC Username","IRC Benutzername"}.
+{"IRC Username","IRC-Benutzername"}.
 {"is now known as","ist nun bekannt als"}.
-{"It is not allowed to send private messages","Es ist nicht erlaubt private Nachrichten zu senden"}.
-{"It is not allowed to send private messages of type \"groupchat\"","Es ist nicht erlaubt private Nachrichten des Typs \"Gruppenchat\" zu senden"}.
-{"It is not allowed to send private messages to the conference","Es ist nicht erlaubt private Nachrichten an den Raum zu schicken"}.
+{"Jabber Account Registration","Jabber Konto Anmeldung"}.
 {"Jabber ID","Jabber ID"}.
-{"Jabber ID ~s is invalid","Jabber ID ~s ist ungültig"}.
+{"Jabber ID ~s is invalid","Die Jabber-ID ~s ist ungültig"}.
 {"January","Januar"}.
 {"Join IRC channel","IRC Channel beitreten"}.
-{"joins the room","kommt in den Raum"}.
+{"joins the room","betretet den Raum"}.
 {"Join the IRC channel here.","Hier den IRC Channel beitreten."}.
 {"Join the IRC channel in this Jabber ID: ~s","Den IRC Channel mit dieser Jabber ID beitreten: ~s"}.
 {"July","Juli"}.
 {"June","Juni"}.
-{"Last Activity","Letzte Aktion"}.
+{"Last Activity","Letzte Aktivität"}.
 {"Last login","Letzte Anmeldung"}.
 {"Last month","Letzter Monat"}.
 {"Last year","Letztes Jahr"}.
@@ -160,10 +163,10 @@
 {"List of modules to start","Liste der zu startenden Module"}.
 {"Low level update script","Low level Aktualisierungsscript"}.
 {"Make participants list public","Teilnehmerliste öffentlich machen"}.
-{"Make room captcha protected","Raum mit Verifizierung (Captcha) versehen"}.
+{"Make room CAPTCHA protected","Raum mit Verifizierung (Captcha) versehen"}.
 {"Make room members-only","Raum nur für Mitglieder zugänglich machen"}.
-{"Make room moderated","Raum modieriert machen"}.
-{"Make room password protected","Raum passwortgeschützt machen"}.
+{"Make room moderated","Raum moderiert machen"}.
+{"Make room password protected","Raum mit Passwort schützen"}.
 {"Make room persistent","Raum persistent machen"}.
 {"Make room public searchable","Raum öffentlich suchbar machen"}.
 {"March","März"}.
@@ -171,87 +174,86 @@
 {"Max # of items to persist","Maximale Anzahl dauerhaft zu speichernder Einträge"}.
 {"Max payload size in bytes","Maximale Nutzlastgrösse in Bytes"}.
 {"May","Mai"}.
-{"Membership is required to enter this room","Um diesen Raum zu betreten müssen sie Mitglied sein"}.
 {"Members:","Mitglieder:"}.
+{"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","Merken sie sich ihr Passwort, oder schreiben sie es auf einen Zettel den sie sicher verwahren. Bei Jabber gibt es keine automatische Möglichkeit, das Passwort wiederherzustellen."}.
 {"Memory","Speicher"}.
 {"Message body","Nachrichtentext"}.
 {"Middle Name","Zweiter Vorname"}.
-{"Moderator privileges required","Moderatorrechte benötigt"}.
+{"Minimum interval between voice requests (in seconds)","Mindestdauer zwischen Anfragen für Sprachrechte (in Sekunden)"}.
 {"moderators only","ausschliesslich Moderatoren"}.
 {"Modified modules","Geänderte Module"}.
 {"Module","Modul"}.
-{"Modules at ","Module bei "}.
 {"Modules","Module"}.
 {"Monday","Montag"}.
 {"Name:","Name:"}.
 {"Name","Vorname"}.
 {"Never","Nie"}.
-{"Nickname Registration at ","Registrieren des Spitznamens bei"}.
-{"Nickname ~s does not exist in the room","Spitzname ~s existiert im Raum nicht"}.
-{"Nickname","Spitzname"}.
+{"New Password:","Neues Passwort:"}.
+{"Nickname","Benutzername"}.
+{"Nickname Registration at ","Registrieren des Benutzernames auf"}.
+{"Nickname ~s does not exist in the room","Der Benutzername ~s existiert im Raum nicht"}.
+{"nobody","niemanden"}.
 {"No body provided for announce message","Kein Text für die Ankündigung angegeben"}.
 {"No Data","Keine Daten"}.
-{"Node ID","Knoten ID"}.
-{"Node ","Knoten "}.
+{"Node ID","Knoten-ID"}.
 {"Node not found","Knoten nicht gefunden"}.
 {"Nodes","Knoten"}.
 {"No limit","Keine Begrenzung"}.
 {"None","Keine"}.
 {"No resource provided","Keine Ressource angegeben"}.
-{"Not Found","nicht gefunden"}.
+{"Not Found","Nicht gefunden"}.
 {"Notify subscribers when items are removed from the node","Abonnenten benachrichtigen, wenn Einträge vom Knoten entfernt werden"}.
-{"Notify subscribers when the node configuration changes","Abonnenten benachrichtigen, wenn die Knotenkonfiguration sich ändert"}.
+{"Notify subscribers when the node configuration changes","Abonnenten benachrichtigen, wenn sich die Knotenkonfiguration ändert"}.
 {"Notify subscribers when the node is deleted","Abonnenten benachrichtigen, wenn der Knoten gelöscht wird"}.
 {"November","November"}.
 {"Number of occupants","Anzahl der Teilnehmer"}.
 {"Number of online users","Anzahl der angemeldeten Benutzer"}.
 {"Number of registered users","Anzahl der registrierten Benutzer"}.
 {"October","Oktober"}.
-{"Offline Messages:","Offline Nachrichten:"}.
-{"Offline Messages","Offline Nachrichten"}.
+{"Offline Messages:","Offline-Nachrichten:"}.
+{"Offline Messages","Offline-Nachrichten"}.
 {"OK","OK"}.
+{"Old Password:","Aktuelles Passwort:"}.
 {"Online","Angemeldet"}.
 {"Online Users:","Angemeldete Benutzer:"}.
 {"Online Users","Angemeldete Benutzer"}.
 {"Only deliver notifications to available users","Benachrichtigungen nur an verfügbare Benutzer schicken"}.
 {"Only moderators and participants are allowed to change the subject in this room","Nur Moderatoren und Mitglieder dürfen das Thema in diesem Raum ändern"}.
 {"Only moderators are allowed to change the subject in this room","Nur Moderatoren dürfen das Thema in diesem Raum ändern"}.
-{"Only occupants are allowed to send messages to the conference","Nur Teilnehmer dürfen Nachrichten an den Raum schicken"}.
-{"Only occupants are allowed to send queries to the conference","Nur Teilnehmer sind berechtig Anfragen an die Konferenz zu senden"}.
-{"Only service administrators are allowed to send service messages","Nur Service Administratoren sind berechtigt, Servicenachrichten zu senden"}.
 {"Options","Optionen"}.
-{"Organization Name","Firmenname"}.
+{"Organization Name","Organisation"}.
 {"Organization Unit","Abteilung"}.
-{"Outgoing s2s Connections:","Ausgehende s2s Verbindungen:"}.
-{"Outgoing s2s Connections","Ausgehende s2s Verbindungen"}.
-{"Outgoing s2s Servers:","Ausgehende s2s Server:"}.
-{"Owner privileges required","Besitzerrechte benötigt"}.
+{"Outgoing s2s Connections:","Ausgehende s2s-Verbindungen:"}.
+{"Outgoing s2s Connections","Ausgehende s2s-Verbindungen"}.
+{"Outgoing s2s Servers:","Ausgehende s2s-Server:"}.
 {"Packet","Paket"}.
 {"Password ~b","Passwort ~b"}.
 {"Password:","Passwort:"}.
 {"Password","Passwort"}.
+{"Password Verification:","Passwort bestätigen:"}.
 {"Password Verification","Passwort bestätigen"}.
 {"Path to Dir","Pfad zum Verzeichnis"}.
 {"Path to File","Pfad zur Datei"}.
-{"Pending","schwebend"}.
+{"Pending","anhängig"}.
 {"Period: ","Zeitraum: "}.
 {"Persist items to storage","Einträge dauerhaft speichern"}.
 {"Ping","Ping"}.
-{"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Beachten sie, das diese Optionen nur die eingebaute Mnesia Datenbank sichert. Wenn sie das ODBC Modul verwenden müssen sie die SQL Datenbank zusätzlich manuell sichern."}.
+{"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Beachten sie, das diese Optionen nur die eingebaute Mnesia-Datenbank sichern. Wenn sie das ODBC-Modul verwenden, müssen sie die SQL-Datenbank manuell sichern."}.
 {"Pong","Pong"}.
 {"Port ~b","Port ~b"}.
 {"Port","Port"}.
-{"Present real Jabber IDs to","Echte Jabber IDs anzeigen für"}.
+{"Present real Jabber IDs to","Echte Jabber-IDs anzeigen für"}.
 {"private, ","privat, "}.
 {"Protocol","Protokoll"}.
 {"Publish-Subscribe","Publish-Subscribe"}.
-{"PubSub subscriber request","PubSub Abonnenten Anfrage"}.
-{"Queries to the conference members are not allowed in this room","Anfragen an die Teilnehmer sind in diesem Raum nicht erlaubt"}.
-{"RAM and disc copy","RAM und Festplatten Kopie"}.
-{"RAM copy","RAM Kopie"}.
+{"PubSub subscriber request","PubSub-Abonnenten-Anfrage"}.
+{"Purge all items when the relevant publisher goes offline","Alle Einträge entfernen, wenn der relevante Veröffentlicher offline geht"}.
+{"RAM and disc copy","RAM und Festplatte"}.
+{"RAM copy","Nur RAM"}.
 {"Raw","Unformatiert"}.
-{"Really delete message of the day?","Wirklich die Nachricht des Tages löschen?"}.
-{"Recipient is not in the conference room","Der Empfänger ist nicht im Raum"}.
+{"Really delete message of the day?","Die Nachricht des Tages wirklich löschen?"}.
+{"Register a Jabber account","Jabber Konto registrieren"}.
+{"Register","Anmelden"}.
 {"Registered Users:","Registrierte Benutzer:"}.
 {"Registered Users","Registrierte Benutzer"}.
 {"Registration in mod_irc for ","Registrierung in mod_irc für "}.
@@ -264,12 +266,11 @@
 {"Restart","Neustart"}.
 {"Restart Service","Dienst neustarten"}.
 {"Restore Backup from File at ","Datenwiederherstellung aus der Datei "}.
-{"Restore binary backup after next ejabberd restart (requires less memory):","Stelle binäre Sicherung beim nächsten ejabberd Neustart wieder her (benötigt weniger Speicher):"}.
+{"Restore binary backup after next ejabberd restart (requires less memory):","Stelle binäre Sicherung beim nächsten ejabberd-Neustart wieder her (benötigt weniger Speicher):"}.
 {"Restore binary backup immediately:","Stelle binäre Sicherung sofort wieder her:"}.
 {"Restore plain text backup immediately:","Stelle Klartext-Sicherung sofort wieder her:"}.
 {"Restore","Wiederherstellung"}.
-{"Room Configuration","Raum Konfiguration"}.
-{"Room creation is denied by service policy","Anlegen des Raumes aufgrund der Dienstrichtlinien verweigert"}.
+{"Room Configuration","Raum-Konfiguration"}.
 {"Room description","Raum Beschreibung"}.
 {"Room Occupants","Teilnehmer in diesem Raum"}.
 {"Room title","Raumname"}.
@@ -277,11 +278,11 @@
 {"Roster","Kontaktliste"}.
 {"Roster of ","Kontaktliste von "}.
 {"Roster size","Kontaktlistengröße"}.
-{"RPC Call Error","RPC Abruf-Fehler"}.
+{"RPC Call Error","Fehler bei RPC-Aufruf"}.
 {"Running Nodes","Aktive Knoten"}.
-{"~s access rule configuration","~s Zugangsregel Konfiguration"}.
+{"~s access rule configuration","~s Zugangsregel-Konfiguration"}.
 {"Saturday","Samstag"}.
-{"Script check","Script Überprüfung"}.
+{"Script check","Script-Überprüfung"}.
 {"Search Results for ","Suchergebnisse für "}.
 {"Search users in ","Benutzer suchen in "}.
 {"Send announcement to all online users on all hosts","Sende Ankündigung an alle angemeldeten Benutzer auf allen Hosts"}.
@@ -290,82 +291,87 @@
 {"Send announcement to all users","Sende Ankündigung an alle Benutzer"}.
 {"September","September"}.
 {"Server ~b","Server ~b"}.
+{"Server:","Server:"}.
 {"Set message of the day and send to online users","Setze Nachricht des Tages und sende sie an alle angemeldeten Benutzer"}.
 {"Set message of the day on all hosts and send to online users","Setze Nachricht des Tages auf allen Hosts und sende sie an alle angemeldeten Benutzer"}.
 {"Shared Roster Groups","Gruppen der gemeinsamen Kontaktliste"}.
 {"Show Integral Table","Vollständige Tabelle anzeigen"}.
 {"Show Ordinary Table","Normale Tabelle anzeigen"}.
 {"Shut Down Service","Dienst herunterfahren"}.
-{"~s invites you to the room ~s","~s lädt sie in den Raum ~s ein"}.
+{"~s invites you to the room ~s","~s lädt Sie in den Raum ~s ein"}.
+{"Some Jabber clients can store your password in your computer. Use that feature only if you trust your computer is safe.","Einige Jabber Client Programme speichern ihr Passwort auf ihrem Computer. Verwenden sie diese Möglichkeit nur auf Computern, die sie als sicher einstufen."}.
 {"Specify the access model","Geben sie das Zugangsmodell an"}.
+{"Specify the event message type","Geben sie den Ereignis-Nachrichtentyp an"}.
 {"Specify the publisher model","Geben sie das Publikationsmodell an"}.
-{"~s's Offline Messages Queue","~s's Offline Nachrichten Warteschlange"}.
-{"Start","Anfang"}.
-{"Start Modules at ","Starte Module bei "}.
+{"~s's Offline Messages Queue","~s's Offline-Nachrichten-Warteschlange"}.
+{"Start Modules at ","Starte Module auf "}.
 {"Start Modules","Module starten"}.
+{"Start","Starten"}.
 {"Statistics of ~p","Statistiken von ~p"}.
 {"Statistics","Statistik"}.
-{"Stop Modules at ","Stoppe Module bei "}.
+{"Stop Modules at ","Stoppe Module auf "}.
 {"Stop Modules","Module stoppen"}.
 {"Stopped Nodes","Inaktive Knoten"}.
-{"Stop","Stop"}.
+{"Stop","Stoppen"}.
 {"Storage Type","Speichertyp"}.
 {"Store binary backup:","Speichere binäre Sicherung:"}.
 {"Store plain text backup:","Speichere Klartext-Sicherung:"}.
-{"Subject","Thema"}.
+{"Subject","Betreff"}.
 {"Submit","Senden"}.
 {"Submitted","Gesendet"}.
-{"Subscriber Address","Abonnenten Adresse"}.
+{"Subscriber Address","Abonnenten-Adresse"}.
 {"Subscription","Abonnement"}.
 {"Sunday","Sonntag"}.
-{"That nickname is already in use by another occupant","Dieser Spitzname wird bereits von einem Teilnehmer genutzt"}.
-{"That nickname is registered by another person","Dieser Spitzname wurde bereits von jemand anderem registriert"}.
-{"The captcha is valid.","Die Verifizierung ist gültig."}.
+{"The CAPTCHA is valid.","Die Verifizierung ist gültig."}.
 {"The collections with which a node is affiliated","Sammlungen, mit denen ein Knoten verknüpft ist"}.
-{"the password is","das Passwort ist"}.
-{"This participant is kicked from the room because he sent an error message","Dieser Teilnehmer wurde aus dem Raum gekickt, da er eine Fehlernachricht gesendet hat"}.
-{"This participant is kicked from the room because he sent an error message to another participant","Dieser Teilnehmer wurde aus dem Raum gekickt, da er eine Fehlernachricht an einen anderen Teilnehmer gesendet hat"}.
-{"This participant is kicked from the room because he sent an error presence","Dieser Teilnehmer wurde aus dem Raum gekickt, da er einen fehlerhaften Status gesendet hat"}.
+{"the password is","das Passwort lautet"}.
+{"The password of your Jabber account was successfully changed.","Das Passwort von ihrem Jabber Konto wurde geändert."}.
+{"There was an error changing the password: ","Es trat ein Fehler beim Ändern des Passworts auf:"}.
+{"There was an error creating the account: ","Es trat ein Fehler beim erstellen des Kontos auf:"}.
+{"There was an error deleting the account: ","Es trat ein Fehler beim Löschen des Kontos auf:"}.
+{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Groß/Klein-Schreibung spielt hierbei keine Rolle: macbeth ist gleich MacBeth und Macbeth."}.
+{"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Diese Seite erlaubt das anlegen eines Jabber Kontos auf diesem Jabber Server. Ihre JID (Jabber IDentifier) setzt sich folgend zusammen: benutzername@server. Bitte lesen sie die Hinweise genau durch, um die Felder korrekt auszufüllen."}.
+{"This page allows to unregister a Jabber account in this Jabber server.","Diese Seite erlaubt es, ein Jabber Konto von diesem Server zu entfernen."}.
 {"This room is not anonymous","Dieser Raum ist nicht anonym"}.
 {"Thursday","Donnerstag"}.
 {"Time delay","Zeitverzögerung"}.
 {"Time","Zeit"}.
+{"To","An"}.
 {"To ~s","An ~s"}.
-{"To","Zu"}.
-{"Traffic rate limit is exceeded","Datenratenlimit wurde überschritten"}.
-{"Transactions Aborted:","Vorgänge abgebrochen:"}.
-{"Transactions Committed:","Vorgänge durchgeführt:"}.
-{"Transactions Logged:","Vorgänge protokolliert:"}.
-{"Transactions Restarted:","Vorgänge neu gestartet:"}.
+{"Transactions Aborted:","Abgebrochene Transaktionen:"}.
+{"Transactions Committed:","Durchgeführte Transaktionen:"}.
+{"Transactions Logged:","Protokollierte Transaktionen:"}.
+{"Transactions Restarted:","Neu gestartete Transaktionen:"}.
 {"Tuesday","Dienstag"}.
-{"Unable to generate a captcha","Konnte Verifizierung nicht erstellen"}.
 {"Unauthorized","Nicht berechtigt"}.
+{"Unregister","Abmelden"}.
+{"Unregister a Jabber account","Jabber Konto entfernen"}.
 {"Update","Aktualisieren"}.
-{"Update ","Aktualisierung "}.
 {"Update message of the day (don't send)","Aktualisiere Nachricht des Tages (nicht senden)"}.
 {"Update message of the day on all hosts (don't send)","Aktualisiere Nachricht des Tages auf allen Hosts (nicht senden)"}.
 {"Update plan","Aktualisierungsplan"}.
 {"Update script","Aktualisierungsscript"}.
 {"Uptime:","Betriebszeit:"}.
 {"Use of STARTTLS required","Verwendung von STARTTLS erforderlich"}.
-{"User ","Benutzer "}.
 {"User","Benutzer"}.
-{"User Management","Benutzer Verwaltung"}.
-{"Users are not allowed to register accounts so quickly","Benutzer dürfen Konten nicht so schnell registrieren"}.
+{"User JID","Benutzer JID"}.
+{"User Management","Benutzerverwaltung"}.
+{"Username:","Benutzername:"}.
 {"Users","Benutzer"}.
 {"Users Last Activity","Letzte Benutzeraktivität"}.
 {"Validate","Validieren"}.
-{"vCard User Search","vCard Benutzer Suche"}.
-{"Visitors are not allowed to change their nicknames in this room","Besucher dürfen in diesem Raum ihren Spitznamen nicht ändern"}.
-{"Visitors are not allowed to send messages to all occupants","Besucher dürfen nicht an alle Teilnehmer Nachrichten verschicken"}.
+{"vCard User Search","vCard-Benutzer-Suche"}.
+{"Virtual Hosts","Virtuelle Hosts"}.
+{"Voice request","Anfrage für Sprachrechte"}.
 {"Wednesday","Mittwoch"}.
 {"When to send the last published item","Wann soll das letzte veröffentlichte Objekt gesendet werden"}.
 {"Whether to allow subscriptions","Ob Abonnements erlaubt sind"}.
-{"You have been banned from this room","Sie wurden aus diesem Raum verbannt"}.
-{"You must fill in field \"Nickname\" in the form","Sie müssen das Feld \"Spitzname\" ausfüllen"}.
-{"You need an x:data capable client to configure mod_irc settings","Sie benötigen einen Client, der x:data unterstützt, um die mod_irc Einstellungen zu konfigurieren"}.
+{"You can later change your password using a Jabber client.","Sie können das Passwort später mit einem Jabber Client Programm ändern."}.
+{"You need a client that supports x:data and CAPTCHA to register","Sie benötigen einen Client, der x:data und CAPTCHA unterstützt, um Ihren Benutzernamen zu registrieren"}.
+{"You need a client that supports x:data to register the nickname","Sie benötigen einen Client, der x:data unterstützt, um Ihren Benutzernamen zu registrieren"}.
+{"You need an x:data capable client to configure mod_irc settings","Sie benötigen einen Client, der x:data unterstützt, um die mod_irc-Einstellungen zu konfigurieren"}.
 {"You need an x:data capable client to configure room","Sie benötigen einen Client, der x:data unterstützt, um den Raum zu konfigurieren"}.
-{"You need an x:data capable client to register nickname","Sie benötigen einen Client, der x:data unterstützt, um Ihren Spitznamen zu registrieren"}.
-{"You need an x:data capable client to search","Sie benötigen einen Client, der x:data unterstützt, um suchen zu können"}.
-{"Your contact offline message queue is full. The message has been discarded.","Ihre offline Kontakt Warteschlange ist voll. Die Nachricht wurde verworfen."}.
+{"You need an x:data capable client to search","Sie benötigen einen Client, der x:data unterstützt, um die Suche verwenden zu können"}.
+{"Your Jabber account was successfully created.","Ihr Jabber Konto wurde erfolgreich erstellt."}.
+{"Your Jabber account was successfully deleted.","Ihr Jabber Konto wurde erfolgreich gelöscht."}.
 {"Your messages to ~s are being blocked. To unblock them, visit ~s","Ihre Nachrichten an ~s werden blockiert. Um dies zu ändern, besuchen sie ~s"}.
@@ -1,8 +1,8 @@
+%% -*- coding: latin-1 -*-
 {"Access Configuration","Διαμόρφωση Πρόσβασης"}.
 {"Access Control List Configuration","Διαχείριση στις Λίστες Ελέγχου Πρόσβασης"}.
 {"Access control lists","Λίστες Ελέγχου Πρόσβασης"}.
 {"Access Control Lists","Λίστες Ελέγχου Πρόσβασης"}.
-{"Access denied by service policy","Άρνηση πρόσβασης, λόγω τακτικής παροχής υπηρεσιών"}.
 {"Access rules","Κανόνες Πρόσβασης"}.
 {"Access Rules","Κανόνες Πρόσβασης"}.
 {"Action on user","Eνέργεια για το χρήστη"}.
@@ -11,7 +11,6 @@
 {"Add User","Προσθήκη Χρήστη"}.
 {"Administration of ","Διαχείριση του"}.
 {"Administration","Διαχείριση"}.
-{"Administrator privileges required","Aπαιτούνται προνόμια διαχειριστή"}.
 {"A friendly name for the node","Ένα φιλικό όνομα για τον κόμβο"}.
 {"All activity","Όλες οι δραστηριότητες"}.
 {"Allow this Jabber ID to subscribe to this pubsub node?","Επιτρέπετε σε αυτή την Jabber Ταυτότητα να εγγραφεί σε αυτό τον κόμβο Δημοσίευσης-Εγγραφής;"}.
@@ -20,22 +19,28 @@
 {"Allow users to send invites","Επιτρέψετε στους χρήστες να αποστέλλουν προσκλήσεις"}.
 {"Allow users to send private messages","Επιτρέψετε στους χρήστες να αποστέλλουν ιδιωτικά μηνύματα"}.
 {"Allow visitors to change nickname","Επιτρέψετε στους επισκέπτες να αλλάζου ψευδώνυμο"}.
+{"Allow visitors to send private messages to","Επιτρέψετε στους χρήστες να αποστέλλουν ιδιωτικά μηνύματα σε"}.
 {"Allow visitors to send status text in presence updates","Επιτρέψτε στους επισκέπτες να αποστέλλουν κατάσταση στις ενημερώσεις παρουσίας"}.
+{"Allow visitors to send voice requests","Επιτρέψτε στους επισκέπτες να στέλνουν αιτήματα φωνής"}.
 {"All Users","Όλοι οι χρήστες"}.
 {"Announcements","Ανακοινώσεις"}.
 {"anyone","οποιοσδήποτε"}.
-{"A password is required to enter this room","Απαιτείται κωδικός πρόσβασης για είσοδο σε αυτή την αίθουσα"}.
 {"April","Απρίλιος"}.
 {"August","Αύγουστος"}.
 {"Backup Management","Διαχείριση Αντιγράφου Ασφαλείας"}.
-{"Backup of ","Αντιγράφο Ασφαλείας του "}.
 {"Backup to File at ","Αποθήκευση Αντιγράφου Ασφαλείας σε Αρχείο στο "}.
 {"Backup","Αποθήκευση Αντιγράφου Ασφαλείας"}.
 {"Bad format","Ακατάλληλη μορφή"}.
 {"Birthday","Γενέθλια"}.
+{"CAPTCHA web page","Ιστοσελίδα CAPTCHA "}.
 {"Change Password","Αλλαγή κωδικού"}.
 {"Change User Password","Αλλαγή Κωδικού Πρόσβασης Χρήστη"}.
+{"Characters not allowed:","Χαρακτήρες δεν επιτρέπονται:"}.
 {"Chatroom configuration modified","Διαμόρφωση Αίθουσaς σύνεδριασης τροποποιηθηκε"}.
+{"Chatroom is created","Η αίθουσα σύνεδριασης  δημιουργήθηκε"}.
+{"Chatroom is destroyed","Η αίθουσα σύνεδριασης διαγράφηκε"}.
+{"Chatroom is started","Η αίθουσα σύνεδριασης έχει ξεκινήσει"}.
+{"Chatroom is stopped","Η αίθουσα σύνεδριασης έχει σταματήσει"}.
 {"Chatrooms","Αίθουσες σύνεδριασης"}.
 {"Choose a username and password to register with this server","Επιλέξτε ένα όνομα χρήστη και κωδικό πρόσβασης για να εγγραφείτε σε αυτό τον διακομιστή"}.
 {"Choose modules to stop","Επιλέξτε modules για να σταματήσουν"}.
@@ -43,14 +48,12 @@
 {"Choose whether to approve this entity's subscription.","Επιλέξτε αν θα εγκρίθεί η εγγραφή αυτής της οντότητας."}.
 {"City","Πόλη"}.
 {"Commands","Εντολές"}.
-{"Conference room does not exist","Αίθουσα σύνεδριασης δεν υπάρχει"}.
 {"Configuration of room ~s","Διαμόρφωση Αίθουσας σύνεδριασης ~s"}.
 {"Configuration","Διαμόρφωση"}.
 {"Connected Resources:","Συνδεδεμένοι Πόροι:"}.
 {"Connections parameters","Παράμετροι Συνδέσης"}.
 {"Country","Χώρα"}.
 {"CPU Time:","Ώρα CPU:"}.
-{"Database Tables at ","Πίνακες βάσης δεδομένων στο "}.
 {"Database Tables Configuration at ","Διαμόρφωση Πίνακων βάσης δεδομένων στο "}.
 {"Database","Βάση δεδομένων"}.
 {"December","Δεκέμβριος"}.
@@ -65,15 +68,16 @@
 {"Description:","Περιγραφή:"}.
 {"Disc only copy","Αντίγραφο μόνο σε δίσκο"}.
 {"Displayed Groups:","Εμφανίσμενες Ομάδες:"}.
+{"Don't tell your password to anybody, not even the administrators of the Jabber server.","Μην πείτε τον κωδικό πρόσβασής σας σε κανέναν, ακόμη και στους διαχειριστές του διακομιστή Jabber."}.
 {"Dump Backup to Text File at ","Αποθήκευση Αντιγράφου Ασφαλείας σε αρχείο κειμένου στο "}.
 {"Dump to Text File","Αποθήκευση σε αρχείο κειμένου"}.
 {"Edit Properties","Επεξεργασία ιδιοτήτων"}.
+{"Either approve or decline the voice request.","Είτε εγκρίνετε ή απορρίψτε το αίτημα φωνής."}.
 {"ejabberd IRC module","ejabberd IRC module"}.
 {"ejabberd MUC module","ejabberd MUC module"}.
 {"ejabberd Publish-Subscribe module","ejabberd module Δημοσίευσης-Εγγραφής"}.
 {"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 Bytestreams module"}.
 {"ejabberd vCard module","ejabberd vCard module"}.
-{"ejabberd virtual hosts","εικονικοί κεντρικοί υπολογιστές ejabberd"}.
 {"ejabberd Web Admin","ejabberd Web Admin"}.
 {"Elements","Στοιχεία"}.
 {"Email","Email"}.
@@ -92,6 +96,7 @@
 {"Erlang Jabber Server","Erlang Jabber Διακομιστής"}.
 {"Error","Σφάλμα"}.
 {"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Παράδειγμα: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
+{"Exclude Jabber IDs from CAPTCHA challenge","Εξαίρεση από τις ταυτότητες Jabber, ή CAPTCHA πρόκληση"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Εξαγωγή δεδομένων όλων των χρηστών του διακομιστή σε PIEFXIS αρχεία (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Εξαγωγή δεδομένων των χρηστών κεντρικού υπολογιστή σε PIEFXIS αρχεία (XEP-0227):"}.
 {"Family Name","Επώνυμο"}.
@@ -107,6 +112,7 @@
 {"Get User Last Login Time","Έκθεση Τελευταίας Ώρας Σύνδεσης Χρήστη"}.
 {"Get User Password","Έκθεση Κωδικού Πρόσβασης Χρήστη"}.
 {"Get User Statistics","Έκθεση Στατιστικών Χρήστη"}.
+{"Grant voice to this person?","Παραχώρηση φωνής σε αυτό το άτομο;"}.
 {"Groups","Ομάδες"}.
 {"Group ","Ομάδα"}.
 {"has been banned","έχει απαγορευθεί"}.
@@ -116,6 +122,7 @@
 {"has been kicked","αποβλήθηκε "}.
 {" has set the subject to: "," έχει θέσει το θέμα σε: "}.
 {"Host","Κεντρικός Υπολογιστής"}.
+{"If you don't see the CAPTCHA image here, visit the web page.","Εάν δεν βλέπετε την εικόνα CAPTCHA εδώ, επισκεφθείτε την ιστοσελίδα."}.
 {"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Εάν θέλετε να καθορίσετε διαφορετικές θύρες, κωδικούς πρόσβασης, κωδικοποιήσεις για IRC διακομιστές, εισάγετε πληροφορίες στη μορφή '{\"irc διακομιστής\", \"κωδικοποιήσεις\", θύρα, \"κωδικός πρόσβασης\"}'.  Προεπιλεγμενα αυτή η υπηρεσία χρησιμοποιεί \"~s\" κωδικοποιήση, θύρα ~p, κενό κωδικό πρόσβασης."}.
 {"Import Directory","Εισαγωγή κατάλογου αρχείων"}.
 {"Import File","Εισαγωγή αρχείων"}.
@@ -125,8 +132,6 @@
 {"Import users data from jabberd14 spool directory:","Εισαγωγή δεδομένων χρηστών από κατάλογο αρχείων σειράς jabberd14:"}.
 {"Import Users from Dir at ","Εισαγωγή χρηστών από κατάλογο αρχείων στο "}.
 {"Import Users From jabberd14 Spool Files","Εισαγωγή Χρηστών από αρχεία σειράς jabberd14"}.
-{"Improper message type","Ακατάλληλο είδος μηνύματος"}.
-{"Incorrect password","Εσφαλμένος κωδικός πρόσβασης"}.
 {"Invalid affiliation: ~s","Άκυρη υπαγωγή: ~s"}.
 {"Invalid role: ~s","Άκυρος ρόλο: ~s"}.
 {"IP addresses","Διευθύνσεις IP"}.
@@ -138,9 +143,7 @@
 {"IRC username","IRC όνομα χρήστη"}.
 {"IRC Username","IRC Όνομα χρήστη"}.
 {"is now known as","είναι τώρα γνωστή ως"}.
-{"It is not allowed to send private messages of type \"groupchat\"","Δεν επιτρέπεται να στείλει προσωπικά μηνύματα του τύπου \"groupchat\""}.
-{"It is not allowed to send private messages to the conference","Δεν επιτρέπεται να στείλει προσωπικά μηνύματα για τη διάσκεψη"}.
-{"It is not allowed to send private messages","Δεν επιτρέπεται η αποστολή προσωπικών μηνυμάτων"}.
+{"Jabber Account Registration","Εγγραφή λογαριασμού Jabber"}.
 {"Jabber ID ~s is invalid","Η Jabber Ταυτότητα ~s είναι άκυρη"}.
 {"Jabber ID","Ταυτότητα Jabber"}.
 {"January","Ιανουάριος"}.
@@ -160,7 +163,7 @@
 {"List of modules to start","Λίστα των Module για Εκκίνηση"}.
 {"Low level update script","Προγράμα ενημέρωσης χαμηλού επίπεδου "}.
 {"Make participants list public","Κάντε κοινό τον κατάλογο συμμετεχόντων"}.
-{"Make room captcha protected","Κάντε την αίθουσα CAPTCHA προστατεύονομενη"}.
+{"Make room CAPTCHA protected","Κάντε την αίθουσα CAPTCHA προστατεύονομενη"}.
 {"Make room members-only","Κάντε την αίθουσα μόνο για μέλη"}.
 {"Make room moderated","Κάντε την αίθουσα εποπτεύονομενη"}.
 {"Make room password protected","Κάντε την αίθουσα προστατεύομενη με κωδικό πρόσβασης"}.
@@ -171,30 +174,30 @@
 {"Max # of items to persist","Μέγιστος αριθμός μόνιμων στοιχείων"}.
 {"Max payload size in bytes","Μέγιστο μέγεθος φορτίου σε bytes"}.
 {"May","Μάιος"}.
-{"Membership is required to enter this room","Απαιτείται αίτηση συμετοχής για είσοδο σε αυτή την αίθουσα"}.
 {"Members:","Μέλη:"}.
+{"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","Απομνημονεύστε τον κωδικό πρόσβασής σας, ή γράψετε τον σε ένα χαρτί που είχε τοποθετηθεί σε ασφαλές μέρος. Στο Jabber δεν υπάρχει αυτοματοποιημένος τρόπος για να ανακτήσετε τον κωδικό σας αν τον ξεχάσετε."}.
 {"Memory","Μνήμη"}.
 {"Message body","Περιεχόμενο μηνυμάτως"}.
 {"Middle Name","Πατρώνυμο"}.
-{"Moderator privileges required","Aπαιτούνται προνόμια συντονιστή"}.
+{"Minimum interval between voice requests (in seconds)","Ελάχιστο χρονικό διάστημα μεταξύ αιτημάτων φωνής (σε δευτερόλεπτα)"}.
 {"moderators only","συντονιστές μόνο"}.
 {"Modified modules","Τροποποιημένα modules"}.
 {"Module","Module"}.
-{"Modules at ","Modules στο "}.
 {"Modules","Modules"}.
 {"Monday","Δευτέρα"}.
 {"Name:","Όνομα:"}.
 {"Name","Όνομα"}.
 {"Never","Ποτέ"}.
+{"New Password:","Νέος κωδικός πρόσβασης:"}.
 {"Nickname Registration at ","Εγγραφή με Ψευδώνυμο στο "}.
 {"Nickname ~s does not exist in the room","Ψευδώνυμο ~s δεν υπάρχει σε αυτή την αίθουσα"}.
 {"Nickname","Ψευδώνυμο"}.
 {"No body provided for announce message","Δεν προμηθεύτικε περιεχόμενο ανακοινώσης"}.
+{"nobody","κανείς"}.
 {"No Data","Κανένα στοιχείο"}.
 {"Node ID","Ταυτότητα Κόμβου"}.
 {"Node not found","Κόμβος δεν βρέθηκε"}.
 {"Nodes","Κόμβοι"}.
-{"Node ","Κόμβος"}.
 {"No limit","Χωρίς όριο"}.
 {"None","Κανένα"}.
 {"No resource provided","Δεν προμηθεύτικε πόρος"}.
@@ -210,24 +213,22 @@
 {"Offline Messages:","Χωρίς Σύνδεση Μηνύματα:"}.
 {"Offline Messages","Χωρίς Σύνδεση Μηνύματα"}.
 {"OK","Όλλα Καλά"}.
+{"Old Password:","Παλαιός κωδικός πρόσβασης:"}.
 {"Online Users:","Online Χρήστες:"}.
 {"Online Users","Συνδεμένοι χρήστες"}.
 {"Online","Συνδεδεμένο"}.
 {"Only deliver notifications to available users","Παράδωση κοινοποιήσεων μόνο σε διαθέσιμους χρήστες"}.
 {"Only moderators and participants are allowed to change the subject in this room","Μόνο οι συντονιστές και οι συμμετέχοντες μπορούν να αλλάξουν το θέμα αυτής της αίθουσας"}.
 {"Only moderators are allowed to change the subject in this room","Μόνο οι συντονιστές μπορούν να αλλάξουν το θέμα αυτής της αίθουσας"}.
-{"Only occupants are allowed to send messages to the conference","Μόνο οι συμμετέχωντες  μπορούν να στέλνουν μηνύματα στο συνέδριο"}.
-{"Only occupants are allowed to send queries to the conference","Μόνο οι συμετεχόντες  μπορούν να στείλουν ερωτήματα στη διάσκεψη"}.
-{"Only service administrators are allowed to send service messages","Μόνο οι διαχειριστές των υπηρεσιών επιτρέπεται να στείλουν υπηρεσιακά μηνύματα"}.
 {"Options","Επιλογές"}.
 {"Organization Name","Όνομα Οργανισμού"}.
 {"Organization Unit","Μονάδα Οργανισμού"}.
 {"Outgoing s2s Connections:","Εξερχόμενες S2S Συνδέσεις:"}.
 {"Outgoing s2s Connections","Εξερχόμενες S2S Συνδέσεις"}.
 {"Outgoing s2s Servers:","Εξερχόμενοι S2S διακομιστές:"}.
-{"Owner privileges required","Aπαιτούνται προνόμια ιδιοκτήτη"}.
 {"Packet","Πακέτο"}.
 {"Password ~b","Κωδικός πρόσβασης ~b"}.
+{"Password Verification:","Επαλήθευση κωδικού πρόσβασης:"}.
 {"Password Verification","Επαλήθευση κωδικού πρόσβασης"}.
 {"Password","Κωδικός Πρόσβασης"}.
 {"Password:","Κωδικός πρόσβασης:"}.
@@ -246,14 +247,15 @@
 {"Protocol","Πρωτόκολλο"}.
 {"Publish-Subscribe","Δημοσίευση-Εγγραφή"}.
 {"PubSub subscriber request","Αίτηση συνδρομητή Δημοσίευσης-Εγγραφής"}.
-{"Queries to the conference members are not allowed in this room","Ερωτήματα πρώς τα μέλη της διασκέψεως δεν επιτρέπονται σε αυτήν την αίθουσα"}.
+{"Purge all items when the relevant publisher goes offline","Διαγραφή όλων των στοιχείων όταν ο σχετικός εκδότης αποσυνδέεται"}.
 {"RAM and disc copy","Αντίγραφο μόνο σε RAM καί δίσκο"}.
 {"RAM copy","Αντίγραφο σε RAM"}.
 {"Raw","Ακατέργαστο"}.
 {"Really delete message of the day?","Πραγματικά να διαγράψετε το μήνυμα της ημέρας;"}.
-{"Recipient is not in the conference room","Παραλήπτης δεν είναι στην αίθουσα συνεδριάσεων"}.
+{"Register a Jabber account","Καταχωρήστε έναν λογαριασμό Jabber"}.
 {"Registered Users:","Εγγεγραμμένοι Χρήστες:"}.
 {"Registered Users","Εγγεγραμμένοι Χρήστες"}.
+{"Register","Καταχωρήστε"}.
 {"Registration in mod_irc for ","Εγγραφή στο mod_irc για "}.
 {"Remote copy","Απομεμακρυσμένο αντίγραφο"}.
 {"Remove All Offline Messages","Αφαίρεση Όλων των Χωρίς Σύνδεση Μηνύματων"}.
@@ -269,7 +271,6 @@
 {"Restore plain text backup immediately:","Επαναφορά αντιγράφου ασφαλείας από αρχείο κειμένου αμέσως:"}.
 {"Restore","Επαναφορά Αντιγράφου Ασφαλείας"}.
 {"Room Configuration","Διαμόρφωση Αίθουσας σύνεδριασης"}.
-{"Room creation is denied by service policy","Άρνηση δημιουργίας αίθουσας , λόγω τακτικής παροχής υπηρεσιών"}.
 {"Room description","Περιγραφή Αίθουσας"}.
 {"Room Occupants","Συμετεχόντες Αίθουσας σύνεδριασης"}.
 {"Room title","Τίτλος Αίθουσας "}.
@@ -290,6 +291,7 @@
 {"Send announcement to all users","Αποστολή ανακοίνωσης σε όλους τους χρήστες"}.
 {"September","Σεπτέμβριος"}.
 {"Server ~b","Διακομιστής  ~b"}.
+{"Server:","Διακομιστής:"}.
 {"Set message of the day and send to online users","Ορίστε μήνυμα ημέρας και αποστολή στους συνδεδεμένους χρήστες"}.
 {"Set message of the day on all hosts and send to online users","Ορίστε μήνυμα ημέρας και άμεση αποστολή στους συνδεδεμένους χρήστες σε όλους τους κεντρικούς υπολογιστές"}.
 {"Shared Roster Groups","Κοινές Ομάδες Καταλόγων Επαφών"}.
@@ -297,7 +299,9 @@
 {"Show Ordinary Table","Δείτε Κοινό Πίνακα"}.
 {"Shut Down Service","Κλείσιμο Υπηρεσίας"}.
 {"~s invites you to the room ~s","~s σας προσκαλεί στην αίθουσα ~s"}.
+{"Some Jabber clients can store your password in your computer. Use that feature only if you trust your computer is safe.","Μερικοί πελάτες Jabber μπορεί να αποθηκεύσουν τον κωδικό πρόσβασής σας στον υπολογιστή σας. Χρησιμοποιήστε αυτό το χαρακτηριστικό μόνο εάν εμπιστεύεστε την ασφάλεια του υπολογιστή σας."}.
 {"Specify the access model","Καθορίστε το μοντέλο πρόσβασης"}.
+{"Specify the event message type","Καθορίστε τον τύπο μηνύματος συμβάντος"}.
 {"Specify the publisher model","Καθορίστε το μοντέλο εκδότη"}.
 {"~s's Offline Messages Queue","Η Σειρά Χωρίς Σύνδεση Μηνύματων τού ~s"}.
 {"Start Modules at ","Εκκίνηση Modules στο "}.
@@ -318,54 +322,56 @@
 {"Subscriber Address","Διεύθυνση Συνδρομητή"}.
 {"Subscription","Συνδρομή"}.
 {"Sunday","Κυριακή"}.
-{"That nickname is already in use by another occupant","Αυτό το ψευδώνυμο είναι ήδη σε χρήση από άλλον συμμετέχων"}.
-{"That nickname is registered by another person","Αυτό το ψευδώνυμο είναι καταχωρημένο από άλλο πρόσωπο"}.
-{"The captcha is valid.","Το captcha είναι έγκυρο."}.
+{"The CAPTCHA is valid.","Το CAPTCHA είναι έγκυρο."}.
 {"The collections with which a node is affiliated","Οι συλλογές με την οποία είναι ένας κόμβος συνδέεται"}.
 {"the password is","ο κωδικός πρόσβασης είναι"}.
-{"This participant is kicked from the room because he sent an error message to another participant","Αυτός ο συμμετέχων αποβλήθηκε από την αίθουσα, επειδή έστειλε ένα μήνυμα σφάλματος σε άλλον συμμετέχων"}.
-{"This participant is kicked from the room because he sent an error message","Αυτός ο συμμετέχων αποβλήθηκε από την αίθουσα, επειδή έστειλε ένα μήνυμα σφάλματος"}.
-{"This participant is kicked from the room because he sent an error presence","Αυτός ο συμμετέχων αποβλήθηκε από την αίθουσα, επειδή έστειλε σφάλμα παρουσίας "}.
+{"The password of your Jabber account was successfully changed.","Ο κωδικός  πρόσβασης του Jabber λογαριασμού σας έχει αλλάξει επιτυχώς."}.
+{"There was an error changing the password: ","Υπήρξε ένα σφάλμα κατά την αλλαγή του κωδικού πρόσβασης:"}.
+{"There was an error creating the account: ","Υπήρξε ένα σφάλμα κατά τη δημιουργία του λογαριασμού:"}.
+{"There was an error deleting the account: ","Υπήρξε ένα σφάλμα κατά τη διαγραφή του λογαριασμού:"}.
+{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Ανεξαρτήτως με πεζά ή κεφαλαία: 'μιαλεξη' είναι το ίδιο με 'ΜιαΛέξη' και 'Μιαλέξη'."}.
+{"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Αυτή η σελίδα σας επιτρέπει να δημιουργήσετε ένα λογαριασμό Jabber σε αυτόν το διακομιστή Jabber. JID σας (Jabber Identifier) θα είναι της μορφής: όνομα_χρήστη@διακομιστής_Jabber. Παρακαλώ διαβάστε προσεκτικά τις οδηγίες για να συμπληρώσετε σωστά τα πεδία."}.
+{"This page allows to unregister a Jabber account in this Jabber server.","Η σελίδα αυτή δίνει τη δυνατότητα να καταργήσετε την καταχώρηση ενός λογαριασμό Jabber σε αυτόν το διακομιστή Jabber."}.
 {"This room is not anonymous","Η αίθουσα αυτή δεν είναι ανώνυμη"}.
 {"Thursday","Πέμπτη"}.
 {"Time delay","Χρόνος καθυστέρησης"}.
 {"Time","Χρόνος"}.
 {"To ~s","Πρώς ~s"}.
 {"To","Πρώς"}.
-{"Traffic rate limit is exceeded","Υπέρφορτωση"}.
 {"Transactions Aborted:","Αποτυχημένες συναλλαγές:"}.
 {"Transactions Committed:","Παραδοθείς συναλλαγές:"}.
 {"Transactions Logged:","Καταγραμμένες συναλλαγές:"}.
 {"Transactions Restarted:","Επανειλημμένες συναλλαγές:"}.
 {"Tuesday","Τρίτη"}.
-{"Unable to generate a captcha","Αδήνατο να δημιουργηθεί CAPTCHA"}.
 {"Unauthorized","Χορίς Εξουσιοδότηση"}.
+{"Unregister a Jabber account","Καταργήστε την εγγραφή ενός λογαριασμού Jabber"}.
+{"Unregister","Καταργήση εγγραφής"}.
 {"Update message of the day (don't send)","Ενημέρωση μηνύματως ημέρας (χωρίς άμεση αποστολή)"}.
 {"Update message of the day on all hosts (don't send)","Ενημέρωση μηνύματως ημέρας σε όλους τους κεντρικούς υπολογιστές (χωρίς άμεση αποστολή)"}.
 {"Update plan","Σχέδιο ενημέρωσης"}.
 {"Update script","Προγράμα ενημέρωσης"}.
-{"Update ","Ενημέρωση"}.
 {"Update","Ενημέρωση"}.
 {"Uptime:","Uptime:"}.
 {"Use of STARTTLS required","Απαιτείται χρήση STARTTLS "}.
+{"User JID","JID Χρήστη"}.
 {"User Management","Διαχείριση χρηστών"}.
-{"Users are not allowed to register accounts so quickly","Οι χρήστες δεν επιτρέπεται να εγγραφούν λογαριασμούς τόσο γρήγορα"}.
+{"Username:","Όνομα χρήστη"}.
 {"Users Last Activity","Τελευταία Δραστηριότητα Χρήστη"}.
 {"Users","Χρήστες"}.
-{"User ","Χρήστης"}.
 {"User","Χρήστης"}.
 {"Validate","Επαληθεύστε"}.
 {"vCard User Search","vCard Αναζήτηση χρηστών"}.
-{"Visitors are not allowed to change their nicknames in this room","Οι επισκέπτες δεν επιτρέπεται να αλλάξουν τα ψευδώνυμα τους σε αυτή την αίθουσα"}.
-{"Visitors are not allowed to send messages to all occupants","Οι επισκέπτες δεν επιτρέπεται να στείλουν μηνύματα σε όλους τους συμμετέχωντες"}.
+{"Virtual Hosts","εικονικοί κεντρικοί υπολογιστές"}.
+{"Voice request","Αίτημα φωνής"}.
 {"Wednesday","Τετάρτη"}.
 {"When to send the last published item","Πότε να αποσταλθεί το τελευταίο στοιχείο που δημοσιεύθηκε"}.
 {"Whether to allow subscriptions","Εάν επιτρέποντε συνδρομές"}.
-{"You have been banned from this room","Σας έχει απαγορευθεί η είσοδος σε αυτή την αίθουσα"}.
-{"You must fill in field \"Nickname\" in the form","Θα πρέπει να συμπληρώσετε το πεδίο \"Ψευδώνυμο\" στη φόρμα"}.
+{"You can later change your password using a Jabber client.","Μπορείτε αργότερα να αλλάξετε τον κωδικό πρόσβασής σας χρησιμοποιώντας έναν πελάτη Jabber."}.
+{"You need a client that supports x:data and CAPTCHA to register","Χρειάζεστε ένα x:data και CAPTCHA ικανό πελάτη για εγγραφή"}.
+{"You need a client that supports x:data to register the nickname","Χρειάζεστε ένα x:data ικανό πελάτη για εγγραφή με ψευδώνυμο"}.
 {"You need an x:data capable client to configure mod_irc settings","Χρειάζεστε ένα x:data ικανό πελάτη για να ρυθμίσετε το mod_irc"}.
 {"You need an x:data capable client to configure room","Χρειάζεστε ένα x:data ικανό πελάτη για να ρυθμίσετε την αίθουσα "}.
-{"You need an x:data capable client to register nickname","Χρειάζεστε ένα x:data ικανό πελάτη για να εγγράφή με ψευδώνυμο"}.
 {"You need an x:data capable client to search","Χρειάζεστε ένα  x:data ικανό πελάτη για αναζήτηση"}.
-{"Your contact offline message queue is full. The message has been discarded.","Η μνήμη χωρίς σύνδεση μήνυματών είναι πλήρης. Το μήνυμα έχει απορριφθεί."}.
+{"Your Jabber account was successfully created.","Ο Jabber λογαριασμός σας δημιουργήθηκε με επιτυχία."}.
+{"Your Jabber account was successfully deleted.","Ο Jabber λογαριασμός σας διαγράφηκε με επιτυχία."}.
 {"Your messages to ~s are being blocked. To unblock them, visit ~s","Τα μηνύματά σας πρως ~s είναι αποκλεισμένα. Για αποδεσμεύση, επισκεφθείτε ~s"}.
@@ -1,8 +1,8 @@
+%% -*- coding: latin-1 -*-
 {"Access Configuration","Agordo de atingo"}.
 {"Access Control List Configuration","Agordo de atingokontrolo"}.
 {"Access control lists","Atingokontrol-listoj"}.
 {"Access Control Lists","Atingokontrol-listoj"}.
-{"Access denied by service policy","Atingo rifuzita de serv-politiko"}.
 {"Access rules","Atingo-reguloj"}.
 {"Access Rules","Atingo-reguloj"}.
 {"Action on user","Ago je uzanto"}.
@@ -11,7 +11,6 @@
 {"Add User","Aldonu Uzanton"}.
 {"Administration","Administro"}.
 {"Administration of ","Mastrumado de "}.
-{"Administrator privileges required","Administrantaj rajtoj bezonata"}.
 {"A friendly name for the node","Kromnomo por ĉi tiu nodo"}.
 {"All activity","Ĉiu aktiveco"}.
 {"Allow this Jabber ID to subscribe to this pubsub node?","Ĉu permesi ĉi tiun Jabber ID aboni al la jena PubAbo-nodo"}.
@@ -20,22 +19,28 @@
 {"Allow users to send invites","Permesu uzantojn sendi invitojn"}.
 {"Allow users to send private messages","Permesu uzantojn sendi privatajn mesaĝojn"}.
 {"Allow visitors to change nickname","Permesu al vizitantoj ŝanĝi siajn kaŝnomojn"}.
+{"Allow visitors to send private messages to","Permesu uzantojn sendi privatajn mesaĝojn al"}.
 {"Allow visitors to send status text in presence updates","Permesu al vizitantoj sendi statmesaĝon en ĉeest-sciigoj"}.
+{"Allow visitors to send voice requests","Permesu uzantojn sendi voĉ-petojn"}.
 {"All Users","Ĉiuj Uzantoj"}.
 {"Announcements","Anoncoj"}.
 {"anyone","iu ajn"}.
-{"A password is required to enter this room","Pasvorto estas bezonata por eniri ĉi tiun babilejon"}.
 {"April","Aprilo"}.
 {"August","Aŭgusto"}.
 {"Backup","Faru Sekurkopion"}.
 {"Backup Management","Mastrumado de sekurkopioj"}.
-{"Backup of ","Sekurkopio de "}.
 {"Backup to File at ","Faru sekurkopion je "}.
 {"Bad format","Malĝusta formo"}.
 {"Birthday","Naskiĝtago"}.
+{"CAPTCHA web page","CAPTCHA teksaĵ-paĝo"}.
 {"Change Password","Ŝanĝu pasvorton"}.
 {"Change User Password","Ŝanĝu pasvorton de uzanto"}.
+{"Characters not allowed:","Karaktroj ne permesata:"}.
 {"Chatroom configuration modified","Agordo de babilejo ŝanĝita"}.
+{"Chatroom is created","Babilejo kreita"}.
+{"Chatroom is destroyed","Babilejo neniigita"}.
+{"Chatroom is started","Babilejo lanĉita"}.
+{"Chatroom is stopped","Babilejo haltita"}.
 {"Chatrooms","Babilejoj"}.
 {"Choose a username and password to register with this server","Elektu uzantnomon kaj pasvorton por registri je ĉi tiu servilo"}.
 {"Choose modules to stop","Elektu modulojn por fini"}.
@@ -43,7 +48,6 @@
 {"Choose whether to approve this entity's subscription.","Elektu ĉu permesi la abonon de ĉi tiu ento"}.
 {"City","Urbo"}.
 {"Commands","Ordonoj"}.
-{"Conference room does not exist","Babilejo ne ekzistas"}.
 {"Configuration","Agordo"}.
 {"Configuration of room ~s","Agordo de babilejo ~s"}.
 {"Connected Resources:","Konektataj risurcoj:"}.
@@ -51,7 +55,6 @@
 {"Country","Lando"}.
 {"CPU Time:","CPU-tempo"}.
 {"Database","Datumbazo"}.
-{"Database Tables at ","Datumbaz-tabeloj je "}.
 {"Database Tables Configuration at ","Agordo de datumbaz-tabeloj je "}.
 {"December","Decembro"}.
 {"Default users as participants","Kutime farigu uzantojn kiel partpoprenantoj"}.
@@ -65,15 +68,16 @@
 {"Description:","Priskribo:"}.
 {"Disc only copy","Nur disk-kopio"}.
 {"Displayed Groups:","Montrataj grupoj:"}.
+{"Don't tell your password to anybody, not even the administrators of the Jabber server.","Ne donu vian pasvorton al iun ajn, eĉ ne al la administrantoj de la Ĵabber-servilo."}.
 {"Dump Backup to Text File at ","Skribu sekurkopion en plata teksto al "}.
 {"Dump to Text File","Skribu en plata tekst-dosiero"}.
 {"Edit Properties","Redaktu atributojn"}.
+{"Either approve or decline the voice request.","Ĉu aprobu, aŭ malaprobu la voĉ-peton."}.
 {"ejabberd IRC module","ejabberd IRC-modulo"}.
 {"ejabberd MUC module","ejabberd MUC-modulo"}.
 {"ejabberd Publish-Subscribe module","ejabberd Public-Abonada modulo"}.
 {"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 Bajtfluo modulo"}.
 {"ejabberd vCard module","ejabberd vCard-modulo"}.
-{"ejabberd virtual hosts","ejabberd virtual-gastigoj"}.
 {"ejabberd Web Admin","ejabberd Teksaĵa Administro"}.
 {"Elements","Eroj"}.
 {"Email","Retpoŝto"}.
@@ -87,11 +91,11 @@
 {"Enter path to jabberd14 spool file","Enmetu vojon al jabberd14-uzantdosiero"}.
 {"Enter path to text file","Enmetu vojon al plata teksto"}.
 {"Enter the text you see","Enmetu montrita teksto"}.
-{"Enter username and encodings you wish to use for connecting to IRC servers.  Press 'Next' to get more fields to fill in.  Press 'Complete' to save settings.","Enmetu uzantnomon kaj enkodigoj kiujn vi volas uzi por konektoj al IRC-serviloj. Elektu \"Sekvonto\" por ekhavi pliajn kampojn. Elektu \"Kompletigu\" por savi agordojn."}.
 {"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Enmetu uzantnomon,j enkodigojn, pordojn kaj pasvortojn kiujn vi volas uzi por konektoj al IRC-serviloj"}.
 {"Erlang Jabber Server","Erlang-a Jabber-Servilo"}.
 {"Error","Eraro"}.
 {"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Ekzemplo: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"sekreto\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.iutestservilo.net\", \"utf-8\"}]."}.
+{"Exclude Jabber IDs from CAPTCHA challenge","Esceptu Ĵabber-identigilojn je CAPTCHA-defio"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Eksportu datumojn de ĉiuj uzantoj en servilo al PIEFXIS dosieroj (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Eksportu datumoj de uzantoj en gastigo al PIEFXIS dosieroj (XEP-0227):"}.
 {"Family Name","Lasta Nomo"}.
@@ -107,6 +111,7 @@
 {"Get User Last Login Time","Montru tempon de lasta ensaluto"}.
 {"Get User Password","Montru pasvorton de uzanto"}.
 {"Get User Statistics","Montru statistikojn de uzanto"}.
+{"Grant voice to this person?","Koncedu voĉon al ĉi-persono?"}.
 {"Group ","Grupo "}.
 {"Groups","Grupoj"}.
 {"has been banned","estas forbarita"}.
@@ -116,6 +121,7 @@
 {"has been kicked","estas forpelita"}.
 {" has set the subject to: "," ŝanĝis la temon al: "}.
 {"Host","Gastigo"}.
+{"If you don't see the CAPTCHA image here, visit the web page.","Se vi ne vidas la CAPTCHA-imagon jene, vizitu la teksaĵ-paĝon."}.
 {"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Se vi volas specifi diversajn pordojn, pasvortojn, enkodigojn por IRC-serviloj, kompletigu la jenan liston kun la formo '{\"irc-servilo\", \"enkodigo\", porto, \"pasvorto\"}'. Se ne specifita, ĉi tiu servilo uzas la enkodigo \"~s\", porto ~p, malplena pasvorto."}.
 {"Import Directory","Importu dosierujo"}.
 {"Import File","Importu dosieron"}.
@@ -125,8 +131,6 @@
 {"Import users data from jabberd14 spool directory:","Importu uzantojn de jabberd14-uzantdosieroj"}.
 {"Import Users from Dir at ","Importu uzantojn de dosierujo ĉe "}.
 {"Import Users From jabberd14 Spool Files","Importu uzantojn de jabberd14-uzantdosieroj"}.
-{"Improper message type","Malĝusta mesaĝo-tipo"}.
-{"Incorrect password","Nekorekta pasvorto"}.
 {"Invalid affiliation: ~s","Nevalida aparteneco: ~s"}.
 {"Invalid role: ~s","Nevalida rolo: ~s"}.
 {"IP addresses","IP-adresoj"}.
@@ -138,9 +142,7 @@
 {"IRC Username","IRC-kaŝnomo"}.
 {"IRC username","IRC-uzantnomo"}.
 {"is now known as","nun nomiĝas"}.
-{"It is not allowed to send private messages","Ne estas permesata sendi privatajn mesaĝojn"}.
-{"It is not allowed to send private messages of type \"groupchat\"","Malpermesas sendi mesaĝojn de tipo \"groupchat\""}.
-{"It is not allowed to send private messages to the conference","Nur partoprenantoj rajtas sendi privatajn mesaĝojn al la babilejo"}.
+{"Jabber Account Registration","Ĵabber-konto registrado"}.
 {"Jabber ID","Jabber ID"}.
 {"Jabber ID ~s is invalid","Jabber ID ~s estas nevalida"}.
 {"January","Januaro"}.
@@ -160,7 +162,7 @@
 {"List of modules to start","Listo de moduloj por starti"}.
 {"Low level update script","Bazanivela ĝisdatigo-skripto"}.
 {"Make participants list public","Farigu partoprento-liston publika"}.
-{"Make room captcha protected","Farigu babilejon protektata per aŭtomata Turingtesto"}.
+{"Make room CAPTCHA protected","Farigu babilejon protektata per CAPTCHA"}.
 {"Make room members-only","Farigu babilejon sole por membroj"}.
 {"Make room moderated","Farigu babilejon moderigata"}.
 {"Make room password protected","Farigu babilejon protektata per pasvorto"}.
@@ -171,28 +173,28 @@
 {"Max # of items to persist","Maksimuma kiomo de eroj en konservado"}.
 {"Max payload size in bytes","Maksimuma aĵo-grando je bajtoj"}.
 {"May","Majo"}.
-{"Membership is required to enter this room","Membreco estas bezonata por eniri ĉi tiun babilejon"}.
 {"Members:","Membroj:"}.
+{"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","Memoru vian pasvorton, aŭ skribu ĝin sur papero formetata je sekura loko. Je Ĵabber ne ekzistas aŭtomata metodo por reakiri vian pasvorton se vi forgesas ĝin."}.
 {"Memory","Memoro"}.
 {"Message body","Teksto de mesaĝo"}.
 {"Middle Name","Meza Nomo"}.
-{"Moderator privileges required","Moderantaj rajtoj bezonata"}.
+{"Minimum interval between voice requests (in seconds)","Minimuma intervalo inter voĉ-petoj (je sekundoj)"}.
 {"moderators only","moderantoj sole"}.
 {"Modified modules","Ĝisdatigitaj moduloj"}.
 {"Module","Modulo"}.
-{"Modules at ","Moduloj je "}.
 {"Modules","Moduloj"}.
 {"Monday","Lundo"}.
 {"Name:","Nomo:"}.
 {"Name","Nomo"}.
 {"Never","Neniam"}.
+{"New Password:","Nova Pasvorto:"}.
 {"Nickname","Kaŝnomo"}.
 {"Nickname Registration at ","Kaŝnomo-registrado je "}.
 {"Nickname ~s does not exist in the room","Kaŝnomo ~s ne ekzistas en la babilejo"}.
+{"nobody","neniu"}.
 {"No body provided for announce message","Neniu teksto donita por anonc-mesaĝo"}.
 {"No Data","Neniu datumo"}.
 {"Node ID","Nodo ID"}.
-{"Node ","Nodo "}.
 {"Node not found","Nodo ne trovita"}.
 {"Nodes","Nodoj"}.
 {"No limit","Neniu limigo"}.
@@ -210,26 +212,24 @@
 {"Offline Messages:","Liverontaj mesaĝoj"}.
 {"Offline Messages","Liverontaj mesaĝoj"}.
 {"OK","Bone"}.
+{"Old Password:","Malnova Pasvorto:"}.
 {"Online","Konektata"}.
 {"Online Users:","Konektataj uzantoj:"}.
 {"Online Users","Konektataj Uzantoj"}.
 {"Only deliver notifications to available users","Nur liveru sciigojn al konektataj uzantoj"}.
 {"Only moderators and participants are allowed to change the subject in this room","Nur moderigantoj kaj partoprenantoj rajtas ŝanĝi la temon en ĉi tiu babilejo"}.
 {"Only moderators are allowed to change the subject in this room","Nur moderigantoj rajtas ŝanĝi la temon en ĉi tiu babilejo"}.
-{"Only occupants are allowed to send messages to the conference","Nur partoprenantoj rajtas sendi mesaĝojn al la babilejo"}.
-{"Only occupants are allowed to send queries to the conference","Nur partoprenantoj rajtas sendi informmendojn al la babilejoj"}.
-{"Only service administrators are allowed to send service messages","Nur servo-administrantoj rajtas sendi serv-mesaĝojn"}.
 {"Options","Elektebloj"}.
 {"Organization Name","Organiz-nomo"}.
 {"Organization Unit","Organiz-parto"}.
 {"Outgoing s2s Connections:","Elirantaj s-al-s-konektoj:"}.
 {"Outgoing s2s Connections","Elirantaj s-al-s-konektoj"}.
 {"Outgoing s2s Servers:","Elirantaj s-al-s-serviloj"}.
-{"Owner privileges required","Mastraj rajtoj bezonata"}.
 {"Packet","Pakaĵo"}.
 {"Password ~b","Pasvorto ~b"}.
 {"Password:","Pasvorto:"}.
 {"Password","Pasvorto"}.
+{"Password Verification:","Pasvortkontrolo:"}.
 {"Password Verification","Pasvortkontrolo"}.
 {"Path to Dir","Vojo al dosierujo"}.
 {"Path to File","Voje de dosiero"}.
@@ -246,14 +246,15 @@
 {"Protocol","Protokolo"}.
 {"Publish-Subscribe","Public-Abonado"}.
 {"PubSub subscriber request","PubAbo abonpeto"}.
-{"Queries to the conference members are not allowed in this room","Malpermesas informmendoj al partoprenantoj en ĉi tiu babilejo"}.
+{"Purge all items when the relevant publisher goes offline","Forigu ĉiujn erojn kiam la rilata publikanto malkonektiĝas"}.
 {"RAM and disc copy","RAM- kaj disk-kopio"}.
 {"RAM copy","RAM-kopio"}.
 {"Raw","Kruda"}.
 {"Really delete message of the day?","Ĉu vere forigi mesaĝon de la tago?"}.
-{"Recipient is not in the conference room","Ricevanto ne ĉeestas en la babilejo "}.
+{"Register a Jabber account","Registru Ĵabber-konton"}.
 {"Registered Users:","Registritaj uzantoj:"}.
 {"Registered Users","Registritaj uzantoj"}.
+{"Register","Registru"}.
 {"Registration in mod_irc for ","Registraĵo en mod_irc de "}.
 {"Remote copy","Fora kopio"}.
 {"Remove All Offline Messages","Forigu ĉiujn liverontajn mesaĝojn"}.
@@ -269,7 +270,6 @@
 {"Restore plain text backup immediately:","Restaŭrigu sekurkopion el plata tekstdosiero tuj"}.
 {"Restore","Restaŭru"}.
 {"Room Configuration","Babilejo-agordo"}.
-{"Room creation is denied by service policy","Ĉi tiu serv-politiko ne permesas babilejo-kreadon"}.
 {"Room description","Babilejo-priskribo"}.
 {"Room Occupants","Nombro de ĉeestantoj"}.
 {"Room title","Babilejo-nomo"}.
@@ -290,6 +290,7 @@
 {"Send announcement to all users","Sendu anoncon al ĉiu uzanto"}.
 {"September","Septembro"}.
 {"Server ~b","Servilo ~b"}.
+{"Server:","Servilo:"}.
 {"Set message of the day and send to online users","Enmetu mesaĝon de la tago kaj sendu al konektataj uzantoj"}.
 {"Set message of the day on all hosts and send to online users","Enmetu mesaĝon de la tago je ĉiu gastigo kaj sendu al konektataj uzantoj"}.
 {"Shared Roster Groups","Komuna Kontaktlist-grupo"}.
@@ -297,7 +298,9 @@
 {"Show Ordinary Table","Montru ordinaran tabelon"}.
 {"Shut Down Service","Haltigu Servon"}.
 {"~s invites you to the room ~s","~s invitas vin al la babilejo ~s"}.
+{"Some Jabber clients can store your password in your computer. Use that feature only if you trust your computer is safe.","Kelkaj Ĵabber-klientoj povas memori vian pasvorton je via komputilo. Nur uzu tiun eblon se vi fidas ke via komputilo estas sekura."}.
 {"Specify the access model","Specifu atingo-modelon"}.
+{"Specify the event message type","Specifu tipo de event-mesaĝo"}.
 {"Specify the publisher model","Enmetu publikadan modelon"}.
 {"~s's Offline Messages Queue","Mesaĝo-atendovico de ~s"}.
 {"Start Modules at ","Startu modulojn je "}.
@@ -318,29 +321,30 @@
 {"Subscriber Address","Abonanta adreso"}.
 {"Subscription","Abono"}.
 {"Sunday","Dimanĉo"}.
-{"That nickname is already in use by another occupant","Tiu kaŝnomo jam estas uzata de alia partoprenanto"}.
-{"That nickname is registered by another person","Kaŝnomo estas registrita de alia persono"}.
-{"The captcha is valid.","La aŭtomata Turingtesto estas ĝusta"}.
+{"The CAPTCHA is valid.","La CAPTCHA ĝustas"}.
 {"The collections with which a node is affiliated","Aro kun kiu nodo estas filigita"}.
 {"the password is","la pasvorto estas"}.
-{"This participant is kicked from the room because he sent an error message","Ĉi tiu partoprenanta estas forpelata de la babilejo pro sendado de erar-mesaĝo"}.
-{"This participant is kicked from the room because he sent an error message to another participant","Ĉi tiu partoprenanto estas forpelata de la babilejo pro sendo de erar-mesaĝo al alia partoprenanto"}.
-{"This participant is kicked from the room because he sent an error presence","Ĉi tiu partoprenanto estas forpelata de la babilejo pro sendo de erar-ĉeesto"}.
+{"The password of your Jabber account was successfully changed.","La pasvorto de via Ĵabber-konto estas sukcese ŝanĝata."}.
+{"There was an error changing the password: ","Estis eraro dum ŝanĝi de la pasvortro:"}.
+{"There was an error creating the account: ","Estis eraro dum kreado de la konto:"}.
+{"There was an error deleting the account: ","Estis eraro dum forigado de la konto:"}.
+{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Uskleco ne signifas: macbeth estas la sama ol MacBeth kaj Macbeth."}.
+{"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Jena paĝo ebligas kreadon de Ĵabber-konto je ĉi-Ĵabber-servilo. Via JID (Ĵabber-IDentigilo) estos ĉi-tiel: uzantnomo@servilo. Bonvolu legu bone la instrukciojn por korekta enmetigo de la kampoj. "}.
+{"This page allows to unregister a Jabber account in this Jabber server.","Jena pagxo ebligas malregistri Jxabber-konton je ĉi-servilo."}.
 {"This room is not anonymous","Ĉi tiu babilejo ne estas anonima"}.
 {"Thursday","Ĵaŭdo"}.
 {"Time delay","Prokrasto"}.
 {"Time","Tempo"}.
 {"To","Ĝis"}.
 {"To ~s","Al ~s"}.
-{"Traffic rate limit is exceeded","Trafikrapida limigo superita"}.
 {"Transactions Aborted:","Transakcioj nuligitaj"}.
 {"Transactions Committed:","Transakcioj enmetitaj"}.
 {"Transactions Logged:","Transakcioj protokolitaj"}.
 {"Transactions Restarted:","Transakcioj restartitaj"}.
 {"Tuesday","Mardo"}.
-{"Unable to generate a captcha","Ne eblis krei aŭtomatas turingteston"}.
 {"Unauthorized","Nepermesita"}.
-{"Update ","Ĝisdatigu "}.
+{"Unregister a Jabber account","Malregistru Ĵabber-konton"}.
+{"Unregister","Malregistru"}.
 {"Update","Ĝisdatigu"}.
 {"Update message of the day (don't send)","Ŝanĝu mesaĝon de la tago (ne sendu)"}.
 {"Update message of the day on all hosts (don't send)","Ŝanĝu mesaĝon de la tago je ĉiu gastigo (ne sendu)"}.
@@ -348,24 +352,25 @@
 {"Update script","Ĝisdatigo-skripto"}.
 {"Uptime:","Daŭro de funkciado"}.
 {"Use of STARTTLS required","Uzo de STARTTLS bezonata"}.
+{"User JID","Uzant-JID"}.
 {"User Management","Uzanto-administrado"}.
-{"Users are not allowed to register accounts so quickly","Ne estas permesata al uzantoj registri tiel rapide"}.
+{"Username:","Uzantnomo"}.
 {"Users Last Activity","Lasta aktiveco de uzanto"}.
 {"Users","Uzantoj"}.
-{"User ","Uzanto "}.
 {"User","Uzanto"}.
 {"Validate","Validigu"}.
 {"vCard User Search","Serĉado de vizitkartoj"}.
-{"Visitors are not allowed to change their nicknames in this room","Ne estas permesata al vizitantoj ŝanĝi siajn kaŝnomojn en ĉi tiu ĉambro"}.
-{"Visitors are not allowed to send messages to all occupants","Vizitantoj ne rajtas sendi mesaĝojn al ĉiuj partoprenantoj"}.
+{"Virtual Hosts","Virtual-gastigoj"}.
+{"Voice request","Voĉ-peto"}.
 {"Wednesday","Merkredo"}.
 {"When to send the last published item","Kiam sendi la laste publicitan eron"}.
 {"Whether to allow subscriptions","Ĉu permesi aboni"}.
-{"You have been banned from this room","Vi estas malpermesata en ĉi tiu babilejo"}.
-{"You must fill in field \"Nickname\" in the form","Vi devas kompletigi la \"Kaŝnomo\" kampon"}.
+{"You can later change your password using a Jabber client.","Poste vi povas ŝanĝi vian pasvorton per Ĵabber-kliento."}.
+{"You need a client that supports x:data and CAPTCHA to register","Vi bezonas klienton subtenante x:data-funkcio kaj CAPTCHA por registri kaŝnomon"}.
+{"You need a client that supports x:data to register the nickname","Vi bezonas klienton subtenante x:data-funkcio por registri kaŝnomon"}.
 {"You need an x:data capable client to configure mod_irc settings","Vi bezonas klienton kun x:data-funkcio por agordi mod_irc"}.
 {"You need an x:data capable client to configure room","Vi bezonas klienton kun x:data-funkcio por agordi la babilejon"}.
-{"You need an x:data capable client to register nickname","Vi bezonas klienton kun x:data-funkcio por registri kaŝnomon"}.
 {"You need an x:data capable client to search","Vi bezonas klienton kun x:data-funkcio por serĉado"}.
-{"Your contact offline message queue is full. The message has been discarded.","Mesaĝo-atendovico de la senkonekta kontakto estas plena. La mesaĝo estas forĵetita"}.
+{"Your Jabber account was successfully created.","Via Ĵabber-konto estis sukcese kreata."}.
+{"Your Jabber account was successfully deleted.","Via Ĵabber-konto estas sukcese forigita."}.
 {"Your messages to ~s are being blocked. To unblock them, visit ~s","Viaj mesaĝoj al ~s estas blokata. Por malbloki ilin, iru al ~s"}.
@@ -1,8 +1,8 @@
+%% -*- coding: latin-1 -*-
 {"Access Configuration","Configuración de accesos"}.
 {"Access Control List Configuration","Configuración de la Lista de Control de Acceso"}.
 {"Access control lists","Listas de Control de Acceso"}.
 {"Access Control Lists","Listas de Control de Acceso"}.
-{"Access denied by service policy","Acceso denegado por la política del servicio"}.
 {"Access rules","Reglas de acceso"}.
 {"Access Rules","Reglas de Acceso"}.
 {"Action on user","Acción en el usuario"}.
@@ -11,31 +11,37 @@
 {"Add User","Añadir usuario"}.
 {"Administration","Administración"}.
 {"Administration of ","Administración de "}.
-{"Administrator privileges required","Se necesita privilegios de administrador"}.
 {"A friendly name for the node","Un nombre sencillo para el nodo"}.
 {"All activity","Toda la actividad"}.
-{"Allow this Jabber ID to subscribe to this pubsub node?","¿Deseas permitir a este JabberID que se subscriba a este nodo PubSub?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","¿Deseas permitir a este Jabber ID que se subscriba a este nodo PubSub?"}.
 {"Allow users to change the subject","Permitir a los usuarios cambiar el asunto"}.
 {"Allow users to query other users","Permitir a los usuarios consultar a otros usuarios"}.
 {"Allow users to send invites","Permitir a los usuarios enviar invitaciones"}.
 {"Allow users to send private messages","Permitir a los usuarios enviar mensajes privados"}.
 {"Allow visitors to change nickname","Permitir a los visitantes cambiarse el apodo"}.
+{"Allow visitors to send private messages to","Permitir a los visitantes enviar mensajes privados a"}.
 {"Allow visitors to send status text in presence updates","Permitir a los visitantes enviar texto de estado en las actualizaciones de presencia"}.
+{"Allow visitors to send voice requests","Permitir a los visitantes enviar peticiones de voz"}.
 {"All Users","Todos los usuarios"}.
 {"Announcements","Anuncios"}.
 {"anyone","cualquiera"}.
-{"A password is required to enter this room","Se necesita contraseña para entrar en esta sala"}.
 {"April","abril"}.
 {"August","agosto"}.
 {"Backup","Guardar copia de seguridad"}.
 {"Backup Management","Gestión de copia de seguridad"}.
-{"Backup of ","Copia de seguridad de "}.
+{"Backup of ~p","Copia de seguridad de ~p"}.
 {"Backup to File at ","Guardar copia de seguridad en fichero en "}.
 {"Bad format","Mal formato"}.
 {"Birthday","Cumpleaños"}.
+{"CAPTCHA web page","Página web de CAPTCHA"}.
 {"Change Password","Cambiar contraseña"}.
 {"Change User Password","Cambiar contraseña de usuario"}.
+{"Characters not allowed:","Caracteres no permitidos:"}.
 {"Chatroom configuration modified","Configuración de la sala modificada"}.
+{"Chatroom is created","Se ha creado la sala"}.
+{"Chatroom is destroyed","Se ha destruido la sala"}.
+{"Chatroom is started","Se ha iniciado la sala"}.
+{"Chatroom is stopped","Se ha detenido la sala"}.
 {"Chatrooms","Salas de charla"}.
 {"Choose a username and password to register with this server","Escoge un nombre de usuario y contraseña para registrarte en este servidor"}.
 {"Choose modules to stop","Selecciona módulos a detener"}.
@@ -43,7 +49,6 @@
 {"Choose whether to approve this entity's subscription.","Decidir si aprobar la subscripción de esta entidad."}.
 {"City","Ciudad"}.
 {"Commands","Comandos"}.
-{"Conference room does not exist","La sala de conferencias no existe"}.
 {"Configuration","Configuración"}.
 {"Configuration of room ~s","Configuración para la sala ~s"}.
 {"Connected Resources:","Recursos conectados:"}.
@@ -51,7 +56,7 @@
 {"Country","País"}.
 {"CPU Time:","Tiempo consumido de CPU:"}.
 {"Database","Base de datos"}.
-{"Database Tables at ","Tablas de la base de datos en "}.
+{"Database Tables at ~p","Tablas de la base de datos en ~p"}.
 {"Database Tables Configuration at ","Configuración de tablas de la base de datos en "}.
 {"December","diciembre"}.
 {"Default users as participants","Los usuarios son participantes por defecto"}.
@@ -65,15 +70,16 @@
 {"Description:","Descripción:"}.
 {"Disc only copy","Copia en disco solamente"}.
 {"Displayed Groups:","Mostrar grupos:"}.
+{"Don't tell your password to anybody, not even the administrators of the Jabber server.","No le digas tu contraseña a nadie, ni siquiera a los administradores del servidor Jabber."}.
 {"Dump Backup to Text File at ","Exporta copia de seguridad a fichero de texto en "}.
 {"Dump to Text File","Exportar a fichero de texto"}.
 {"Edit Properties","Editar propiedades"}.
+{"Either approve or decline the voice request.","Aprueba o rechaza la petición de voz."}.
 {"ejabberd IRC module","Módulo de IRC para ejabberd"}.
 {"ejabberd MUC module","Módulo de MUC para ejabberd"}.
 {"ejabberd Publish-Subscribe module","Módulo de Publicar-Subscribir de ejabberd"}.
 {"ejabberd SOCKS5 Bytestreams module","Módulo SOCKS5 Bytestreams para ejabberd"}.
 {"ejabberd vCard module","Módulo vCard para ejabberd"}.
-{"ejabberd virtual hosts","Dominios de ejabberd"}.
 {"ejabberd Web Admin","ejabberd Web Admin"}.
 {"Elements","Elementos"}.
 {"Email","correo"}.
@@ -92,6 +98,8 @@
 {"Erlang Jabber Server","Servidor Jabber en Erlang"}.
 {"Error","Error"}.
 {"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Ejemplo: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
+{"Exclude Jabber IDs from CAPTCHA challenge","Excluir Jabber IDs de las pruebas de CAPTCHA"}.
+{"Export all tables as SQL queries to a file:","Exportar todas las tablas a un fichero SQL:"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Exportar datos de todos los usuarios del servidor a ficheros PIEFXIS (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Exportar datos de los usuarios de un dominio a ficheros PIEFXIS (XEP-0227):"}.
 {"Family Name","Apellido"}.
@@ -107,6 +115,7 @@
 {"Get User Last Login Time","Ver fecha de la última conexión de usuario"}.
 {"Get User Password","Ver contraseña de usuario"}.
 {"Get User Statistics","Ver estadísticas de usuario"}.
+{"Grant voice to this person?","¿Conceder voz a esta persona?"}.
 {"Group ","Grupo "}.
 {"Groups","Grupos"}.
 {"has been banned","ha sido bloqueado"}.
@@ -116,6 +125,7 @@
 {"has been kicked","ha sido expulsado"}.
 {" has set the subject to: "," ha puesto el asunto: "}.
 {"Host","Dominio"}.
+{"If you don't see the CAPTCHA image here, visit the web page.","Si no ves la imagen CAPTCHA aquí, visita la página web."}.
 {"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Si quieres especificar distintos codificaciones de carácteres, contraseñas o puertos para cada servidor IRC rellena esta lista con valores en el formato '{\"servidor irc\", \"codificación\", \"puerto\", \"contrasela\"}'.  Este servicio usa por defecto la codificación \"~s\", puerto ~p, sin contraseña."}.
 {"Import Directory","Importar directorio"}.
 {"Import File","Importar fichero"}.
@@ -125,8 +135,6 @@
 {"Import users data from jabberd14 spool directory:","Importar usuarios del directorio spool de jabberd14:"}.
 {"Import Users from Dir at ","Importar usuarios desde el directorio en "}.
 {"Import Users From jabberd14 Spool Files","Importar usuarios de ficheros spool de jabberd-1.4"}.
-{"Improper message type","Tipo de mensaje incorrecto"}.
-{"Incorrect password","Contraseña incorrecta"}.
 {"Invalid affiliation: ~s","Afiliación no válida: ~s"}.
 {"Invalid role: ~s","Rol no válido: ~s"}.
 {"IP addresses","Direcciones IP"}.
@@ -138,9 +146,7 @@
 {"IRC username","Nombre de usuario en IRC"}.
 {"IRC Username","Nombre de usuario en IRC"}.
 {"is now known as","se cambia el nombre a"}.
-{"It is not allowed to send private messages","No está permitido enviar mensajes privados"}.
-{"It is not allowed to send private messages of type \"groupchat\"","No está permitido enviar mensajes privados del tipo \"groupchat\""}.
-{"It is not allowed to send private messages to the conference","Impedir el envio de mensajes privados a la sala"}.
+{"Jabber Account Registration","Registro de Cuenta Jabber"}.
 {"Jabber ID","Jabber ID"}.
 {"Jabber ID ~s is invalid","El Jabber ID ~s no es válido"}.
 {"January","enero"}.
@@ -160,7 +166,7 @@
 {"List of modules to start","Lista de módulos a iniciar"}.
 {"Low level update script","Script de actualización a bajo nivel"}.
 {"Make participants list public","La lista de participantes es pública"}.
-{"Make room captcha protected","Proteger la sala con captcha"}.
+{"Make room CAPTCHA protected","Proteger la sala con CAPTCHA"}.
 {"Make room members-only","Sala sólo para miembros"}.
 {"Make room moderated","Sala moderada"}.
 {"Make room password protected","Proteger la sala con contraseña"}.
@@ -171,29 +177,31 @@
 {"Max # of items to persist","Máximo # de elementos que persisten"}.
 {"Max payload size in bytes","Máximo tamaño del contenido en bytes"}.
 {"May","mayo"}.
-{"Membership is required to enter this room","Necesitas ser miembro de esta sala para poder entrar"}.
 {"Members:","Miembros:"}.
+{"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","Memoriza tu contraseña, o apúntala en un papel en un lugar seguro. En Jabber no hay un método automatizado para recuperar la contraseña si la olvidas."}.
 {"Memory","Memoria"}.
 {"Message body","Cuerpo del mensaje"}.
 {"Middle Name","Segundo nombre"}.
-{"Moderator privileges required","Se necesita privilegios de moderador"}.
+{"Minimum interval between voice requests (in seconds)","Intervalo mínimo entre peticiones de voz (en segundos)"}.
 {"moderators only","solo moderadores"}.
 {"Modified modules","Módulos modificados"}.
 {"Module","Módulo"}.
-{"Modules at ","Módulos en "}.
+{"Modules at ~p","Módulos en ~p"}.
 {"Modules","Módulos"}.
 {"Monday","lunes"}.
 {"Name:","Nombre:"}.
 {"Name","Nombre"}.
 {"Never","Nunca"}.
+{"New Password:","Nueva contraseña:"}.
 {"Nickname","Apodo"}.
 {"Nickname Registration at ","Registro del apodo en "}.
 {"Nickname ~s does not exist in the room","El apodo ~s no existe en la sala"}.
+{"nobody","nadie"}.
 {"No body provided for announce message","No se ha proporcionado cuerpo de mensaje para el anuncio"}.
 {"No Data","Sin datos"}.
 {"Node ID","Nodo ID"}.
-{"Node ","Nodo "}.
 {"Node not found","Nodo no encontrado"}.
+{"Node ~p","Nodo ~p"}.
 {"Nodes","Nodos"}.
 {"No limit","Sin límite"}.
 {"None","Ninguno"}.
@@ -210,26 +218,24 @@
 {"Offline Messages:","Mensajes diferidos:"}.
 {"Offline Messages","Mensajes diferidos"}.
 {"OK","Aceptar"}.
+{"Old Password:","Contraseña antigua:"}.
 {"Online","Conectado"}.
 {"Online Users:","Usuarios conectados:"}.
 {"Online Users","Usuarios conectados"}.
 {"Only deliver notifications to available users","Solo enviar notificaciones a los usuarios disponibles"}.
 {"Only moderators and participants are allowed to change the subject in this room","Solo los moderadores y participantes pueden cambiar el asunto de esta sala"}.
 {"Only moderators are allowed to change the subject in this room","Solo los moderadores pueden cambiar el asunto de esta sala"}.
-{"Only occupants are allowed to send messages to the conference","Solo los ocupantes pueden enviar mensajes a la sala"}.
-{"Only occupants are allowed to send queries to the conference","Solo los ocupantes pueden enviar solicitudes a la sala"}.
-{"Only service administrators are allowed to send service messages","Solo los administradores del servicio tienen permiso para enviar mensajes de servicio"}.
 {"Options","Opciones"}.
 {"Organization Name","Nombre de la organización"}.
 {"Organization Unit","Unidad de la organización"}.
 {"Outgoing s2s Connections:","Conexiones S2S salientes:"}.
 {"Outgoing s2s Connections","Conexiones S2S salientes"}.
 {"Outgoing s2s Servers:","Servidores S2S salientes:"}.
-{"Owner privileges required","Se requieren privilegios de propietario de la sala"}.
 {"Packet","Paquete"}.
 {"Password ~b","Contraseña ~b"}.
 {"Password:","Contraseña:"}.
 {"Password","Contraseña"}.
+{"Password Verification:","Verificación de la contraseña:"}.
 {"Password Verification","Verificación de la contraseña"}.
 {"Path to Dir","Ruta al directorio"}.
 {"Path to File","Ruta al fichero"}.
@@ -246,14 +252,15 @@
 {"Protocol","Protocolo"}.
 {"Publish-Subscribe","Servicio de Publicar-Subscribir"}.
 {"PubSub subscriber request","Petición de subscriptor de PubSub"}.
-{"Queries to the conference members are not allowed in this room","En esta sala no se permiten solicitudes a los miembros de la sala"}.
+{"Purge all items when the relevant publisher goes offline","Borra todos los elementos cuando el publicador relevante se desconecta"}.
 {"RAM and disc copy","Copia en RAM y disco"}.
 {"RAM copy","Copia en RAM"}.
 {"Raw","Crudo"}.
 {"Really delete message of the day?","¿Está seguro de quere borrar el mensaje del dia?"}.
-{"Recipient is not in the conference room","El receptor no está en la sala de conferencia"}.
+{"Register a Jabber account","Registrar una cuenta Jabber"}.
 {"Registered Users:","Usuarios registrados:"}.
 {"Registered Users","Usuarios registrados"}.
+{"Register","Registrar"}.
 {"Registration in mod_irc for ","Registro en mod_irc para"}.
 {"Remote copy","Copia remota"}.
 {"Remove All Offline Messages","Borrar todos los mensajes diferidos"}.
@@ -269,7 +276,6 @@
 {"Restore plain text backup immediately:","Restaurar copias de seguridad de texto plano inmediatamente:"}.
 {"Restore","Restaurar"}.
 {"Room Configuration","Configuración de la sala"}.
-{"Room creation is denied by service policy","Se te ha denegado crear la sala por política del servicio"}.
 {"Room description","Descripción de la sala"}.
 {"Room Occupants","Ocupantes de la sala"}.
 {"Room title","Título de la sala"}.
@@ -290,6 +296,7 @@
 {"Send announcement to all users on all hosts","Enviar anuncio a todos los usuarios en todos los dominios"}.
 {"September","septiembre"}.
 {"Server ~b","Servidor ~b"}.
+{"Server:","Servidor:"}.
 {"Set message of the day and send to online users","Poner mensaje del dia y enviar a todos los usuarios conectados"}.
 {"Set message of the day on all hosts and send to online users","Poner mensaje del día en todos los dominios y enviar a los usuarios conectados"}.
 {"Shared Roster Groups","Grupos Compartidos"}.
@@ -297,7 +304,9 @@
 {"Show Ordinary Table","Mostrar Tabla Ordinaria"}.
 {"Shut Down Service","Detener el servicio"}.
 {"~s invites you to the room ~s","~s te invita a la sala ~s"}.
+{"Some Jabber clients can store your password in your computer. Use that feature only if you trust your computer is safe.","Algunos clientes Jabber pueden recordar tu contraseña en la máquina. Usa esa opción solo si confías en que la máquina que usas es segura."}.
 {"Specify the access model","Especifica el modelo de acceso"}.
+{"Specify the event message type","Especifica el tipo del mensaje de evento"}.
 {"Specify the publisher model","Especificar el modelo del publicante"}.
 {"~s's Offline Messages Queue","Cola de mensajes diferidos de ~s"}.
 {"Start","Iniciar"}.
@@ -318,54 +327,61 @@
 {"Subscriber Address","Dirección del subscriptor"}.
 {"Subscription","Subscripción"}.
 {"Sunday","domingo"}.
-{"That nickname is already in use by another occupant","Ese apodo ya está siendo usado por otro ocupante"}.
-{"That nickname is registered by another person","El apodo ya está registrado por otra persona"}.
-{"The captcha is valid.","El captcha es válido."}.
+{"The CAPTCHA is valid.","El CAPTCHA es válido."}.
 {"The collections with which a node is affiliated","Las colecciones a las que un nodo está afiliado"}.
 {"the password is","la contraseña es"}.
-{"This participant is kicked from the room because he sent an error message","Este participante ha sido expulsado de la sala porque envió un mensaje de error"}.
-{"This participant is kicked from the room because he sent an error message to another participant","Este participante ha sido expulsado de la sala porque envió un mensaje de error a otro participante"}.
-{"This participant is kicked from the room because he sent an error presence","Este participante ha sido expulsado de la sala porque envió una presencia de error"}.
+{"The password of your Jabber account was successfully changed.","La contraseña de tu cuenta Jabber se ha cambiado correctamente."}.
+{"There was an error changing the password: ","Hubo un error cambiando la contraseña."}.
+{"There was an error creating the account: ","Hubo uno error al crear la cuenta:"}.
+{"There was an error deleting the account: ","Hubo un error borrando la cuenta."}.
+{"This IP address is blacklisted in ~s","Esta dirección IP está en la lista negra en ~s"}.
+{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","No importa si usas mayúsculas: macbeth es lo mismo que MacBeth y Macbeth."}.
+{"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Esta página te permite crear una cuenta Jabber este servidor Jabber. Tu JID (Jabber IDentificador) será de la forma: nombredeusuario@servidor. Por favor lee detenidamente las instrucciones para rellenar correctamente los campos."}.
+{"This page allows to unregister a Jabber account in this Jabber server.","Esta página te permite borrar tu cuenta Jabber en este servidor Jabber."}.
 {"This room is not anonymous","Sala no anónima"}.
 {"Thursday","jueves"}.
 {"Time delay","Retraso temporal"}.
 {"Time","Fecha"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Demasiadas (~p) autenticaciones fallidas de esta dirección IP (~s). La dirección será desbloqueada en ~s UTC"}.
+{"Too many unacked stanzas","Demasiados mensajes sin haber reconocido  recibirlos"}.
 {"To","Para"}.
 {"To ~s","A ~s"}.
-{"Traffic rate limit is exceeded","Se ha exedido el límite de tráfico"}.
 {"Transactions Aborted:","Transacciones abortadas:"}.
 {"Transactions Committed:","Transacciones finalizadas:"}.
 {"Transactions Logged:","Transacciones registradas:"}.
 {"Transactions Restarted:","Transacciones reiniciadas:"}.
 {"Tuesday","martes"}.
-{"Unable to generate a captcha","No se pudo generar un captcha."}.
 {"Unauthorized","No autorizado"}.
-{"Update ","Actualizar "}.
+{"Unregister a Jabber account","Borrar una cuenta Jabber"}.
+{"Unregister","Borrar"}.
 {"Update","Actualizar"}.
 {"Update message of the day (don't send)","Actualizar mensaje del dia, pero no enviarlo"}.
 {"Update message of the day on all hosts (don't send)","Actualizar el mensaje del día en todos los dominos (pero no enviarlo)"}.
+{"Update ~p","Actualizar ~p"}.
 {"Update plan","Plan de actualización"}.
 {"Update script","Script de actualización"}.
 {"Uptime:","Tiempo desde el inicio:"}.
 {"Use of STARTTLS required","Es obligatorio usar STARTTLS"}.
+{"User JID","Jabber ID del usuario"}.
 {"User Management","Administración de usuarios"}.
-{"Users are not allowed to register accounts so quickly","Los usuarios no tienen permitido crear cuentas con tanta rapidez"}.
+{"Username:","Nombre de usuario:"}.
 {"Users Last Activity","Última actividad de los usuarios"}.
+{"User ~s","Usuario ~s"}.
 {"Users","Usuarios"}.
-{"User ","Usuario "}.
 {"User","Usuario"}.
 {"Validate","Validar"}.
 {"vCard User Search","Buscar vCard de usuario"}.
-{"Visitors are not allowed to change their nicknames in this room","Los visitantes no tienen permitido cambiar sus apodos en esta sala"}.
-{"Visitors are not allowed to send messages to all occupants","Los visitantes no pueden enviar mensajes a todos los ocupantes"}.
+{"Virtual Hosts","Dominios Virtuales"}.
+{"Voice request","Petición de voz"}.
 {"Wednesday","miércoles"}.
 {"When to send the last published item","Cuando enviar el último elemento publicado"}.
 {"Whether to allow subscriptions","Permitir subscripciones"}.
-{"You have been banned from this room","Has sido bloqueado en esta sala"}.
-{"You must fill in field \"Nickname\" in the form","Debes rellenar el campo \"Apodo\" en el formulario"}.
+{"You can later change your password using a Jabber client.","Puedes cambiar tu contraseña después, usando un cliente Jabber."}.
+{"You need a client that supports x:data and CAPTCHA to register","Necesitas un cliente con soporte de x:data y CAPTCHA para registrarte"}.
+{"You need a client that supports x:data to register the nickname","Necesitas un cliente con soporte de x:data para poder registrar el apodo"}.
 {"You need an x:data capable client to configure mod_irc settings","Necesitas un cliente con soporte de x:data para configurar las opciones de mod_irc"}.
 {"You need an x:data capable client to configure room","Necesitas un cliente con soporte de x:data para configurar la sala"}.
-{"You need an x:data capable client to register nickname","Necesitas un cliente con soporte de x:data para poder registrar el apodo"}.
 {"You need an x:data capable client to search","Necesitas un cliente con soporte de x:data para poder buscar"}.
-{"Your contact offline message queue is full. The message has been discarded.","Tu cola de mensajes diferidos de contactos está llena. El mensaje se ha descartado."}.
+{"Your Jabber account was successfully created.","Tu cuenta Jabber se ha creado correctamente."}.
+{"Your Jabber account was successfully deleted.","Tu cuenta Jabber se ha borrado correctamente."}.
 {"Your messages to ~s are being blocked. To unblock them, visit ~s","Tus mensajes a ~s están siendo bloqueados. Para desbloquearlos, visita ~s"}.
@@ -1,8 +1,8 @@
+%% -*- coding: latin-1 -*-
 {"Access Configuration","Configuration d'accès"}.
 {"Access Control List Configuration","Configuration des droits (ACL)"}.
 {"Access control lists","Droits (ACL)"}.
 {"Access Control Lists","Droits (ACL)"}.
-{"Access denied by service policy","L'accès au service est refusé"}.
 {"Access rules","Règles d'accès"}.
 {"Access Rules","Règles d'accès"}.
 {"Action on user","Action sur l'utilisateur"}.
@@ -11,7 +11,6 @@
 {"Add User","Ajouter un utilisateur"}.
 {"Administration","Administration"}.
 {"Administration of ","Administration de "}.
-{"Administrator privileges required","Les droits d'administrateur sont nécessaires"}.
 {"A friendly name for the node","Un nom convivial pour le noeud"}.
 {"All activity","Toute activité"}.
 {"Allow this Jabber ID to subscribe to this pubsub node?","Autoriser ce Jabber ID à s'abonner à ce nœud PubSub"}.
@@ -24,18 +23,22 @@
 {"All Users","Tous les utilisateurs"}.
 {"Announcements","Annonces"}.
 {"anyone","tout le monde"}.
-{"A password is required to enter this room","Un mot de passe est nécessaire pour accèder à ce salon"}.
 {"April","Avril"}.
 {"August","Août"}.
 {"Backup Management","Gestion des sauvegardes"}.
-{"Backup of ","Sauvegarde de "}.
 {"Backup","Sauvegarde"}.
 {"Backup to File at ","Sauvegarde sur fichier sur "}.
 {"Bad format","Mauvais format"}.
 {"Birthday","Date d'anniversaire"}.
+{"CAPTCHA web page","Page web de CAPTCHA"}.
 {"Change Password","Modifier le mot de passe"}.
 {"Change User Password","Changer le mot de passe de l'utilisateur"}.
+{"Characters not allowed:","Caractères non-autorisés :"}.
 {"Chatroom configuration modified","Configuration du salon modifiée"}.
+{"Chatroom is created","Le salon de discussion est créé"}.
+{"Chatroom is destroyed","Le salon de discussion est détruit"}.
+{"Chatroom is started","Le salon de discussion a démarré"}.
+{"Chatroom is stopped","Le salon de discussion est stoppé"}.
 {"Chatrooms","Salons de discussion"}.
 {"Choose a username and password to register with this server","Choisissez un nom d'utilisateur et un mot de passe pour s'enregistrer sur ce serveur"}.
 {"Choose modules to stop","Sélectionnez les modules à arrêter"}.
@@ -43,7 +46,6 @@
 {"Choose whether to approve this entity's subscription.","Accepter cet abonnement ?"}.
 {"City","Ville"}.
 {"Commands","Commandes"}.
-{"Conference room does not exist","La salle de conférence n'existe pas"}.
 {"Configuration","Configuration"}.
 {"Configuration of room ~s","Configuration pour le salon ~s"}.
 {"Connected Resources:","Ressources connectées:"}.
@@ -51,7 +53,6 @@
 {"Country","Pays"}.
 {"CPU Time:","Temps CPU :"}.
 {"Database","Base de données"}.
-{"Database Tables at ","Tables de base de données sur "}.
 {"Database Tables Configuration at ","Configuration des tables de base de données sur "}.
 {"December","Décembre"}.
 {"Default users as participants","Les utilisateurs sont par défaut participant"}.
@@ -65,6 +66,7 @@
 {"Description:","Description :"}.
 {"Disc only copy","Copie sur disque uniquement"}.
 {"Displayed Groups:","Groupes affichés :"}.
+{"Don't tell your password to anybody, not even the administrators of the Jabber server.","Ne révélez votre mot de passe à personne, pas même l'administrateur de ce serveur."}.
 {"Dump Backup to Text File at ","Enregistrer la sauvegarde dans un fichier texte sur "}.
 {"Dump to Text File","Sauvegarder dans un fichier texte"}.
 {"Edit Properties","Modifier les propriétés"}.
@@ -73,7 +75,6 @@
 {"ejabberd Publish-Subscribe module","Module Publish-Subscribe d'ejabberd"}.
 {"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 Bytestreams module"}.
 {"ejabberd vCard module","Module vCard ejabberd"}.
-{"ejabberd virtual hosts","Serveurs virtuels d'ejabberd"}.
 {"ejabberd Web Admin","Console Web d'administration de ejabberd"}.
 {"Elements","Éléments"}.
 {"Email","Email"}.
@@ -116,6 +117,7 @@
 {"has been kicked because the room has been changed to members-only","a été éjecté car la salle est désormais réservée aux membres"}.
 {" has set the subject to: "," a changé le sujet pour: "}.
 {"Host","Serveur"}.
+{"If you don't see the CAPTCHA image here, visit the web page.","SI vous ne voyez pas l'image CAPTCHA ici, visitez la page web."}.
 {"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Si vous voulez préciser différents ports, mots de passe, et encodages pour les serveurs IRC, remplissez cette liste avec des valeurs dans le format '{\"serveur irc\", \"encodage\", port, \"mot de passe\"}'. Par défaut ce service utilise l'encodage \"~s\", port ~p, mot de passe vide."}.
 {"Import Directory","Importer une répertoire"}.
 {"Import File","Importer un fichier"}.
@@ -125,8 +127,6 @@
 {"Import users data from jabberd14 spool directory:","Importer des utilisateurs depuis un fichier spool Jabberd 1.4:"}.
 {"Import Users from Dir at ","Importer des utilisateurs depuis le répertoire sur "}.
 {"Import Users From jabberd14 Spool Files","Importer des utilisateurs depuis un fichier spool Jabberd 1.4"}.
-{"Improper message type","Mauvais type de message"}.
-{"Incorrect password","Mot de passe incorrect"}.
 {"Invalid affiliation: ~s","Affiliation invalide : ~s"}.
 {"Invalid role: ~s","Role invalide : ~s"}.
 {"IP addresses","Adresses IP"}.
@@ -138,9 +138,7 @@
 {"IRC username","Nom d'utilisateur IRC"}.
 {"IRC Username","Nom d'utilisateur IRC"}.
 {"is now known as","est maintenant connu comme"}.
-{"It is not allowed to send private messages","L'envoi de messages privés n'est pas autorisé"}.
-{"It is not allowed to send private messages of type \"groupchat\"","Il n'est pas permis d'envoyer des messages privés de type \"groupchat\""}.
-{"It is not allowed to send private messages to the conference","Il n'est pas permis d'envoyer des messages \"normaux\" à la conférence"}.
+{"Jabber Account Registration","Enregistrement du Compte Jabber"}.
 {"Jabber ID","Jabber ID"}.
 {"Jabber ID ~s is invalid","Le Jabber ID ~s n'est pas valide"}.
 {"January","Janvier"}.
@@ -160,7 +158,7 @@
 {"List of modules to start","Liste des modules à démarrer"}.
 {"Low level update script","Script de mise à jour de bas-niveau"}.
 {"Make participants list public","Rendre la liste des participants publique"}.
-{"Make room captcha protected","Protéger le salon par un captcha"}.
+{"Make room CAPTCHA protected","Protéger le salon par un CAPTCHA"}.
 {"Make room members-only","Réserver le salon aux membres uniquement"}.
 {"Make room moderated","Rendre le salon modéré"}.
 {"Make room password protected","Protéger le salon par mot de passe"}.
@@ -171,28 +169,26 @@
 {"Max # of items to persist","Nombre maximum d'éléments à stocker"}.
 {"Max payload size in bytes","Taille maximum pour le contenu du message en octet"}.
 {"May","Mai"}.
-{"Membership is required to enter this room","Vous devez être membre pour accèder à ce salon"}.
 {"Members:","Membres :"}.
+{"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","Mémorisez votre mot de passe, ou écrivez-le sur un papier conservé dans un endroit secret. Dans Jabber il n'y a pas de mécanisme pour retrouver votre mot de passe si vous l'avez oublié."}.
 {"Memory","Mémoire"}.
 {"Message body","Corps du message"}.
 {"Middle Name","Autre nom"}.
-{"Moderator privileges required","Les droits de modérateur sont nécessaires"}.
 {"moderators only","modérateurs seulement"}.
 {"Modified modules","Modules mis à jour"}.
 {"Module","Module"}.
-{"Modules at ","Modules sur "}.
 {"Modules","Modules"}.
 {"Monday","Lundi"}.
 {"Name:","Nom :"}.
 {"Name","Nom"}.
 {"Never","Jamais"}.
+{"New Password:","Nouveau mot de passe:"}.
 {"Nickname","Pseudo"}.
 {"Nickname Registration at ","Enregistrement d'un pseudo sur "}.
 {"Nickname ~s does not exist in the room","Le pseudo ~s n'existe pas dans ce salon"}.
 {"No body provided for announce message","Pas de corps de message pour l'annonce"}.
 {"No Data","Aucune information disponible"}.
 {"Node ID","Identifiant du nœud"}.
-{"Node ","Noeud "}.
 {"Node not found","Noeud non trouvé"}.
 {"Nodes","Noeuds"}.
 {"No limit","Pas de limite"}.
@@ -210,26 +206,24 @@
 {"Offline Messages:","Messages en attente :"}.
 {"Offline Messages","Messages en attente"}.
 {"OK","OK"}.
+{"Old Password:","Ancien mot de passe:"}.
 {"Online","En ligne"}.
 {"Online Users:","Utilisateurs connectés:"}.
 {"Online Users","Utilisateurs en ligne"}.
 {"Only deliver notifications to available users","Envoyer les notifications uniquement aux utilisateurs disponibles"}.
 {"Only moderators and participants are allowed to change the subject in this room","Seuls les modérateurs et les participants peuvent changer le sujet dans ce salon"}.
 {"Only moderators are allowed to change the subject in this room","Seuls les modérateurs peuvent changer le sujet dans ce salon"}.
-{"Only occupants are allowed to send messages to the conference","Seuls les occupants peuvent envoyer des messages à la conférence"}.
-{"Only occupants are allowed to send queries to the conference","Seuls les occupants sont autorisés à envoyer des requêtes à la conférence"}.
-{"Only service administrators are allowed to send service messages","Seuls les administrateurs du service sont autoriser à envoyer des messages de service"}.
 {"Options","Options"}.
 {"Organization Name","Nom de l'organisation"}.
 {"Organization Unit","Unité de l'organisation"}.
 {"Outgoing s2s Connections:","Connexions s2s sortantes:"}.
 {"Outgoing s2s Connections","Connexions s2s sortantes"}.
 {"Outgoing s2s Servers:","Serveurs s2s sortants"}.
-{"Owner privileges required","Les droits de propriétaire sont nécessaires"}.
 {"Packet","Paquet"}.
 {"Password ~b","Mot de passe ~b"}.
 {"Password:","Mot de passe:"}.
 {"Password","Mot de passe"}.
+{"Password Verification:","Vérification du mot de passe :"}.
 {"Password Verification","Vérification du mot de passe"}.
 {"Path to Dir","Chemin vers le répertoire"}.
 {"Path to File","Chemin vers le fichier"}.
@@ -246,14 +240,15 @@
 {"Protocol","Protocole"}.
 {"Publish-Subscribe","Publication-Abonnement"}.
 {"PubSub subscriber request","Demande d'abonnement PubSub"}.
-{"Queries to the conference members are not allowed in this room","Les requêtes sur les membres de la conférence ne sont pas autorisé dans ce salon"}.
+{"Purge all items when the relevant publisher goes offline","Purger tous les items lorsque publieur est hors-ligne"}.
 {"RAM and disc copy","Copie en mémoire vive (RAM) et sur disque"}.
 {"RAM copy","Copie en mémoire vive (RAM)"}.
 {"Raw","Brut"}.
 {"Really delete message of the day?","Confirmer la suppression du message du jour ?"}.
-{"Recipient is not in the conference room","Le destinataire n'est pas dans la conférence"}.
+{"Register a Jabber account","Enregistrer un compte Jabber"}.
 {"Registered Users:","Utilisateurs enregistrés:"}.
 {"Registered Users","Utilisateurs enregistrés"}.
+{"Register","Enregistrer"}.
 {"Registration in mod_irc for ","Enregistrement du mod_irc pour "}.
 {"Remote copy","Copie distante"}.
 {"Remove All Offline Messages","Effacer tous les messages hors ligne"}.
@@ -269,7 +264,6 @@
 {"Restore plain text backup immediately:","Restauration immédiate d'une sauvegarde texte:"}.
 {"Restore","Restauration"}.
 {"Room Configuration","Configuration du salon"}.
-{"Room creation is denied by service policy","La création de salons est interdite par le service"}.
 {"Room description","Description :"}.
 {"Room Occupants","Occupants du salon"}.
 {"Room title","Titre du salon"}.
@@ -290,6 +284,7 @@
 {"Send announcement to all users on all hosts","Envoyer une annonce à tous les utilisateurs de tous les domaines"}.
 {"September","Septembre"}.
 {"Server ~b","Serveur ~b"}.
+{"Server:","Serveur :"}.
 {"Set message of the day and send to online users","Définir le message du jour et l'envoyer aux utilisateurs en ligne"}.
 {"Set message of the day on all hosts and send to online users","Définir le message du jour pour tous domaines et l'envoyer aux utilisateurs en ligne"}.
 {"Shared Roster Groups","Groupes de liste de contacts partagée"}.
@@ -297,7 +292,9 @@
 {"Show Ordinary Table","Montrer la table ordinaire"}.
 {"Shut Down Service","Arrêter le service"}.
 {"~s invites you to the room ~s","~s vous a invité dans la salle de discussion ~s"}.
+{"Some Jabber clients can store your password in your computer. Use that feature only if you trust your computer is safe.","Certains clients Jabber peuvent stocker votre mot de passe sur votre ordinateur. N'utilisez cette fonctionnalité que si vous avez confiance en la sécurité de votre ordinateur."}.
 {"Specify the access model","Définir le modèle d'accès"}.
+{"Specify the event message type","Définir le type de message d'événement"}.
 {"Specify the publisher model","Définir le modèle de publication"}.
 {"~s's Offline Messages Queue","~s messages en file d'attente"}.
 {"Start","Démarrer"}.
@@ -318,54 +315,54 @@
 {"Subscriber Address","Adresse de l'abonné"}.
 {"Subscription","Abonnement"}.
 {"Sunday","Dimanche"}.
-{"That nickname is already in use by another occupant","Le pseudo est déjà utilisé par un autre occupant"}.
-{"That nickname is registered by another person","Le pseudo est enregistré par une autre personne"}.
-{"The captcha is valid.","Le captcha est valide"}.
+{"The CAPTCHA is valid.","Le CAPTCHA est valide"}.
 {"The collections with which a node is affiliated","Les collections avec lesquelle un nœud est affilié"}.
 {"the password is","le mot de passe est"}.
-{"This participant is kicked from the room because he sent an error message","Ce participant est expulsé du salon pour avoir envoyé un message erroné"}.
-{"This participant is kicked from the room because he sent an error message to another participant","Ce participant est expulsé du salon pour avoir envoyé un message erroné à un autre participant"}.
-{"This participant is kicked from the room because he sent an error presence","Ce participant est expulsé du salon pour avoir envoyé une présence erroné"}.
+{"The password of your Jabber account was successfully changed.","Le mot de passe de votre compte Jabber a été changé avec succès."}.
+{"There was an error changing the password: ","Il y a eu une erreur en changeant le mot de passe :"}.
+{"There was an error creating the account: ","Il y a eu une erreur en créant le compte :"}.
+{"There was an error deleting the account: ","Il y a eu une erreur en effaçant le compte :"}.
+{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","C'est insensible à la casse : macbeth est identique à MacBeth et Macbeth."}.
+{"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Cette page permet de créer un compte Jabber sur ce serveur Jabber. Votre JID (Jabber IDentifier, identifiant Jabber) sera de la forme : nom@serveur. Prière de lire avec attention les instructions pour remplir correctement ces champs."}.
+{"This page allows to unregister a Jabber account in this Jabber server.","Cette page permet d'effacer un compte Jabber sur ce serveur Jabber."}.
 {"This room is not anonymous","Ce salon n'est pas anonyme"}.
 {"Thursday","Jeudi"}.
 {"Time delay","Délais"}.
 {"Time","Heure"}.
 {"To","A"}.
 {"To ~s","A ~s"}.
-{"Traffic rate limit is exceeded","La limite de trafic a été dépassée"}.
 {"Transactions Aborted:","Transactions annulées :"}.
 {"Transactions Committed:","Transactions commitées :"}.
 {"Transactions Logged:","Transactions journalisées :"}.
 {"Transactions Restarted:","Transactions redémarrées :"}.
 {"Tuesday","Mardi"}.
-{"Unable to generate a captcha","Impossible de générer le captcha"}.
 {"Unauthorized","Non autorisé"}.
+{"Unregister a Jabber account","Effacer un compte Jabber"}.
+{"Unregister","Effacer"}.
 {"Update message of the day (don't send)","Mise à jour du message du jour (pas d'envoi)"}.
 {"Update message of the day on all hosts (don't send)","Mettre à jour le message du jour sur tous les domaines (ne pas envoyer)"}.
 {"Update","Mettre à jour"}.
-{"Update ","Mise à jour "}.
 {"Update plan","Plan de mise à jour"}.
 {"Update script","Script de mise à jour"}.
 {"Uptime:","Temps depuis le démarrage :"}.
 {"Use of STARTTLS required","L'utilisation de STARTTLS est impérative"}.
 {"User Management","Gestion des utilisateurs"}.
-{"Users are not allowed to register accounts so quickly","Les utilisateurs ne sont pas autorisés à enregistrer des comptes si rapidement"}.
+{"Username:","Nom d'utilisateur :"}.
 {"Users Last Activity","Dernière activité des utilisateurs"}.
 {"Users","Utilisateurs"}.
-{"User ","Utilisateur "}.
 {"User","Utilisateur"}.
 {"Validate","Valider"}.
 {"vCard User Search","Recherche dans l'annnuaire"}.
-{"Visitors are not allowed to change their nicknames in this room","Les visiteurs ne sont pas autorisés à changer de pseudo dans ce salon"}.
-{"Visitors are not allowed to send messages to all occupants","Les visiteurs ne sont pas autorisés à envoyer des messages à tout les occupants"}.
+{"Virtual Hosts","Serveurs virtuels"}.
 {"Wednesday","Mercredi"}.
 {"When to send the last published item","A quel moment envoyer le dernier élément publié"}.
 {"Whether to allow subscriptions","Autoriser l'abonnement ?"}.
-{"You have been banned from this room","Vous avez été exclus de ce salon"}.
-{"You must fill in field \"Nickname\" in the form","Vous devez préciser le champ \"pseudo\" dans le formulaire"}.
+{"You can later change your password using a Jabber client.","Vous pouvez changer votre mot de passe plus tard en utilisant un client Jabber."}.
+{"You need a client that supports x:data and CAPTCHA to register","Vous avez besoin d'un client prenant en charge x:data et CAPTCHA pour enregistrer un pseudo"}.
+{"You need a client that supports x:data to register the nickname","Vous avez besoin d'un client prenant en charge x:data pour enregistrer un pseudo"}.
 {"You need an x:data capable client to configure mod_irc settings","Vous avez besoin d'un client supportant x:data pour configurer le module IRC"}.
 {"You need an x:data capable client to configure room","Vous avez besoin d'un client supportant x:data pour configurer le salon"}.
-{"You need an x:data capable client to register nickname","Vous avez besoin d'un client supportant x:data pour enregistrer un pseudo"}.
 {"You need an x:data capable client to search","Vous avez besoin d'un client supportant x:data pour faire une recherche"}.
-{"Your contact offline message queue is full. The message has been discarded.","La file d'attente de message de votre contact est pleine. Votre message a été détruit."}.
+{"Your Jabber account was successfully created.","Votre compte Jabber a été créé avec succès."}.
+{"Your Jabber account was successfully deleted.","Votre compte Jabber a été effacé avec succès."}.
 {"Your messages to ~s are being blocked. To unblock them, visit ~s","Vos messages pour ~s sont bloqués. Pour les débloquer, veuillez visiter ~s"}.
@@ -1,8 +1,8 @@
+%% -*- coding: latin-1 -*-
 {"Access Configuration","Configuración de accesos"}.
 {"Access Control List Configuration","Configuración da Lista de Control de Acceso"}.
 {"Access control lists","Listas de Control de Acceso"}.
 {"Access Control Lists","Listas de Control de Acceso"}.
-{"Access denied by service policy","Acceso denegado pola política do servizo"}.
 {"Access rules","Regras de acceso"}.
 {"Access Rules","Regras de Acceso"}.
 {"Action on user","Acción no usuario"}.
@@ -11,7 +11,6 @@
 {"Add User","Engadir usuario"}.
 {"Administration","Administración"}.
 {"Administration of ","Administración de "}.
-{"Administrator privileges required","Necesítase privilexios de administrador"}.
 {"A friendly name for the node","Un nome para o nodo"}.
 {"All activity","Toda a actividade"}.
 {"Allow this Jabber ID to subscribe to this pubsub node?","Desexas permitir a este JabberID que se subscriba a este nodo PubSub?"}.
@@ -24,12 +23,10 @@
 {"All Users","Todos os usuarios"}.
 {"Announcements","Anuncios"}.
 {"anyone","calquera"}.
-{"A password is required to enter this room","Necesítase contrasinal para entrar nesta sala"}.
 {"April","Abril"}.
 {"August","Agosto"}.
 {"Backup","Gardar copia de seguridade"}.
 {"Backup Management","Xestión de copia de seguridade"}.
-{"Backup of ","Copia de seguridade de "}.
 {"Backup to File at ","Copia de seguridade de arquivos en "}.
 {"Bad format","Mal formato"}.
 {"Birthday","Aniversario"}.
@@ -43,7 +40,6 @@
 {"Choose whether to approve this entity's subscription.","Decidir se aprobar a subscripción desta entidade."}.
 {"City","Cidade"}.
 {"Commands","Comandos"}.
-{"Conference room does not exist","A sala de conferencias non existe"}.
 {"Configuration","Configuración"}.
 {"Configuration of room ~s","Configuración para a sala ~s"}.
 {"Connected Resources:","Recursos conectados:"}.
@@ -51,7 +47,6 @@
 {"Country","País"}.
 {"CPU Time:","Tempo consumido de CPU:"}.
 {"Database","Base de datos"}.
-{"Database Tables at ","Táboas da base de datos en "}.
 {"Database Tables Configuration at ","Configuración de táboas da base de datos en "}.
 {"December","Decembro"}.
 {"Default users as participants","Os usuarios son participantes por defecto"}.
@@ -73,7 +68,6 @@
 {"ejabberd Publish-Subscribe module","Módulo de Publicar-Subscribir de ejabberd"}.
 {"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 Bytestreams module"}.
 {"ejabberd vCard module","Módulo vCard para ejabberd"}.
-{"ejabberd virtual hosts","Hosts virtuais de ejabberd"}.
 {"ejabberd Web Admin","Ejabberd Administrador Web"}.
 {"Elements","Elementos"}.
 {"Email","Email"}.
@@ -125,8 +119,6 @@
 {"Import users data from jabberd14 spool directory:","Importar usuarios do directorio spool de jabberd14:"}.
 {"Import Users from Dir at ","Importar usuarios desde o directorio en "}.
 {"Import Users From jabberd14 Spool Files","Importar usuarios de ficheiros spool de jabberd-1.4"}.
-{"Improper message type","Tipo de mensaxe incorrecta"}.
-{"Incorrect password","Contrasinal incorrecta"}.
 {"Invalid affiliation: ~s","Afiliación non válida: ~s"}.
 {"Invalid role: ~s","Rol non válido: ~s"}.
 {"IP addresses","Direccións IP"}.
@@ -138,9 +130,6 @@
 {"IRC username","Nome de usuario en IRC"}.
 {"IRC Username","Nome de usuario en IRC"}.
 {"is now known as","cámbiase o nome a"}.
-{"It is not allowed to send private messages","Non está permitido enviar mensaxes privadas"}.
-{"It is not allowed to send private messages of type \"groupchat\"","Non está permitido enviar mensaxes privadas do tipo \"groupchat\""}.
-{"It is not allowed to send private messages to the conference","Impedir o envio de mensaxes privadas á sala"}.
 {"Jabber ID","Jabber ID"}.
 {"Jabber ID ~s is invalid","O Jabber ID ~s non é válido"}.
 {"January","Xaneiro"}.
@@ -160,7 +149,7 @@
 {"List of modules to start","Lista de módulos a iniciar"}.
 {"Low level update script","Script de actualización a baixo nivel"}.
 {"Make participants list public","A lista de participantes é pública"}.
-{"Make room captcha protected","Protexer a sala con captcha"}.
+{"Make room CAPTCHA protected","Protexer a sala con CAPTCHA"}.
 {"Make room members-only","Sala só para membros"}.
 {"Make room moderated","Facer sala moderada"}.
 {"Make room password protected","Protexer a sala con contrasinal"}.
@@ -171,16 +160,13 @@
 {"Max # of items to persist","Máximo # de elementos que persisten"}.
 {"Max payload size in bytes","Máximo tamaño do payload en bytes"}.
 {"May","Maio"}.
-{"Membership is required to enter this room","Necesitas ser membro desta sala para poder entrar"}.
 {"Members:","Membros:"}.
 {"Memory","Memoria"}.
 {"Message body","Corpo da mensaxe"}.
 {"Middle Name","Segundo nome"}.
-{"Moderator privileges required","Necesítase privilexios de moderador"}.
 {"moderators only","só moderadores"}.
 {"Modified modules","Módulos Modificados"}.
 {"Module","Módulo"}.
-{"Modules at ","Módulos en "}.
 {"Modules","Módulos"}.
 {"Monday","Luns"}.
 {"Name:","Nome:"}.
@@ -192,7 +178,6 @@
 {"No body provided for announce message","Non se proporcionou corpo de mensaxe para o anuncio"}.
 {"No Data","Sen datos"}.
 {"Node ID","Nodo IDE"}.
-{"Node ","Nodo "}.
 {"Node not found","Nodo non atopado"}.
 {"Nodes","Nodos"}.
 {"No limit","Sen límite"}.
@@ -216,16 +201,12 @@
 {"Only deliver notifications to available users","Só enviar notificacións aos usuarios dispoñibles"}.
 {"Only moderators and participants are allowed to change the subject in this room","Só os moderadores e os participantes se lles permite cambiar o tema nesta sala"}.
 {"Only moderators are allowed to change the subject in this room","Só os moderadores están autorizados a cambiar o tema nesta sala"}.
-{"Only occupants are allowed to send messages to the conference","Só os ocupantes poden enviar mensaxes á sala"}.
-{"Only occupants are allowed to send queries to the conference","Só os ocupantes poden enviar solicitudes á sala"}.
-{"Only service administrators are allowed to send service messages","Só os administradores do servizo teñen permiso para enviar mensaxes de servizo"}.
 {"Options","Opcións"}.
 {"Organization Name","Nome da organización"}.
 {"Organization Unit","Unidade da organización"}.
 {"Outgoing s2s Connections:","Conexións S2S saíntes:"}.
 {"Outgoing s2s Connections","Conexións S2S saíntes"}.
 {"Outgoing s2s Servers:","Servidores S2S saíntes:"}.
-{"Owner privileges required","Requírense privilexios de propietario da sala"}.
 {"Packet","Paquete"}.
 {"Password ~b","Contrasinal ~b"}.
 {"Password:","Contrasinal:"}.
@@ -246,12 +227,10 @@
 {"Protocol","Protocolo"}.
 {"Publish-Subscribe","Publicar-Subscribir"}.
 {"PubSub subscriber request","Petición de subscriptor de PubSub"}.
-{"Queries to the conference members are not allowed in this room","Nesta sala non se permiten solicitudes aos membros da sala"}.
 {"RAM and disc copy","Copia en RAM e disco"}.
 {"RAM copy","Copia en RAM"}.
 {"Raw","Cru"}.
 {"Really delete message of the day?","Está seguro de quere borrar a mensaxe do dia?"}.
-{"Recipient is not in the conference room","O receptor non está na sala de conferencia"}.
 {"Registered Users:","Usuarios rexistrados:"}.
 {"Registered Users","Usuarios rexistrados"}.
 {"Registration in mod_irc for ","Rexistro en mod_irc para"}.
@@ -269,7 +248,6 @@
 {"Restore plain text backup immediately:","Restaurar copias de seguridade de texto plano inmediatamente:"}.
 {"Restore","Restaurar"}.
 {"Room Configuration","Configuración da Sala"}.
-{"Room creation is denied by service policy","Denegar crear a sala por política do servizo"}.
 {"Room description","Descrición da sala"}.
 {"Room Occupants","Ocupantes da sala"}.
 {"Room title","Título da sala"}.
@@ -318,29 +296,21 @@
 {"Subscriber Address","Dirección do subscriptor"}.
 {"Subscription","Subscripción"}.
 {"Sunday","Domingo"}.
-{"That nickname is already in use by another occupant","Ese alcume que xa está en uso por outro ocupante"}.
-{"That nickname is registered by another person","O alcume xa está rexistrado por outra persoa"}.
-{"The captcha is valid.","O Captcha é válido."}.
+{"The CAPTCHA is valid.","O CAPTCHA é válido."}.
 {"The collections with which a node is affiliated","As coleccións coas que un nodo está afiliado"}.
 {"the password is","a contrasinal é"}.
-{"This participant is kicked from the room because he sent an error message","Este participante é expulsado da sala, xa que enviou unha mensaxe de erro"}.
-{"This participant is kicked from the room because he sent an error message to another participant","Este participante é expulsado da sala, porque el enviou unha mensaxe de erro a outro participante"}.
-{"This participant is kicked from the room because he sent an error presence","Este participante é expulsado da sala, porque el enviou un erro de presenza"}.
 {"This room is not anonymous","Sala non anónima"}.
 {"Thursday","Xoves"}.
 {"Time","Data"}.
 {"Time delay","Atraso temporal"}.
 {"To","Para"}.
 {"To ~s","A ~s"}.
-{"Traffic rate limit is exceeded","Hase exedido o límite de tráfico"}.
 {"Transactions Aborted:","Transaccións abortadas:"}.
 {"Transactions Committed:","Transaccións finalizadas:"}.
 {"Transactions Logged:","Transaccións rexistradas:"}.
 {"Transactions Restarted:","Transaccións reiniciadas:"}.
 {"Tuesday","Martes"}.
-{"Unable to generate a captcha","Non se pode xerar un Captcha"}.
 {"Unauthorized","Non autorizado"}.
-{"Update ","Actualizar"}.
 {"Update","Actualizar"}.
 {"Update message of the day (don't send)","Actualizar mensaxe do dia, pero non envialo"}.
 {"Update message of the day on all hosts (don't send)","Actualizar a mensaxe do día en todos os dominos (pero non envialo)"}.
@@ -349,23 +319,16 @@
 {"Uptime:","Tempo desde o inicio:"}.
 {"Use of STARTTLS required","É obrigatorio usar STARTTLS"}.
 {"User Management","Administración de usuarios"}.
-{"Users are not allowed to register accounts so quickly","Os usuarios non están autorizados a rexistrar contas con tanta rapidez"}.
 {"Users Last Activity","Última actividade dos usuarios"}.
 {"Users","Usuarios"}.
-{"User ","Usuario "}.
 {"User","Usuario"}.
 {"Validate","Validar"}.
 {"vCard User Search","Procura de usuario en vCard"}.
-{"Visitors are not allowed to change their nicknames in this room","Os visitantes non están autorizados a cambiar os seus That alcumes nesta sala"}.
-{"Visitors are not allowed to send messages to all occupants","Os visitantes non poden enviar mensaxes a todos os ocupantes"}.
+{"Virtual Hosts","Hosts Virtuais"}.
 {"Wednesday","Mércores"}.
 {"When to send the last published item","Cando enviar o último elemento publicado"}.
 {"Whether to allow subscriptions","Permitir subscripciones"}.
-{"You have been banned from this room","fuches bloqueado nesta sala"}.
-{"You must fill in field \"Nickname\" in the form","Debes encher o campo \"Alcumo\" no formulario"}.
 {"You need an x:data capable client to configure mod_irc settings","Necesitas un cliente con soporte de x:data para configurar as opcións de mod_irc"}.
 {"You need an x:data capable client to configure room","Necesitas un cliente con soporte de x:data para configurar a sala"}.
-{"You need an x:data capable client to register nickname","Necesitas un cliente con soporte de x:data para poder rexistrar o alcume"}.
 {"You need an x:data capable client to search","Necesitas un cliente con soporte de x:data para poder buscar"}.
-{"Your contact offline message queue is full. The message has been discarded.","A túa cola de mensaxes diferidas de contactos está chea. A mensaxe descartouse."}.
 {"Your messages to ~s are being blocked. To unblock them, visit ~s","As súas mensaxes a ~s encóntranse bloqueadas. Para desbloquear, visite ~s"}.
--- a/Show More
+++ b/Show More