Allow generation of oauth tokens from command line

Oauth tokens can be generated for commands (scopes) having admin|user|open
policy. Restricted commands are not available as those are only usable
from ejabberdctl command line.

Four new commands are available:

$ejabberdctl oauth_issue_token "stats;get_roster"
    Generates a token authorized to call both stats and get_roster
    commands.  Note scopes must be separated by semicolon.

$ejabberdctl oauth_list_tokens
    List tokens generated from the command line, with their scope
    and expirity time.

$ejabberdctl oauth_list_scopes
    List scopes available

$ejabberdctl oauth_revoke_token "Lbs7qdJfdKXOWzVrArgyckY055tE1xnt"
    Revokes the given token

.github/ISSUE_TEMPLATE

@@ -0,0 +1,15 @@
+> What version of ejabberd are you using?
+
+
+
+> What operating system (version) are you using?
+
+
+
+> How did you install ejabberd (source, package, distribution)?
+
+
+
+> What did not work as expected? Are there error messages in the log? What
+> was the unexpected behavior? What was the expected result?
+

.github/PULL_REQUEST_TEMPLATE

@@ -0,0 +1,20 @@
+We are open to contributions for ejabberd, as GitHub pull requests (PR).
+Here are a few points to consider before submitting your PR. (You can
+remove the whole text after reading.)
+
+1. Does this PR address an issue? Please reference it in the PR
+   description.
+
+2. Have you properly described the proposed change?
+
+3. Please make sure the change is atomic and does only touch the needed
+   modules. If you have other changes/fixes to provide, please submit
+   them as separate PRs.
+
+4. If your change or new feature involves storage backends, did you make
+   sure your change works with all backends?
+
+5. Do you provide tests? How can we check the behavior of the code?
+
+6. Did you consider documentation changes in the
+   processone/docs.ejabberd.im repository?

.gitignore

@@ -39,5 +39,10 @@ XmppAddr.hrl
 /vars.config
 /dialyzer/
 /test/*.beam
+/test/*.ctc
 /logs/
 /priv/sql
+/rel/ejabberd
+/_build
+/mnesiadb
+/.rebar

.travis.yml

@@ -1,19 +1,42 @@
 language: erlang
 
 otp_release:
-  - 17.4
-  - R16B03
+  - 17.5
+  - 18.3
 
 services:
   - riak
+  - redis-server
 
 before_install:
+  #
+  # We need MySQL 5.6 or newer in order to get support for FULLTEXT indexes
+  # with InnoDB. As soon as Travis ships that version, the following lines
+  # (except for the "apt-get update" call) can go away.
+  #
+  # See: https://github.com/travis-ci/travis-ci/issues/1986
+  #
+  - sudo sed -i -e s/table_cache/table_open_cache/ -e /log_slow_queries/d /etc/mysql/my.cnf
+  - sudo apt-key adv --import .travis/mysql_repo_key.asc
+  - sudo add-apt-repository 'deb http://repo.mysql.com/apt/ubuntu/ precise mysql-5.6'
   - sudo apt-get -qq update
+  - sudo apt-get -qq -o Dpkg::Options::=--force-confold install mysql-server-5.6
+  # /END MYSQL 5.6
+  - pip install --user coveralls-merge
 
 install:
   - sudo apt-get -qq install libexpat1-dev libyaml-dev libpam0g-dev libsqlite3-dev
 
 before_script:
+  # Ulimit: See Travis-CI issue report: https://github.com/travis-ci/travis-ci/issues/3328
+  - echo 'ulimit -n 4096' > riak
+  - sudo mv riak /etc/default/riak
+  - mkdir "$PWD/ebin"
+  - echo "[{riak_kv, [{add_paths, [\"$PWD/ebin/\"]}]}]." > advanced.config
+  - sudo mv advanced.config /etc/riak/advanced.config
+  - sudo service riak restart
+  - sudo riak-admin wait-for-service riak_kv 'riak@127.0.0.1'
+  - sudo riak-admin test
   - 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';"
@@ -23,16 +46,26 @@ before_script:
 
 script:
   - ./autogen.sh
-  - ./configure --enable-all --disable-odbc --disable-elixir
+  - ./configure --prefix=/tmp/ejabberd --enable-all --disable-odbc
+  - make
+  - make install
   - make xref
-  - ERL_LIBS=$PWD make test
+  - sed -i -e 's/ct:pal/ct:log/' test/suite.erl
+  - ln -sf ../sql priv/
+  - escript ./rebar skip_deps=true ct -v
   - 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 exunit.log -exec cat '{}' ';'
+  # Try checking Riak database logs
+  - tail -n 100000 /var/log/riak/*.log
   - find logs -name ejabberd.log -exec cat '{}' ';'
 
+after_success:
+  - coveralls-merge erlang.json
+
 notifications:
   email: false

.travis/mysql_repo_key.asc

@@ -0,0 +1,96 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (SunOS)
+
+mQGiBD4+owwRBAC14GIfUfCyEDSIePvEW3SAFUdJBtoQHH/nJKZyQT7h9bPlUWC3
+RODjQReyCITRrdwyrKUGku2FmeVGwn2u2WmDMNABLnpprWPkBdCk96+OmSLN9brZ
+fw2vOUgCmYv2hW0hyDHuvYlQA/BThQoADgj8AW6/0Lo7V1W9/8VuHP0gQwCgvzV3
+BqOxRznNCRCRxAuAuVztHRcEAJooQK1+iSiunZMYD1WufeXfshc57S/+yeJkegNW
+hxwR9pRWVArNYJdDRT+rf2RUe3vpquKNQU/hnEIUHJRQqYHo8gTxvxXNQc7fJYLV
+K2HtkrPbP72vwsEKMYhhr0eKCbtLGfls9krjJ6sBgACyP/Vb7hiPwxh6rDZ7ITnE
+kYpXBACmWpP8NJTkamEnPCia2ZoOHODANwpUkP43I7jsDmgtobZX9qnrAXw+uNDI
+QJEXM6FSbi0LLtZciNlYsafwAPEOMDKpMqAK6IyisNtPvaLd8lH0bPAnWqcyefep
+rv0sxxqUEMcM3o7wwgfN83POkDasDbs3pjwPhxvhz6//62zQJ7Q2TXlTUUwgUmVs
+ZWFzZSBFbmdpbmVlcmluZyA8bXlzcWwtYnVpbGRAb3NzLm9yYWNsZS5jb20+iGkE
+ExECACkCGyMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAIZAQUCUwHUZgUJGmbLywAK
+CRCMcY07UHLh9V+DAKCjS1gGwgVI/eut+5L+l2v3ybl+ZgCcD7ZoA341HtoroV3U
+6xRD09fUgeq0O015U1FMIFBhY2thZ2Ugc2lnbmluZyBrZXkgKHd3dy5teXNxbC5j
+b20pIDxidWlsZEBteXNxbC5jb20+iG8EMBECAC8FAk53Pa0oHSBidWlsZEBteXNx
+bC5jb20gd2lsbCBzdG9wIHdvcmtpbmcgc29vbgAKCRCMcY07UHLh9bU9AJ9xDK0o
+xJFL9vTl9OSZC4lX0K9AzwCcCrS9cnJyz79eaRjL0s2r/CcljdyIZQQTEQIAHQUC
+R6yUtAUJDTBYqAULBwoDBAMVAwIDFgIBAheAABIJEIxxjTtQcuH1B2VHUEcAAQGu
+kgCffz4GUEjzXkOi71VcwgCxASTgbe0An34LPr1j9fCbrXWXO14msIADfb5piEwE
+ExECAAwFAj4+o9EFgwlmALsACgkQSVDhKrJykfIk4QCfWbEeKN+3TRspe+5xKj+k
+QJSammIAnjUz0xFWPlVx0f8o38qNG1bq0cU9iEwEExECAAwFAj5CggMFgwliIokA
+CgkQtvXNTca6JD+WkQCgiGmnoGjMojynp5ppvMXkyUkfnykAoK79E6h8rwkSDZou
+iz7nMRisH8uyiEYEEBECAAYFAj+s468ACgkQr8UjSHiDdA/2lgCg21IhIMMABTYd
+p/IBiUsP/JQLiEoAnRzMywEtujQz/E9ono7H1DkebDa4iEYEEBECAAYFAj+0Q3cA
+CgkQhZavqzBzTmbGwwCdFqD1frViC7WRt8GKoOS7hzNN32kAnirlbwpnT7a6NOsQ
+83nk11a2dePhiEYEEBECAAYFAkNbs+oACgkQi9gubzC5S1x/dACdELKoXQKkwJN0
+gZztsM7kjsIgyFMAnRRMbHQ7V39XC90OIpaPjk3a01tgiEYEExECAAYFAkTxMyYA
+CgkQ9knE9GCTUwwKcQCgibak/SwhxWH1ijRhgYCo5GtM4vcAnAhtzL57wcw1Kg1X
+m7nVGetUqJ7fiEwEEBECAAwFAkGBywEFgwYi2YsACgkQGFnQH2d7oexCjQCcD8sJ
+NDc/mS8m8OGDUOx9VMWcnGkAnj1YWOD+Qhxo3mI/Ul9oEAhNkjcfiEwEEBECAAwF
+AkGByzQFgwYi2VgACgkQgcL36+ITtpIiIwCdFVNVUB8xe8mFXoPm4d9Z54PTjpMA
+niSPA/ZsfJ3oOMLKar4F0QPPrdrGiEwEEBECAAwFAkGBy2IFgwYi2SoACgkQa3Ds
+2V3D9HMJqgCbBYzr5GPXOXgP88jKzmdbjweqXeEAnRss4G2G/3qD7uhTL1SPT1SH
+jWUXiEwEEBECAAwFAkHQkyQFgwXUEWgACgkQfSXKCsEpp8JiVQCghvWvkPqowsw8
+w7WSseTcw1tflvkAni+vLHl/DqIly0LkZYn5jzK1dpvfiEwEEBECAAwFAkIrW7oF
+gwV5SNIACgkQ5hukiRXruavzEwCgkzL5QkLSypcw9LGHcFSx1ya0VL4An35nXkum
+g6cCJ1NP8r2I4NcZWIrqiEwEEhECAAwFAkAqWToFgwd6S1IACgkQPKEfNJT6+GEm
+XACcD+A53A5OGM7w750W11ukq4iZ9ckAnRMvndAqn3YTOxxlLPj2UPZiSgSqiEwE
+EhECAAwFAkA9+roFgwdmqdIACgkQ8tdcY+OcZZyy3wCgtDcwlaq20w0cNuXFLLNe
+EUaFFTwAni6RHN80moSVAdDTRkzZacJU3M5QiEwEEhECAAwFAkEOCoQFgwaWmggA
+CgkQOcor9D1qil/83QCeITZ9wIo7XAMjC6y4ZWUL4m+edZsAoMOhRIRi42fmrNFu
+vNZbnMGej81viEwEEhECAAwFAkKApTQFgwUj/1gACgkQBA3AhXyDn6jjJACcD1A4
+UtXk84J13JQyoH9+dy24714Aniwlsso/9ndICJOkqs2j5dlHFq6oiEwEExECAAwF
+Aj5NTYQFgwlXVwgACgkQLbt2v63UyTMFDACglT5G5NVKf5Mj65bFSlPzb92zk2QA
+n1uc2h19/IwwrsbIyK/9POJ+JMP7iEwEExECAAwFAkHXgHYFgwXNJBYACgkQZu/b
+yM2C/T4/vACfXe67xiSHB80wkmFZ2krb+oz/gBAAnjR2ucpbaonkQQgnC3GnBqmC
+vNaJiEwEExECAAwFAkIYgQ4FgwWMI34ACgkQdsEDHKIxbqGg7gCfQi2HcrHn+yLF
+uNlH1oSOh48ZM0oAn3hKV0uIRJphonHaUYiUP1ttWgdBiGUEExECAB0FCwcKAwQD
+FQMCAxYCAQIXgAUCS3AvygUJEPPzpwASB2VHUEcAAQEJEIxxjTtQcuH1sNsAniYp
+YBGqy/HhMnw3WE8kXahOOR5KAJ4xUmWPGYP4l3hKxyNK9OAUbpDVYIh7BDARAgA7
+BQJCdzX1NB0AT29wcy4uLiBzaG91bGQgaGF2ZSBiZWVuIGxvY2FsISBJJ20gKnNv
+KiBzdHVwaWQuLi4ACgkQOcor9D1qil/vRwCdFo08f66oKLiuEAqzlf9iDlPozEEA
+n2EgvCYLCCHjfGosrkrU3WK5NFVgiI8EMBECAE8FAkVvAL9IHQBTaG91bGQgaGF2
+ZSBiZWVuIGEgbG9jYWwgc2lnbmF0dXJlLCBvciBzb21ldGhpbmcgLSBXVEYgd2Fz
+IEkgdGhpbmtpbmc/AAoJEDnKK/Q9aopfoPsAn3BVqKOalJeF0xPSvLR90PsRlnmG
+AJ44oisY7Tl3NJbPgZal8W32fbqgbIkCIgQQAQIADAUCQYHLhQWDBiLZBwAKCRCq
+4+bOZqFEaKgvEACCErnaHGyUYa0wETjj6DLEXsqeOiXad4i9aBQxnD35GUgcFofC
+/nCY4XcnCMMEnmdQ9ofUuU3OBJ6BNJIbEusAabgLooebP/3KEaiCIiyhHYU5jarp
+ZAh+Zopgs3Oc11mQ1tIaS69iJxrGTLodkAsAJAeEUwTPq9fHFFzC1eGBysoyFWg4
+bIjz/zClI+qyTbFA5g6tRoiXTo8ko7QhY2AA5UGEg+83Hdb6akC04Z2QRErxKAqr
+phHzj8XpjVOsQAdAi/qVKQeNKROlJ+iq6+YesmcWGfzeb87dGNweVFDJIGA0qY27
+pTb2lExYjsRFN4Cb13NfodAbMTOxcAWZ7jAPCxAPlHUG++mHMrhQXEToZnBFE4nb
+nC7vOBNgWdjUgXcpkUCkop4b17BFpR+k8ZtYLSS8p2LLz4uAeCcSm2/msJxT7rC/
+FvoH8428oHincqs2ICo9zO/Ud4HmmO0O+SsZdVKIIjinGyOVWb4OOzkAlnnhEZ3o
+6hAHcREIsBgPwEYVTj/9ZdC0AO44Nj9cU7awaqgtrnwwfr/o4V2gl8bLSkltZU27
+/29HeuOeFGjlFe0YrDd/aRNsxbyb2O28H4sG1CVZmC5uK1iQBDiSyA7Q0bbdofCW
+oQzm5twlpKWnY8Oe0ub9XP5p/sVfck4FceWFHwv+/PC9RzSl33lQ6vM2wIkCIgQT
+AQIADAUCQp8KHAWDBQWacAAKCRDYwgoJWiRXzyE+D/9uc7z6fIsalfOYoLN60ajA
+bQbI/uRKBFugyZ5RoaItusn9Z2rAtn61WrFhu4uCSJtFN1ny2RERg40f56pTghKr
+D+YEt+Nze6+FKQ5AbGIdFsR/2bUk+ZZRSt83e14Lcb6ii/fJfzkoIox9ltkifQxq
+Y7Tvk4noKu4oLSc8O1Wsfc/y0B9sYUUCmUfcnq58DEmGie9ovUslmyt5NPnveXxp
+5UeaRc5Rqt9tK2B4A+7/cqENrdZJbAMSunt2+2fkYiRunAFPKPBdJBsY1sxeL/A9
+aKe0viKEXQdAWqdNZKNCi8rd/oOP99/9lMbFudAbX6nL2DSb1OG2Z7NWEqgIAzjm
+pwYYPCKeVz5Q8R+if9/fe5+STY/55OaI33fJ2H3v+U435VjYqbrerWe36xJItcJe
+qUzW71fQtXi1CTEl3w2ch7VF5oj/QyjabLnAlHgSlkSi6p7By5C2MnbCHlCfPnIi
+nPhFoRcRGPjJe9nFwGs+QblvS/Chzc2WX3s/2SWm4gEUKRX4zsAJ5ocyfa/vkxCk
+SxK/erWlCPf/J1T70+i5waXDN/E3enSet/WL7h94pQKpjz8OdGL4JSBHuAVGA+a+
+dknqnPF0KMKLhjrgV+L7O84FhbmAP7PXm3xmiMPriXf+el5fZZequQoIagf8rdRH
+HhRJxQgI0HNknkaOqs8dtrkCDQQ+PqMdEAgA7+GJfxbMdY4wslPnjH9rF4N2qfWs
+EN/lxaZoJYc3a6M02WCnHl6ahT2/tBK2w1QI4YFteR47gCvtgb6O1JHffOo2HfLm
+RDRiRjd1DTCHqeyX7CHhcghj/dNRlW2Z0l5QFEcmV9U0Vhp3aFfWC4Ujfs3LU+hk
+AWzE7zaD5cH9J7yv/6xuZVw411x0h4UqsTcWMu0iM1BzELqX1DY7LwoPEb/O9Rkb
+f4fmLe11EzIaCa4PqARXQZc4dhSinMt6K3X4BrRsKTfozBu74F47D8Ilbf5vSYHb
+uE5p/1oIDznkg/p8kW+3FxuWrycciqFTcNz215yyX39LXFnlLzKUb/F5GwADBQf+
+Lwqqa8CGrRfsOAJxim63CHfty5mUc5rUSnTslGYEIOCR1BeQauyPZbPDsDD9MZ1Z
+aSafanFvwFG6Llx9xkU7tzq+vKLoWkm4u5xf3vn55VjnSd1aQ9eQnUcXiL4cnBGo
+TbOWI39EcyzgslzBdC++MPjcQTcA7p6JUVsP6oAB3FQWg54tuUo0Ec8bsM8b3Ev4
+2LmuQT5NdKHGwHsXTPtl0klk4bQk4OajHsiy1BMahpT27jWjJlMiJc+IWJ0mghkK
+Ht926s/ymfdf5HkdQ1cyvsz5tryVI3Fx78XeSYfQvuuwqp2H139pXGEkg0n6KdUO
+etdZWhe70YGNPw1yjWJT1IhUBBgRAgAMBQJOdz3tBQkT+wG4ABIHZUdQRwABAQkQ
+jHGNO1By4fUUmwCbBYr2+bBEn/L2BOcnw9Z/QFWuhRMAoKVgCFm5fadQ3Afi+UQl
+AcOphrnJ
+=443I
+-----END PGP PUBLIC KEY BLOCK-----

Makefile.in

@@ -17,6 +17,9 @@ BINDIR = $(DESTDIR)@bindir@
 # /sbin/
 SBINDIR = $(DESTDIR)@sbindir@
 
+# /lib/
+LIBDIR =  $(DESTDIR)@libdir@
+
 # /lib/ejabberd/
 EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
 
@@ -101,21 +104,73 @@ xref: all
 translations:
 	contrib/extract_translations/prepare-translation.sh -updateall
 
-doc:
-	echo making $$target in doc; \
-	(cd doc && $(MAKE) $$target) || exit 1
-
 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.'
+	'case fxml_gen:compile("tools/xmpp_codec.spec") of ok -> halt(0); _ -> halt(1) end.'
 
-DLLs := $(wildcard deps/*/priv/*.so) $(wildcard deps/*/priv/lib/*.so)
+JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),$(firstword $(1))/$(call JOIN_PATHS,$(wordlist 2,1000,$(1))),$(1))
 
-install: all
+VERSIONED_DEP=$(if $(DEP_$(1)_VERSION),$(DEP_$(1)_VERSION),$(1))
+
+ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,$(1))
+DEPS_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 3,1000,$(1))
+MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)
+TO_DEST_SINGLE=$(if $(subst XdepsX,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word 3,$(1))X),$(call DEPS_TO_DEST,$(1)),$(call ELIXIR_TO_DEST,$(1))))
+TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
+
+FILTER_DIRS=$(foreach path,$(1),$(if $(wildcard $(path)/*),,$(path)))
+FILES_WILDCARD=$(call FILTER_DIRS,$(foreach w,$(1),$(wildcard $(w))))
+
+ifeq ($(MAKECMDGOALS),copy-files-sub)
+
+DEPS:=$(sort $(shell $(REBAR) list-deps|$(SED) -e '/^=/d;s/ .*//'))
+
+DEPS_FILES=$(call FILES_WILDCARD,$(foreach DEP,$(DEPS),deps/$(DEP)/ebin/*.beam deps/$(DEP)/ebin/*.app deps/$(DEP)/priv/* deps/$(DEP)/priv/lib/* deps/$(DEP)/priv/bin/* deps/$(DEP)/include/*.hrl deps/$(DEP)/lib/*/ebin/*.beam deps/$(DEP)/lib/*/ebin/*.app))
+DEPS_FILES_FILTERED=$(filter-out %/epam deps/elixir/ebin/elixir.app,$(DEPS_FILES))
+DEPS_DIRS=$(sort deps/ $(foreach DEP,$(DEPS),deps/$(DEP)/) $(dir $(DEPS_FILES)))
+
+MAIN_FILES=$(filter-out %/configure.beam,$(call FILES_WILDCARD,ebin/*.beam ebin/*.app priv/msgs/*.msg priv/lib/* include/*.hrl))
+MAIN_DIRS=$(sort $(dir $(MAIN_FILES)) priv/bin priv/sql)
+
+define DEP_VERSION_template
+DEP_$(1)_VERSION:=$(shell $(SED) -e '/vsn/!d;s/.*, *"/$(1)-/;s/".*//' $(2) 2>/dev/null)
+endef
+
+$(foreach DEP,$(DEPS),$(eval $(call DEP_VERSION_template,$(DEP),deps/$(DEP)/ebin/$(DEP).app)))
+$(eval $(call DEP_VERSION_template,ejabberd,ebin/ejabberd.app))
+
+define COPY_template
+$(call TO_DEST,$(1)): $(1) $(call TO_DEST,$(dir $(1))) ; $$(INSTALL) -m 644 $(1) $(call TO_DEST,$(1))
+endef
+
+$(foreach file,$(DEPS_FILES_FILTERED) $(MAIN_FILES),$(eval $(call COPY_template,$(file))))
+
+$(sort $(call TO_DEST,$(MAIN_DIRS) $(DEPS_DIRS))):
+	$(INSTALL) -d $@
+
+$(call TO_DEST,deps/p1_pam/priv/bin/epam): $(LIBDIR)/%: deps/p1_pam/priv/bin/epam $(call TO_DEST,deps/p1_pam/priv/bin/)
+	$(INSTALL) -m 750 $(O_USER) $< $@
+
+$(call TO_DEST,priv/sql/lite.sql): sql/lite.sql $(call TO_DEST,priv/sql)
+	$(INSTALL) -m 644 $< $@
+
+$(call TO_DEST,priv/bin/captcha.sh): tools/captcha.sh $(call TO_DEST,priv/bin)
+	$(INSTALL) -m 750 $(O_USER) $< $@
+
+copy-files-sub2: $(call TO_DEST,$(DEPS_FILES) $(MAIN_FILES) priv/bin/captcha.sh priv/sql/lite.sql)
+
+endif
+
+copy-files:
+	$(MAKE) copy-files-sub
+
+copy-files-sub: copy-files-sub2
+
+install: all copy-files
 	#
 	# Configuration files
 	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
@@ -129,7 +184,8 @@ install: all
 		-e "s*{{sysconfdir}}*@sysconfdir@*" \
 		-e "s*{{localstatedir}}*@localstatedir@*" \
 		-e "s*{{docdir}}*@docdir@*" \
-		-e "s*{{erl}}*@ERL@*" ejabberdctl.template \
+		-e "s*{{erl}}*@ERL@*" \
+		-e "s*{{epmd}}*@EPMD@*" ejabberdctl.template \
 		> ejabberdctl.example
 	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
 		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
@@ -141,9 +197,9 @@ install: all
 	$(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
+	[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true
+	[ -f deps/elixir/bin/elixir ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/elixir $(BINDIR)/elixir || true
+	[ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix || true
 	#
 	# Init script
 	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*" \
@@ -151,44 +207,6 @@ install: all
 		> 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)
@@ -207,16 +225,9 @@ install: all
 	#
 	# Documentation
 	$(INSTALL) -d $(DOCDIR)
-	[ -f doc/dev.html ] \
-		&& $(INSTALL) -m 644 doc/dev.html $(DOCDIR) \
-		|| echo "No doc/dev.html was built"
 	[ -f doc/guide.html ] \
 		&& $(INSTALL) -m 644 doc/guide.html $(DOCDIR) \
-		|| echo "No doc/guide.html was built"
-	[ -f doc/guide.pdf ] \
-		&& $(INSTALL) -m 644 doc/guide.pdf $(DOCDIR) \
-		|| echo "No doc/guide.pdf was built"
-	$(INSTALL) -m 644 doc/*.png $(DOCDIR)
+		|| echo "Documentation not included in sources"
 	$(INSTALL) -m 644 COPYING $(DOCDIR)
 
 uninstall: uninstall-binary
@@ -326,6 +337,6 @@ test:
 quicktest:
 	$(REBAR) skip_deps=true ct suites=elixir
 
-.PHONY: src doc edoc dialyzer Makefile TAGS clean clean-rel distclean rel \
+.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

Makefile.win32

@@ -1,176 +0,0 @@
-
-include Makefile.inc
-
-ALL : build
-
-REL=..\release
-EREL=$(REL)\ejabberd-$(EJABBERD_VERSION)
-EBIN_DIR=$(EREL)\ebin
-SRC_DIR=$(EREL)\src
-PRIV_DIR=$(EREL)\priv
-SO_DIR=$(EREL)
-MSGS_DIR=$(EREL)\msgs
-WIN32_DIR=$(EREL)\win32
-DOC_DIR=$(EREL)\doc
-
-NSIS_SCRIPT=win32\ejabberd.nsi
-NSIS_HEADER=win32\ejabberd.nsh
-
-installer : $(NSIS_SCRIPT) $(NSIS_HEADER)
-	makensis $(NSIS_SCRIPT)
-
-$(NSIS_HEADER) : Makefile.inc
-	echo !define OUTFILEDIR "..\$(REL)" >$(NSIS_HEADER)
-	echo !define TESTDIR "..\$(REL)\ejabberd-$(EJABBERD_VERSION)" >>$(NSIS_HEADER)
-	echo !define VERSION "$(EJABBERD_VERSION)" >>$(NSIS_HEADER)
-
-release_clean :
-	if exist $(REL) rd /s /q $(REL)
-
-
-release : build release_clean
-	mkdir $(REL)
-	mkdir $(EREL)
-	mkdir $(EBIN_DIR)
-	copy *.beam $(EBIN_DIR)
-	@erase $(EBIN_DIR)\configure.beam
-	copy *.app $(EBIN_DIR)
-	copy *.dll $(SO_DIR)
-	mkdir $(MSGS_DIR)
-	copy msgs\*.msg $(MSGS_DIR)
-	mkdir $(WIN32_DIR)
-	copy win32\ejabberd.cfg $(EREL)
-	copy win32\inetrc $(EREL)
-	copy $(SYSTEMROOT)\system32\libeay32.dll $(EREL)
-	copy $(SYSTEMROOT)\system32\ssleay32.dll $(EREL)
-	copy win32\ejabberd.ico $(WIN32_DIR)
-	mkdir $(SRC_DIR)
-	copy *.app $(SRC_DIR)
-	copy *.erl $(SRC_DIR)
-	copy *.hrl $(SRC_DIR)
-	copy *.c $(SRC_DIR)
-	mkdir $(SRC_DIR)\eldap
-	copy eldap\eldap.* $(SRC_DIR)\eldap
-	copy eldap\ELDAPv3.asn $(SRC_DIR)\eldap
-	mkdir $(SRC_DIR)\mod_irc
-	copy mod_irc\*.erl $(SRC_DIR)\mod_irc
-	copy mod_irc\*.c $(SRC_DIR)\mod_irc
-	mkdir $(SRC_DIR)\mod_muc
-	copy mod_muc\*.erl $(SRC_DIR)\mod_muc
-	mkdir $(SRC_DIR)\mod_pubsub
-	copy mod_pubsub\*.erl $(SRC_DIR)\mod_pubsub
-	mkdir $(SRC_DIR)\mod_proxy65
-	copy mod_proxy65\*.erl $(SRC_DIR)\mod_proxy65
-	copy mod_proxy65\*.hrl $(SRC_DIR)\mod_proxy65
-	mkdir $(SRC_DIR)\stringprep
-	copy stringprep\*.erl $(SRC_DIR)\stringprep
-	copy stringprep\*.c $(SRC_DIR)\stringprep
-	copy stringprep\*.tcl $(SRC_DIR)\stringprep
-	mkdir $(SRC_DIR)\stun
-	copy stun\*.erl $(SRC_DIR)\stun
-	copy stun\*.hrl $(SRC_DIR)\stun
-	mkdir $(SRC_DIR)\tls
-	copy tls\*.erl $(SRC_DIR)\tls
-	copy tls\*.c $(SRC_DIR)\tls
-	mkdir $(SRC_DIR)\ejabberd_zlib
-	copy ejabberd_zlib\*.erl $(SRC_DIR)\ejabberd_zlib
-	copy ejabberd_zlib\*.c $(SRC_DIR)\ejabberd_zlib
-	mkdir $(SRC_DIR)\web
-	copy web\*.erl $(SRC_DIR)\web
-	mkdir $(SRC_DIR)\odbc
-	copy odbc\*.erl $(SRC_DIR)\odbc
-	copy odbc\*.sql $(EREL)
-	mkdir $(DOC_DIR)
-	copy ..\doc\*.txt $(DOC_DIR)
-	copy ..\doc\*.html $(DOC_DIR)
-	copy ..\doc\*.png $(DOC_DIR)
-
-SOURCE = expat_erl.c
-OBJECT = expat_erl.o
-DLL    = expat_erl.dll
-
-build : $(DLL) compile-beam all-recursive
-
-all-recursive :
-	cd eldap
-	nmake -nologo -f Makefile.win32
-	cd ..\mod_irc
-	nmake -nologo -f Makefile.win32
-	cd ..\mod_muc
-	nmake -nologo -f Makefile.win32
-	cd ..\mod_pubsub
-	nmake -nologo -f Makefile.win32
-	cd ..\mod_proxy65
-	nmake -nologo -f Makefile.win32
-	cd ..\stringprep
-	nmake -nologo -f Makefile.win32
-	cd ..\stun
-	nmake -nologo -f Makefile.win32
-	cd ..\tls
-	nmake -nologo -f Makefile.win32
-	cd ..\ejabberd_zlib
-	nmake -nologo -f Makefile.win32
-	cd ..\web
-	nmake -nologo -f Makefile.win32
-	cd ..\odbc
-	nmake -nologo -f Makefile.win32
-	cd ..
-
-compile-beam : XmppAddr.hrl
-	erl -s make all report -noinput -s erlang halt
-
-XmppAddr.hrl : XmppAddr.asn1
-	erlc -bber_bin +der +compact_bit_string +optimize +noobj XmppAddr.asn1
-
-CLEAN : clean-recursive clean-local
-
-clean-local :
-	-@erase $(OBJECT)
-	-@erase $(DLL)
-	-@erase expat_erl.exp
-	-@erase expat_erl.lib
-	-@erase *.beam
-	-@erase XmppAddr.asn1db
-	-@erase XmppAddr.erl
-	-@erase XmppAddr.hrl
-
-clean-recursive :
-	cd eldap
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\mod_irc
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\mod_muc
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\mod_pubsub
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\mod_proxy65
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\stringprep
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\stun
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\tls
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\ejabberd_zlib
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\web
-	nmake -nologo -f Makefile.win32 clean
-	cd ..\odbc
-	nmake -nologo -f Makefile.win32 clean
-	cd ..
-
-distclean : release_clean clean
-	-@erase $(NSIS_HEADER)
-	-@erase Makefile.inc
-
-CC=cl.exe
-CC_FLAGS=-nologo -D__WIN32__ -DWIN32 -DWINDOWS -D_WIN32 -DNT $(EXPAT_FLAG) -MD -Ox -I"$(ERLANG_DIR)\usr\include" -I"$(EI_DIR)\include" -I"$(EXPAT_DIR)\source\lib"
-
-LD=link.exe
-LD_FLAGS=-release -nologo -incremental:no -dll "$(EI_DIR)\lib\ei_md.lib" "$(EI_DIR)\lib\erl_interface_md.lib" "$(EXPAT_LIB)" MSVCRT.LIB kernel32.lib advapi32.lib gdi32.lib user32.lib comctl32.lib comdlg32.lib shell32.lib
-
-$(DLL) : $(OBJECT)
-	$(LD) $(LD_FLAGS) -out:$@ $<
-
-$(OBJECT) : $(SOURCE)
-	$(CC) $(CC_FLAGS) -c -Fo$@ $<

README

@@ -1,5 +1,7 @@
-ejabberd Community Edition [![Build Status](https://travis-ci.org/processone/ejabberd.svg?branch=master)](https://travis-ci.org/processone/ejabberd)
-=========================================
+ejabberd Community Edition 
+==========================
+
+[![Build Status](https://travis-ci.org/processone/ejabberd.svg?branch=master)](https://travis-ci.org/processone/ejabberd) [![Hex version](https://img.shields.io/hexpm/v/ejabberd.svg "Hex version")](https://hex.pm/packages/ejabberd)
 
 ejabberd is a distributed, fault-tolerant technology that allows the creation
 of large-scale instant messaging applications. The server can reliably support
@@ -106,8 +108,8 @@ To compile ejabberd you need:
  - 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.
+ - Erlang/OTP 17.1 or higher.
+ - OpenSSL 1.0.0 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
@@ -152,6 +154,18 @@ 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.
+
+To start ejabberd in development mode from the repository directory, you can
+type a command like:
+
+    EJABBERD_CONFIG_PATH=ejabberd.yml erl -pa ebin -pa deps/*/ebin -pa test -pa deps/elixir/lib/*/ebin/ -s ejabberd
+
 Links
 -----
 

config/config.exs

@@ -0,0 +1,10 @@
+use Mix.Config
+
+# This is standard path in the context of ejabberd release
+config :ejabberd,
+  file: "config/ejabberd.yml",
+  log_path: 'log/ejabberd.log'
+ 
+# Customize Mnesia directory:
+config :mnesia,
+  dir: 'mnesiadb/'

configure.ac

@@ -3,9 +3,11 @@
 
 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_MIN="6.1 (Erlang/OTP 17.1)"
 REQUIRE_ERLANG_MAX="9.0.0 (No Max)"
 
+AC_CONFIG_MACRO_DIR([m4])
+
 # Checks for programs.
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
@@ -28,6 +30,7 @@ fi
 
 AC_PATH_TOOL(ERL, erl, , [${extra_erl_path}$PATH])
 AC_PATH_TOOL(ERLC, erlc, , [${extra_erl_path}$PATH])
+AC_PATH_TOOL(EPMD, epmd, , [${extra_erl_path}$PATH])
 
 AC_ERLANG_NEED_ERL
 AC_ERLANG_NEED_ERLC
@@ -81,14 +84,6 @@ AC_ARG_ENABLE(roster_gateway_workaround,
   *) 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
@@ -106,10 +101,10 @@ AC_ARG_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)])],
+[AC_HELP_STRING([--enable-all], [same as --enable-odbc --enable-mysql --enable-pgsql --enable-sqlite --enable-pam --enable-zlib --enable-riak --enable-redis --enable-elixir --enable-iconv --enable-debug --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 ;;
+  yes) odbc=true mysql=true pgsql=true sqlite=true pam=true zlib=true riak=true redis=true elixir=true iconv=true debug=true tools=true ;;
+  no) odbc=false mysql=false pgsql=false sqlite=false pam=false zlib=false riak=false redis=false elixir=false iconv=false debug=false tools=false ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
 esac],[])
 
@@ -121,14 +116,6 @@ AC_ARG_ENABLE(tools,
   *) 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
@@ -193,14 +180,6 @@ AC_ARG_ENABLE(redis,
   *) 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
@@ -225,13 +204,13 @@ AC_ARG_ENABLE(debug,
   *) 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)])],
+AC_ARG_ENABLE(latest_deps,
+[AC_HELP_STRING([--enable-latest-deps], [makes rebar use latest commits for dependences instead of tagged versions (default: no)])],
 [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])
+  yes) latest_deps=true ;;
+  no)  latest_deps=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-latest-deps) ;;
+esac],[if test "x$latest_deps" = "x"; then latest_deps=false; fi])
 
 AC_CONFIG_FILES([Makefile
 		 vars.config
@@ -262,9 +241,7 @@ 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)
@@ -274,11 +251,13 @@ 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_SUBST(latest_deps)
+AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
 
 AC_OUTPUT

contrib/extract_translations/extract_translations.erl

@@ -115,6 +115,12 @@ parse_form(Dir, File, Form, Used) ->
 	 {string, Line, Value}
 	} ->
 	    ets:insert(vars, {Name, Value, Line});
+        {match,
+         _,
+         {var, _, Name},
+         {bin,Line,[{bin_element,_,{string,_,Value},_,_}]}
+        } ->
+            ets:insert(vars, {Name, Value, Line});
 	L when is_list(L) ->
 	    lists:foreach(
 	      fun(F) ->
@@ -236,9 +242,7 @@ print_usage() ->
 print_po_header(File) ->
     MsgProps = get_msg_header_props(File),
     {Language, [LastT | AddT]} = prepare_props(MsgProps),
-    application:load(ejabberd),
-    {ok, Version} = application:get_key(ejabberd, vsn),
-    print_po_header(Version, Language, LastT, AddT).
+    print_po_header(Language, LastT, AddT).
 
 get_msg_header_props(File) ->
     {ok, F} = file:open(File, [read]),
@@ -268,12 +272,11 @@ prepare_props(MsgProps) ->
     Authors = proplists:get_all_values("Author:", MsgProps),
     {Language, Authors}.
 
-print_po_header(Version, Language, LastTranslator, AdditionalTranslatorsList) ->
+print_po_header(Language, LastTranslator, AdditionalTranslatorsList) ->
     AdditionalTranslatorsString = build_additional_translators(AdditionalTranslatorsList),
     HeaderString =
 	"msgid \"\"\n"
 	"msgstr \"\"\n"
-	"\"Project-Id-Version: " ++ Version ++ "\\n\"\n"
 	++ "\"X-Language: " ++ Language ++ "\\n\"\n"
 	"\"Last-Translator: " ++ LastTranslator ++ "\\n\"\n"
 	++ AdditionalTranslatorsString ++

contrib/extract_translations/prepare-translation.sh

@@ -157,7 +157,7 @@ extract_lang_srcmsg2po ()
 	echo $MSGS_PATH
 
 	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
+	$ERL -pa $EXTRACT_DIR -pa $EBIN_DIR -pa $EJA_SRC_DIR -pa ../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
 	
@@ -176,7 +176,7 @@ extract_lang_src2pot ()
 	echo "" >>$MSGS_PATH
 
 	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 >$POT_PATH.1
+	$ERL -pa $EXTRACT_DIR -pa $EBIN_DIR -pa $EJA_SRC_DIR -pa ../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

cover.spec

@@ -0,0 +1,5 @@
+{level, details}.
+{incl_dirs, ["src", "ebin"]}.
+{excl_mods, [eldap, 'ELDAPv3']}.
+{export, "logs/all.coverdata"}.
+

doc/Makefile

@@ -1,62 +0,0 @@
-# $Id$
-
-SHELL = /bin/sh
-
-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:
-	@printf '%s\n' "Notes for the releaser:"
-	@printf '%s\n' "* Do not forget to add a link to the release notes in guide.tex"
-	@printf '%s\n' "* Do not forget to update the version number in ebin/ejabberd.app!"
-	@printf '%s\n' "* Do not forget to update the features in introduction.tex (including \new{} and \improved{} tags)."
-	@printf '%s\n' "Press any key to continue"
-	##@read foo
-	@printf '%s\n' "% ejabberd version (automatically generated)." > version.tex
-	@printf '%s\n' "\newcommand{\version}{"`sed '/vsn/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../ebin/ejabberd.app`"}" >> version.tex
-	@printf '%s'   "% Contributed modules (automatically generated)." > contributed_modules.tex
-	@printf '%b\n' "$(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

doc/api/Makefile

@@ -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

doc/api/overview.edoc

@@ -1,10 +0,0 @@
-@author Mickael Remond <mickael.remond@process-one.net>
-  [http://www.process-one.net/]
-@copyright 2013 ProcessOne
-@version {@vsn}, {@date} {@time}
-@title ejabberd Development API Documentation
-
-@doc
-== Introduction ==
-
-TODO: Insert content from Jerome documentation.

doc/api/process-one.css

@@ -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;
-}

doc/dev.html

@@ -1,437 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="generator" content="hevea 2.09">
-<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;}
-.footnotetext{margin:0ex; padding:0ex;}
-div.footnotetext P{margin:0px; text-indent:1em;}
-.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}
-.titlemain{margin:1ex 2ex 2ex 1ex;}
-.titlerest{margin:0ex 2ex;}
-.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;margin-bottom:2px;margin-top:2px}
-td table{margin:auto;}
-table{border-collapse:collapse;}
-td{padding:0;}
-.cellpadding0 tr td{padding:0;}
-.cellpadding1 tr td{padding:1px;}
-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; border:2px solid green;}
-.display{border-collapse:separate;border-spacing:2px;width:auto; border:none;}
-.dcell{white-space:nowrap;padding:0px; 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>
-<title>Ejabberd community 14.05-120-gedfb5fc Developers Guide
-</title>
-</head>
-<body >
-<!--HEVEA command line is: /usr/bin/hevea -fix -pedantic dev.tex -->
-<!--CUT STYLE article--><!--CUT DEF section 1 --><p><a id="titlepage"></a>
-
-</p><table class="title"><tr><td style="padding:1ex"><h1 class="titlemain">Ejabberd community 14.05-120-gedfb5fc Developers Guide</h1><h3 class="titlerest">Alexey Shchepin <br>
- <a href="mailto:alexey@sevcom.net"><span style="font-family:monospace">mailto:alexey@sevcom.net</span></a> <br>
- <a href="xmpp:aleksey@jabber.ru"><span style="font-family:monospace">xmpp:aleksey@jabber.ru</span></a></h3></td></tr>
-</table><div class="center">
-
-<img src="logo.png" alt="logo.png">
-
-
-</div><blockquote class="quotation"><span style="font-style:italic">I can thoroughly recommend ejabberd for ease of setup &#X2013;
-Kevin Smith, Current maintainer of the Psi project</span></blockquote><!--TOC section id="intro" Contents-->
-<h2 id="intro" class="section">Contents</h2><!--SEC END --><ul class="toc"><li class="li-toc">
-<a href="#sec2">1&#XA0;&#XA0;Key Features</a>
-</li><li class="li-toc"><a href="#sec3">2&#XA0;&#XA0;Additional Features</a>
-</li><li class="li-toc"><a href="#sec4">3&#XA0;&#XA0;How it Works</a>
-<ul class="toc"><li class="li-toc">
-<a href="#sec5">3.1&#XA0;&#XA0;Router</a>
-</li><li class="li-toc"><a href="#sec6">3.2&#XA0;&#XA0;Local Router</a>
-</li><li class="li-toc"><a href="#sec7">3.3&#XA0;&#XA0;Session Manager</a>
-</li><li class="li-toc"><a href="#sec8">3.4&#XA0;&#XA0;S2S Manager</a>
-</li></ul>
-</li><li class="li-toc"><a href="#sec9">4&#XA0;&#XA0;Authentication</a>
-<ul class="toc">
-<ul class="toc"><li class="li-toc">
-<a href="#sec10">4.0.1&#XA0;&#XA0;External</a>
-</li></ul>
-</ul>
-</li><li class="li-toc"><a href="#sec11">5&#XA0;&#XA0;XML Representation</a>
-</li><li class="li-toc"><a href="#sec12">6&#XA0;&#XA0;Module <span style="font-family:monospace">xml</span></a>
-</li><li class="li-toc"><a href="#sec13">7&#XA0;&#XA0;Module <span style="font-family:monospace">xml_stream</span></a>
-</li><li class="li-toc"><a href="#sec14">8&#XA0;&#XA0;Modules</a>
-<ul class="toc"><li class="li-toc">
-<a href="#sec15">8.1&#XA0;&#XA0;Module gen_iq_handler</a>
-</li><li class="li-toc"><a href="#sec16">8.2&#XA0;&#XA0;Services</a>
-</li></ul>
-</li></ul><p>Introduction
-</p><p><span style="font-family:monospace">ejabberd</span> is a free and open source instant messaging server written in <a href="http://www.erlang.org/">Erlang/OTP</a>.</p><p><span style="font-family:monospace">ejabberd</span> is cross-platform, distributed, fault-tolerant, and based on open standards to achieve real-time communication.</p><p><span style="font-family:monospace">ejabberd</span> is designed to be a rock-solid and feature rich XMPP server.</p><p><span style="font-family:monospace">ejabberd</span> is suitable for small deployments, whether they need to be scalable or not, as well as extremely big deployments.</p>
-<!--TOC section id="sec2" Key Features-->
-<h2 id="sec2" class="section">1&#XA0;&#XA0;Key Features</h2><!--SEC END --><p>
-<a id="keyfeatures"></a>
-</p><p><span style="font-family:monospace">ejabberd</span> is:
-</p><ul class="itemize"><li class="li-itemize">
-Cross-platform: <span style="font-family:monospace">ejabberd</span> runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.</li><li class="li-itemize">Distributed: You can run <span style="font-family:monospace">ejabberd</span> 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 <span style="font-family:monospace">ejabberd</span> 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: <span style="font-family:monospace">ejabberd</span> 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: <span style="font-family:monospace">ejabberd</span> 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: <span style="font-family:monospace">ejabberd</span> 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 id="sec3" Additional Features-->
-<h2 id="sec3" class="section">2&#XA0;&#XA0;Additional Features</h2><!--SEC END --><p>
-<a id="addfeatures"></a>
-</p><p>Moreover, <span style="font-family:monospace">ejabberd</span> 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 <span style="font-family:monospace">ejabberd</span> 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><li class="li-itemize">Riak NoSQL database 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, ODBC and Riak. </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">SIP support.
-</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 id="sec4" How it Works-->
-<h2 id="sec4" class="section">3&#XA0;&#XA0;How it Works</h2><!--SEC END --><p>
-<a id="howitworks"></a></p><p>A XMPP domain is served by one or more <span style="font-family:monospace">ejabberd</span> 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
-<span style="font-family:monospace">~ejabberd/.erlang.cookie</span> 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 <span style="font-family:monospace">ejabberd</span> 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 id="sec5" Router-->
-<h3 id="sec5" class="subsection">3.1&#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 <span style="font-family:monospace">ejabberd</span> node or
-process. If it does not exists in either tables, then it sent to the S2S
-manager.</p>
-<!--TOC subsection id="sec6" Local Router-->
-<h3 id="sec6" class="subsection">3.2&#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 id="sec7" Session Manager-->
-<h3 id="sec7" class="subsection">3.3&#XA0;&#XA0;Session Manager</h3><!--SEC END --><p>This module routes packets to local users. It searches for what user resource
-packet must be sent 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 id="sec8" S2S Manager-->
-<h3 id="sec8" class="subsection">3.4&#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 id="sec9" Authentication-->
-<h2 id="sec9" class="section">4&#XA0;&#XA0;Authentication</h2><!--SEC END -->
-<!--TOC subsubsection id="sec10" External-->
-<h4 id="sec10" class="subsubsection">4.0.1&#XA0;&#XA0;External</h4><!--SEC END --><p>
-<a id="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><li class="li-itemize">tryregister:User:Server:Password (try to register an account)
-</li><li class="li-itemize">removeuser:User:Server (remove this account)
-</li><li class="li-itemize">removeuser3:User:Server:Password (remove this account if the password is correct)
-</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 id="sec11" XML Representation-->
-<h2 id="sec11" class="section">5&#XA0;&#XA0;XML Representation</h2><!--SEC END --><p>
-<a id="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 id="sec12" Module <span style="font-family:monospace">xml</span>-->
-<h2 id="sec12" class="section">6&#XA0;&#XA0;Module <span style="font-family:monospace">xml</span></h2><!--SEC END --><p>
-<a id="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 <span style="font-family:monospace">El</span>.</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 <span style="font-family:monospace">S</span> 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><span style="font-family:monospace">EList</span> 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 <span style="font-family:monospace">Path</span> is empty, then returns <span style="font-family:monospace">El</span>. Else sequentially
-consider elements of <span style="font-family:monospace">Path</span>. Each element is one of:
-<dl class="description"><dt class="dt-description">
-</dt><dd class="dd-description"><code>{elem, Name}</code> <span style="font-family:monospace">Name</span> is name of subelement of
-<span style="font-family:monospace">El</span>, 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 <span style="font-family:monospace">El</span> have attribute <span style="font-family:monospace">Name</span>, 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 <span style="font-family:monospace">El</span>.
-</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 id="sec13" Module <span style="font-family:monospace">xml_stream</span>-->
-<h2 id="sec13" class="section">7&#XA0;&#XA0;Module <span style="font-family:monospace">xml_stream</span></h2><!--SEC END --><p>
-<a id="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 <span style="font-family:monospace">Str</span> using XML parser, returns either parsed element or error
-tuple.
-</dd></dl>
-<!--TOC section id="sec14" Modules-->
-<h2 id="sec14" class="section">8&#XA0;&#XA0;Modules</h2><!--SEC END --><p>
-<a id="emods"></a></p>
-<!--TOC subsection id="sec15" Module gen_iq_handler-->
-<h3 id="sec15" class="subsection">8.1&#XA0;&#XA0;Module gen_iq_handler</h3><!--SEC END --><p>
-<a id="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 id="sec16" Services-->
-<h3 id="sec16" class="subsection">8.2&#XA0;&#XA0;Services</h3><!--SEC END --><p>
-<a id="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 style="height: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><span style="font-size:small"><sup>E</sup></span></em><em>V</em><em><span style="font-size:small"><sup>E</sup></span></em><em>A</em></a><em>.</em></blockquote></body>
-</html>

doc/dev.tex

@@ -1,470 +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 sent 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)
-    \item tryregister:User:Server:Password (try to register an account)
-    \item removeuser:User:Server (remove this account)
-    \item removeuser3:User:Server:Password (remove this account if the password is correct)
-    \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}

doc/features.html

@@ -1,143 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<meta name="generator" content="hevea 2.09">
-<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;}
-.footnotetext{margin:0ex; padding:0ex;}
-div.footnotetext P{margin:0px; text-indent:1em;}
-.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}
-.titlemain{margin:1ex 2ex 2ex 1ex;}
-.titlerest{margin:0ex 2ex;}
-.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;margin-bottom:2px;margin-top:2px}
-td table{margin:auto;}
-table{border-collapse:collapse;}
-td{padding:0;}
-.cellpadding0 tr td{padding:0;}
-.cellpadding1 tr td{padding:1px;}
-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; border:2px solid green;}
-.display{border-collapse:separate;border-spacing:2px;width:auto; border:none;}
-.dcell{white-space:nowrap;padding:0px; 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>
-<title>Ejabberd community 14.05-120-gedfb5fc Feature Sheet
-</title>
-</head>
-<body >
-<!--HEVEA command line is: /usr/bin/hevea -fix -pedantic features.tex -->
-<!--CUT STYLE article--><!--CUT DEF section 1 --><p><a id="titlepage"></a>
-
-</p><table class="title"><tr><td style="padding:1ex"><h1 class="titlemain">Ejabberd community 14.05-120-gedfb5fc Feature Sheet</h1><h3 class="titlerest">Sander Devrieze <br>
- <a href="mailto:s.devrieze@pandora.be"><span style="font-family:monospace">mailto:s.devrieze@pandora.be</span></a> <br>
- <a href="xmpp:sander@devrieze.dyndns.org"><span style="font-family:monospace">xmpp:sander@devrieze.dyndns.org</span></a></h3></td></tr>
-</table><div class="center">
-
-<img src="logo.png" alt="logo.png">
-
-
-</div><blockquote class="quotation"><span style="color:#921700"><span style="font-style:italic">I can thoroughly recommend ejabberd for ease of setup &#X2013;
-Kevin Smith, Current maintainer of the Psi project</span></span></blockquote><p>Introduction
-<a id="intro"></a></p><blockquote class="quotation"><span style="color:#921700"><span style="font-style:italic">I just tried out ejabberd and was impressed both by ejabberd itself and the language it is written in, Erlang. &#X2014;
-Joeri</span></span></blockquote><p><span style="font-family:monospace">ejabberd</span> is a <span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">free and open source</span></span></span> instant messaging server written in <a href="http://www.erlang.org/">Erlang/OTP</a>.</p><p><span style="font-family:monospace">ejabberd</span> is <span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">cross-platform</span></span></span>, distributed, fault-tolerant, and based on open standards to achieve real-time communication.</p><p><span style="font-family:monospace">ejabberd</span> is designed to be a <span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">rock-solid and feature rich</span></span></span> XMPP server.</p><p><span style="font-family:monospace">ejabberd</span> is suitable for small deployments, whether they need to be <span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">scalable</span></span></span> or not, as well as extremely big deployments.</p>
-<!--TOC section id="sec1" Key Features-->
-<h2 id="sec1" class="section">Key Features</h2><!--SEC END --><p>
-<a id="keyfeatures"></a>
-</p><blockquote class="quotation"><span style="color:#921700"><span style="font-style:italic">Erlang seems to be tailor-made for writing stable, robust servers. &#X2014;
-Peter Saint-Andr&#XE9;, Executive Director of the Jabber Software Foundation</span></span></blockquote><p><span style="font-family:monospace">ejabberd</span> is:
-</p><ul class="itemize"><li class="li-itemize">
-<span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">Cross-platform:</span></span></span> <span style="font-family:monospace">ejabberd</span> runs under Microsoft Windows and Unix derived systems such as Linux, FreeBSD and NetBSD.</li><li class="li-itemize"><span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">Distributed:</span></span></span> You can run <span style="font-family:monospace">ejabberd</span> 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"><span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">Fault-tolerant:</span></span></span> You can deploy an <span style="font-family:monospace">ejabberd</span> 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"><span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">Administrator Friendly:</span></span></span> <span style="font-family:monospace">ejabberd</span> 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"><span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">Internationalized:</span></span></span> <span style="font-family:monospace">ejabberd</span> 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"><span style="font-weight:bold"><span style="font-size:large"><span style="color:#001376">Open Standards:</span></span></span> <span style="font-family:monospace">ejabberd</span> 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 id="sec2" Additional Features-->
-<h2 id="sec2" class="section">Additional Features</h2><!--SEC END --><p>
-<a id="addfeatures"></a>
-</p><blockquote class="quotation"><span style="color:#921700"><span style="font-style:italic">ejabberd is making inroads to solving the "buggy incomplete server" problem &#X2014;
-Justin Karneges, Founder of the Psi and the Delta projects</span></span></blockquote><p>Moreover, <span style="font-family:monospace">ejabberd</span> 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 <span style="font-family:monospace">ejabberd</span> 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><li class="li-itemize">Riak NoSQL database 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, ODBC and Riak. </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">SIP support.
-</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 style="height: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><span style="font-size:small"><sup>E</sup></span></em><em>V</em><em><span style="font-size:small"><sup>E</sup></span></em><em>A</em></a><em>.</em></blockquote></body>
-</html>

doc/features.tex

@@ -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

doc/flow.dot

@@ -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";
-}

doc/introduction.tex

@@ -1,135 +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://tools.ietf.org/html/rfc3490}{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{}
-\item Riak NoSQL database support.
-\end{itemize}
-\item Authentication
-\begin{itemize}
-\item Internal Authentication.
-\item PAM, LDAP, ODBC and Riak.  %%\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 SIP support.
-\item Component support: interface with networks such as AIM, ICQ and MSN installing special tranports.
-\end{itemize}
-\end{itemize}

ejabberd.service.template

@@ -7,7 +7,7 @@ User=ejabberd
 Group=ejabberd
 LimitNOFILE=16000
 RestartSec=5
-ExecStart=/bin/sh @ctlscriptpath@/ejabberdctl start
+ExecStart=@ctlscriptpath@/ejabberdctl start
 ExecStop=@ctlscriptpath@/ejabberdctl stop
 ExecReload=@ctlscriptpath@/ejabberdctl reload_config
 Type=oneshot

ejabberd.yml.example

@@ -1,5 +1,5 @@
 ###
-###               ejabberd configuration file
+###'              ejabberd configuration file
 ###
 ###
 
@@ -24,8 +24,8 @@
 ###   > Art thou not Romeo,
 ###     and a Montague?
 
-###   =======
-###   LOGGING
+###.  =======
+###'  LOGGING
 
 ##
 ## loglevel: Verbosity of log files generated by ejabberd.
@@ -72,9 +72,18 @@ log_rate_limit: 100
 ## watchdog_admins:
 ##   - "bob@example.com"
 
+###.  ===============
+###'  NODE PARAMETERS
 
-###   ================
-###   SERVED HOSTNAMES
+##
+## 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.
@@ -94,8 +103,8 @@ hosts:
 ##
 ## route_subdomains: s2s
 
-###   ===============
-###   LISTENING PORTS
+###.  ===============
+###'  LISTENING PORTS
 
 ##
 ## listen: The ports ejabberd will listen on, which service each is handled
@@ -158,6 +167,7 @@ listen:
   ## - 
   ##   port: 4560
   ##   module: ejabberd_xmlrpc
+  ##   access_commands: {}
   - 
     port: 5280
     module: ejabberd_http
@@ -169,6 +179,9 @@ listen:
     ## register: true
     captcha: true
 
+###.  ==================
+###'  S2S GLOBAL OPTIONS
+
 ##
 ## s2s_use_starttls: Enable STARTTLS + Dialback for S2S connections.
 ## Allowed values are: false optional required required_trusted
@@ -214,8 +227,8 @@ listen:
 ##   - ipv6
 ## outgoing_s2s_timeout: 10000
 
-###   ==============
-###   AUTHENTICATION
+###.  ==============
+###'  AUTHENTICATION
 
 ##
 ## auth_method: Method used to authenticate the users.
@@ -241,10 +254,10 @@ auth_method: internal
 ## extauth_program: "/path/to/authentication/script"
 
 ##
-## Authentication using ODBC
+## Authentication using SQL
 ## Remember to setup a database in the next section.
 ##
-## auth_method: odbc
+## auth_method: sql
 
 ##
 ## Authentication using PAM
@@ -305,8 +318,8 @@ auth_method: internal
 ##       - internal
 ##       - anonymous
 
-###   ==============
-###   DATABASE SETUP
+###.  ==============
+###'  DATABASE SETUP
 
 ## ejabberd by default uses the internal Mnesia database,
 ## so you do not necessarily need this section.
@@ -317,26 +330,26 @@ auth_method: internal
 ##
 ## MySQL server:
 ##
-## odbc_type: mysql
-## odbc_server: "server"
-## odbc_database: "database"
-## odbc_username: "username"
-## odbc_password: "password"
+## sql_type: mysql
+## sql_server: "server"
+## sql_database: "database"
+## sql_username: "username"
+## sql_password: "password"
 ##
 ## If you want to specify the port:
-## odbc_port: 1234
+## sql_port: 1234
 
 ##
 ## PostgreSQL server:
 ##
-## odbc_type: pgsql
-## odbc_server: "server"
-## odbc_database: "database"
-## odbc_username: "username"
-## odbc_password: "password"
+## sql_type: pgsql
+## sql_server: "server"
+## sql_database: "database"
+## sql_username: "username"
+## sql_password: "password"
 ##
 ## If you want to specify the port:
-## odbc_port: 1234
+## sql_port: 1234
 ##
 ## If you use PostgreSQL, have a large database, and need a
 ## faster but inexact replacement for "select count(*) from users"
@@ -346,28 +359,28 @@ auth_method: internal
 ##
 ## SQLite:
 ##
-## odbc_type: sqlite
-## odbc_database: "/path/to/database.db"
+## sql_type: sqlite
+## sql_database: "/path/to/database.db"
 
 ##
 ## ODBC compatible or MSSQL server:
 ##
-## odbc_type: odbc
-## odbc_server: "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"
+## sql_type: odbc
+## sql_server: "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"
 
 ##
 ## Number of connections to open to the database for each virtual host
 ##
-## odbc_pool_size: 10
+## sql_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
+## sql_keepalive_interval: undefined
 
-###   ===============
-###   TRAFFIC SHAPERS
+###.  ===============
+###'  TRAFFIC SHAPERS
 
 shaper:
   ##
@@ -395,14 +408,14 @@ acl:
   ##
   ## admin:
   ##   user:
-  ##     - "aleksey": "localhost"
-  ##     - "ermine": "example.org"
+  ##     - "aleksey@localhost"
+  ##     - "ermine@example.org"
   ##
   ## Blocked users
   ##
   ## blocked:
   ##   user:
-  ##     - "baduser": "example.org"
+  ##     - "baduser@example.org"
   ##     - "test"
 
   ## Local users: don't modify this.
@@ -418,7 +431,7 @@ acl:
   ##     - "jabber.org"
   ## aleksey:
   ##   user:
-  ##     - "aleksey": "jabber.ru"
+  ##     - "aleksey@jabber.ru"
   ## test:
   ##   user_regexp: "^test"
   ##   user_glob: "test*"
@@ -446,61 +459,61 @@ acl:
 ##     acl:
 ##       admin:
 ##         user:
-##           - "bob-local": "localhost"
+##           - "bob-local@localhost"
 
-###   ============
-###   ACCESS RULES
-access:
+###.  ============
+###'  SHAPER RULES
+
+shaper_rules:
   ## Maximum number of simultaneous sessions allowed for a single user:
-  max_user_sessions: 
-    all: 10
+  max_user_sessions: 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
+  max_user_offline_messages:
+    - 5000: admin
+    - 100
   ## For C2S connections, all users except admins use the "normal" shaper
-  c2s_shaper: 
-    admin: none
-    all: normal
+  c2s_shaper:
+    - none: admin
+    - normal
   ## All S2S connections use the "fast" shaper
-  s2s_shaper: 
-    all: fast
+  s2s_shaper: fast
+
+###.  ============
+###'  ACCESS RULES
+access_rules:
+  ## This rule allows access only for local users:
+  local:
+    - allow: local
+  ## Only non-blocked users can use c2s connections:
+  c2s:
+    - deny: blocked
+    - allow
   ## Only admins can send announcement messages:
-  announce: 
-    admin: allow
+  announce:
+    - allow: admin
   ## 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
+    - allow: admin
   ## 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
+    - allow: local
   ## Only accounts on the local ejabberd server can create Pubsub nodes:
   pubsub_createnode: 
-    local: allow
+    - allow: local
   ## In-band registration allows registration of any possible username.
   ## To disable in-band registration, replace 'allow' with 'deny'.
   register: 
-    all: allow
+    - allow
   ## Only allow to register from localhost
   trusted_network: 
-    loopback: allow
+    - allow: loopback
   ## Do not establish S2S connections with bad servers
   ## s2s: 
-  ##   bad_servers: deny
-  ##   all: allow
+  ##   - deny:
+  ##     - ip: "XXX.XXX.XXX.XXX/32"
+  ##   - deny:
+  ##     - ip: "XXX.XXX.XXX.XXX/32"
+  ##   - allow
 
 ## By default the frequency of account registrations from the same IP
 ## is limited to 1 account every 10 minutes. To disable, specify: infinity
@@ -513,13 +526,13 @@ access:
 ##   "localhost":
 ##     access:
 ##       c2s:
-##         admin: allow
-##         all: deny
+##         - allow: admin
+##         - deny
 ##       register:
-##         all: deny
+##         - deny
 
-###   ================
-###   DEFAULT LANGUAGE
+###.  ================
+###'  DEFAULT LANGUAGE
 
 ##
 ## language: Default language used for server messages.
@@ -533,8 +546,8 @@ language: "en"
 ##   "localhost":
 ##     language: "ru"
 
-###   =======
-###   CAPTCHA
+###.  =======
+###'  CAPTCHA
 
 ##
 ## Full path to a script that generates the image.
@@ -551,8 +564,8 @@ language: "en"
 ##
 ## captcha_limit: 5
 
-###   =======
-###   MODULES
+###.  =======
+###'  MODULES
 
 ##
 ## Modules enabled in all ejabberd virtual hosts.
@@ -565,9 +578,7 @@ modules:
   mod_blocking: {} # requires mod_privacy
   mod_caps: {}
   mod_carboncopy: {}
-  mod_client_state:
-    drop_chat_states: true
-    queue_presence: false
+  mod_client_state: {}
   mod_configure: {} # requires mod_adhoc
   mod_disco: {}
   ## mod_echo: {}
@@ -579,10 +590,12 @@ modules:
   mod_last: {}
   mod_muc: 
     ## host: "conference.@HOST@"
-    access: muc
+    access:
+      - allow
+    access_admin:
+      - allow: admin
     access_create: muc_create
     access_persistent: muc_create
-    access_admin: muc_admin
   ## mod_muc_log: {}
   ## mod_multicast: {}
   mod_offline: 
@@ -605,50 +618,45 @@ modules:
       - "flat"
       - "hometree"
       - "pep" # pep requires mod_caps
-  mod_register: 
+  ## mod_register:
     ##
     ## Protect In-Band account registrations with CAPTCHA.
     ##
-    ## captcha_protected: true
-
+    ##   captcha_protected: true
     ##
     ## Set the minimum informational entropy for passwords.
     ##
-    ## password_strength: 32
-
+    ##   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.
-
+    ##   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"
-
+    ##   registration_watchers:
+    ##     - "admin1@example.org"
     ##
     ## Only clients in the server machine can register accounts
     ##
-    ip_access: trusted_network
-
+    ##   ip_access: trusted_network
     ##
     ## Local c2s or remote s2s users cannot register accounts
     ##
-    ## access_from: deny
-
-    access: register
+    ##   access_from: deny
+    ##   access: register
   mod_roster: {}
   mod_shared_roster: {}
   mod_stats: {}
   mod_time: {}
-  mod_vcard: {}
+  mod_vcard:
+    search: false
   mod_version: {}
 
 ##
@@ -668,7 +676,9 @@ modules:
 
 allow_contrib_modules: true
 
+###.
+###'
 ### Local Variables:
 ### mode: yaml
 ### End:
-### vim: set filetype=yaml tabstop=8
+### vim: set filetype=yaml tabstop=8 foldmarker=###',###. foldmethod=marker:

ejabberdctl.cfg.example

@@ -169,6 +169,18 @@
 #
 #CONTRIB_MODULES_PATH=/opt/ejabberd-modules
 
+#.
+#' CONTRIB_MODULES_CONF_DIR: configuration directory for contributed modules
+#
+# Specify the full path to the configuration directory for contributed ejabberd
+# modules. In order to configure a module named mod_foo, a mod_foo.yml file can
+# be created in this directory. This file will then be used instead of the
+# default configuration file provided with the module.
+#
+# Default: $CONTRIB_MODULES_PATH/conf
+#
+#CONTRIB_MODULES_CONF_DIR=/etc/ejabberd/modules
+
 #.
 #'
 # vim: foldmarker=#',#. foldmethod=marker:

ejabberdctl.template

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # define default configuration
 POLL=true
@@ -13,11 +13,9 @@ ERLANG_NODE=ejabberd@localhost
 SCRIPT_DIR=`cd ${0%/*} && pwd`
 ERL={{erl}}
 IEX={{bindir}}/iex
-EPMD={{bindir}}/epmd
+EPMD={{epmd}}
 INSTALLUSER={{installuser}}
-
-# Compatibility in ZSH
-#setopt shwordsplit 2>/dev/null
+ERL_LIBS={{libdir}}
 
 # check the proper system user is used if defined
 if [ "$INSTALLUSER" != "" ] ; then
@@ -33,30 +31,31 @@ if [ "$INSTALLUSER" != "" ] ; then
         fi
     done
     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
-        EXEC_CMD="sh -c"
+        EXEC_CMD="bash -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"
+    EXEC_CMD="bash -c"
 fi
 
 # parse command line parameters
-ARGS=""
+declare -a ARGS=()
 while [ $# -ne 0 ] ; do
-    PARAM=$1
+    PARAM="$1"
     shift
     case $PARAM in
         --) break ;;
+        --no-timeout) EJABBERD_NO_TIMEOUT="--no-timeout" ;;
         --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" ;;
+        *) ARGS=("${ARGS[@]}" "$PARAM") ;;
     esac
 done
 
@@ -84,36 +83,18 @@ if [ "$EJABBERD_DOC_PATH" = "" ] ; then
 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
+if [ "{{release}}" != "true" -a "$EJABBERD_BIN_PATH" = "" ] ; then
+    EJABBERD_BIN_PATH={{libdir}}/ejabberd/priv/bin
 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
@@ -151,14 +132,12 @@ fi
 [ -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
+[ -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
@@ -168,85 +147,119 @@ export ERL_INETRC
 export ERL_MAX_PORTS
 export ERL_MAX_ETS_TABLES
 export CONTRIB_MODULES_PATH
+export CONTRIB_MODULES_CONF_DIR
+export ERL_LIBS
+
+shell_escape_str()
+{
+    if test $# -eq 0; then
+        printf '"" '
+    else
+        shell_escape "$@"
+    fi
+}
+
+shell_escape()
+{
+    local RES=()
+    for i in "$@"; do
+        if test -z "$i"; then
+            printf '"" '
+        else
+            printf '%q ' "$i"
+        fi
+    done
+}
 
 # start server
 start()
 {
     check_start
-    $EXEC_CMD "$ERL \
-      $NAME $ERLANG_NODE \
-      -noinput -detached \
-      -pa $EJABBERD_EBIN_PATH \
-      -mnesia dir \"\\\"$SPOOL_DIR\\\"\" \
-      $KERNEL_OPTS \
-      $EJABBERD_OPTS \
-      -s ejabberd \
-      -sasl sasl_error_logger \\{file,\\\"$SASL_LOG_PATH\\\"\\} \
-      $ERLANG_OPTS $ARGS \"$@\""
+    CMD="`shell_escape \"$ERL\" \"$NAME\" \"$ERLANG_NODE\"` \
+         -noinput -detached \
+         $MNESIA_OPTS \
+         $KERNEL_OPTS \
+         $EJABBERD_OPTS \
+         -s ejabberd \
+         $ERLANG_OPTS \
+         `shell_escape \"${ARGS[@]}\" \"$@\"`"
+    $EXEC_CMD "$CMD"
 }
 
 # 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 \"$@\""
+    NID=$(uid debug)
+    CMD="`shell_escape \"$ERL\" \"$NAME\" \"$NID\"` \
+         -remsh $ERLANG_NODE \
+         -hidden \
+         $KERNEL_OPTS \
+         $ERLANG_OPTS \
+         `shell_escape \"${ARGS[@]}\" \"$@\"`"
+    $EXEC_CMD "$CMD"
 }
 
 # 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 \"$@\""
+    NID=$(uid debug)
+    CMD="`shell_escape \"$IEX\" \"$IEXNAME\" \"$NID\"` \
+         -remsh $ERLANG_NODE \
+         --erl `shell_escape \"$KERNEL_OPTS\"` \
+         --erl `shell_escape \"$ERLANG_OPTS\"` \
+         --erl `shell_escape \"${ARGS[@]}\"` \
+         --erl `shell_escape_str \"$@\"`"
+    $EXEC_CMD "ERL_PATH=\"$ERL\" $CMD"
 }
 
 # start interactive server
 live()
 {
     livewarning
-    $EXEC_CMD "$ERL \
-      $NAME $ERLANG_NODE \
-      -pa $EJABBERD_EBIN_PATH \
-      -mnesia dir \"\\\"$SPOOL_DIR\\\"\" \
-      $KERNEL_OPTS \
-      $EJABBERD_OPTS \
-      -s ejabberd \
-      $ERLANG_OPTS $ARGS \"$@\""
+    CMD="`shell_escape \"$ERL\" \"$NAME\" \"${ERLANG_NODE}\"` \
+         $MNESIA_OPTS \
+         $KERNEL_OPTS \
+         $EJABBERD_OPTS \
+         -s ejabberd \
+         $ERLANG_OPTS \
+         `shell_escape \"${ARGS[@]}\" \"$@\"`"
+    $EXEC_CMD "$CMD"
 }
 
 # 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 \"$@\""
+    echo $@
+    CMD="`shell_escape \"$IEX\" \"$IEXNAME\" \"${ERLANG_NODE}\"` \
+         --erl \"-mnesia dir \\\"$SPOOL_DIR\\\"\" \
+         --erl \"`shell_escape \"$KERNEL_OPTS\"`\" \
+         --erl \"`shell_escape \"$EJABBERD_OPTS\"`\" \
+         --app ejabberd \
+         --erl `shell_escape \"$ERLANG_OPTS\"` \
+         --erl `shell_escape \"${ARGS[@]}\"` \
+         --erl `shell_escape_str \"$@\"`"
+    $EXEC_CMD "ERL_PATH=\"$ERL\" $CMD"
 }
 
-etop()
+# start server in the foreground
+foreground()
 {
-    $EXEC_CMD "$ERL \
-      $NAME debug-${TTY}-${ERLANG_NODE} \
-      -hidden -s etop -s erlang halt -output text -node $ERLANG_NODE"
+    check_start
+    CMD="`shell_escape \"$ERL\" \"$NAME\" \"$ERLANG_NODE\"` \
+         -noinput \
+         $MNESIA_OPTS \
+         $KERNEL_OPTS \
+         $EJABBERD_OPTS \
+         -s ejabberd \
+         $ERLANG_OPTS \
+         `shell_escape \"${ARGS[@]}\" \"$@\"`"
+    $EXEC_CMD "$CMD"
 }
 
-# TODO: refactor debug warning and livewarning
 debugwarning()
 {
     if [ "$EJABBERD_BYPASS_WARNINGS" != "true" ] ; then
@@ -268,7 +281,7 @@ debugwarning()
         echo "Press return to continue"
         read foo
         echo ""
-    fi    
+    fi
 }
 
 livewarning()
@@ -295,16 +308,42 @@ livewarning()
     fi
 }
 
-# TODO: Make iex command display only if ejabberd Elixir support has been enabled
+etop()
+{
+    NID=$(uid top)
+    $EXEC_CMD "$ERL \
+      $NAME $NID \
+      -hidden -s etop -s erlang halt -output text -node $ERLANG_NODE"
+}
+
+ping()
+{
+    [ -z "$1" ] && PEER=${ERLANG_NODE} || PEER=$1
+    if [ "$PEER" = "${PEER%.*}" ] ; then
+        PING_NAME="-sname"
+        PING_NODE=$(hostname -s)
+    else
+        PING_NAME="-name"
+        PING_NODE=$(hostname)
+    fi
+    NID=$(uid ping ${PING_NODE})
+    $EXEC_CMD "$ERL \
+      $PING_NAME $NID \
+      -hidden $KERNEL_OPTS $ERLANG_OPTS \
+      -eval 'io:format(\"~p~n\",[net_adm:ping('\"'\"'$PEER'\"'\"')])' \
+      -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 "  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 "  foreground Start an ejabberd node in server mode (attached)"
     echo ""
     echo "Optional parameters when starting an ejabberd node:"
     echo "  --config-dir dir   Config ejabberd:    $ETC_DIR"
@@ -319,102 +358,42 @@ help()
 # 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
-
+    NID=$(uid ctl)
+    CMD="`shell_escape \"$ERL\" \"$NAME\" \"$NID\"` \
+         -noinput -hidden $KERNEL_OPTS -s ejabberd_ctl \
+         -extra `shell_escape \"$ERLANG_NODE\"` $EJABBERD_NO_TIMEOUT \
+         `shell_escape \"$@\"`"
+    $EXEC_CMD "$CMD"
+    result=$?
     case $result in
-        0) :;;
-        1) :;;
         2) help;;
         3) help;;
+        *) :;;
     esac
     return $result
 }
 
-ctlexec()
+uid()
 {
-    CONN_NAME=$1; shift
-    COMMAND=$@
-    $EXEC_CMD "$ERL \
-      $NAME ${CONN_NAME} \
-      -noinput \
-      -hidden \
-      -pa $EJABBERD_EBIN_PATH \
-      $KERNEL_OPTS \
-      -s ejabberd_ctl -extra $ERLANG_NODE $COMMAND"
+    uuid=$(uuidgen 2>/dev/null)
+    [ -z "$uuid" -a -f /proc/sys/kernel/random/uuid ] && uuid=$(</proc/sys/kernel/random/uuid)
+    [ -z "$uuid" ] && uuid=$(printf "%X" $RANDOM$(date +%M%S)$$)
+    uuid=${uuid%%-*}
+    [ $# -eq 0 ] && echo ${uuid}-${ERLANG_NODE}
+    [ $# -eq 1 ] && echo ${uuid}-${1}-${ERLANG_NODE}
+    [ $# -eq 2 ] && echo ${uuid}-${1}@${2}
 }
 
 # stop epmd if there is no other running node
 stop_epmd()
 {
-    $EPMD -names 2>/dev/null | grep -q name || epmd -kill >/dev/null
+    "$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%@*} " && {
+    "$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
@@ -425,22 +404,12 @@ check_start()
                 echo "Shutdown all other erlang nodes, and call 'epmd -kill'."
                 exit 5
             } || {
-                $EPMD -kill >/dev/null
+                "$EPMD" -kill >/dev/null
             }
         }
     }
 }
 
-# cluster setup
-join_cluster()
-{
-    $EJABBERD_BIN_PATH/joincluster $*
-}
-leave_cluster()
-{
-    $EJABBERD_BIN_PATH/leavecluster $*
-}
-
 # allow sync calls
 wait_for_status()
 {
@@ -462,16 +431,16 @@ wait_for_status()
 }
 
 # main handler
-case $ARGS in
-    ' start') start;;
-    ' debug') debug;;
-    ' iexdebug') iexdebug;;
-    ' live') live;;
-    ' iexlive') iexlive;;
-    ' 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;;
+case "${ARGS[0]}" in
+    'start') start;;
+    'debug') debug;;
+    'iexdebug') iexdebug;;
+    'live') live;;
+    'iexlive') iexlive;;
+    'foreground') foreground;;
+    'ping'*) ping ${ARGS[1]};;
+    'etop') etop;;
+    'started') wait_for_status 0 30 2;; # wait 30x2s before timeout
+    'stopped') wait_for_status 3 30 2 && stop_epmd;; # wait 30x2s before timeout
+    *) ctl "${ARGS[@]}";;
 esac

include/adhoc.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_commands.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -31,10 +31,16 @@
          tags = []               :: [atom()] | '_' | '$2',
          desc = ""               :: string() | '_' | '$3',
          longdesc = ""           :: string() | '_',
-	 module                  :: atom(),
-         function                :: atom(),
+	 version = 0             :: integer(),
+	 module                  :: atom() | '_',
+         function                :: atom() | '_',
          args = []               :: [aterm()] | '_' | '$1' | '$2',
-         result = {res, rescode} :: rterm() | '_' | '$2'}).
+         policy = restricted     :: open | restricted | admin | user,
+         result = {res, rescode} :: rterm() | '_' | '$2',
+         args_desc = none        :: none | [string()] | '_',
+         result_desc = none      :: none | string() | '_',
+         args_example = none     :: none | [any()] | '_',
+         result_example = none   :: any()}).
 
 -type ejabberd_commands() :: #ejabberd_commands{name :: atom(),
                                                 tags :: [atom()],
@@ -71,4 +77,3 @@
 
 %% @type rterm() = {Name::atom(), Type::rtype()}.
 %% A result term is a tuple with the term name and the term type.
-

include/ejabberd_config.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_ctl.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_http.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -19,25 +19,23 @@
 %%%----------------------------------------------------------------------
 
 -record(request,
-	{method, %            :: method(),
+	{method            :: method(),
 	 path = []         :: [binary()],
 	 q = []            :: [{binary() | nokey, binary()}],
 	 us = {<<>>, <<>>} :: {binary(), binary()},
-	 auth              :: {binary(), binary()} |
-	 {auth_jid, {binary(), binary()}, jlib:jid()},
+	 auth              :: {binary(), binary()} | {oauth, binary(), []} | undefined,
 	 lang = <<"">>     :: binary(),
 	 data = <<"">>     :: binary(),
 	 ip                :: {inet:ip_address(), inet:port_number()},
 	 host = <<"">>     :: binary(),
 	 port = 5280       :: inet:port_number(),
-	 tp = http, %         :: protocol(),
 	 opts = []         :: list(),
+	 tp = http         :: protocol(),
 	 headers = []      :: [{atom() | binary(), binary()}]}).
 
-
 -record(ws,
-	{socket                  :: inet:socket() | p1_tls:tls_socket(),
-	 sockmod = gen_tcp       :: gen_tcp | p1_tls,
+	{socket                  :: inet:socket() | fast_tls:tls_socket(),
+	 sockmod = gen_tcp       :: gen_tcp | fast_tls,
 	 ip                      :: {inet:ip_address(), inet:port_number()},
 	 host = <<"">>           :: binary(),
 	 port = 5280             :: inet:port_number(),
@@ -45,4 +43,9 @@
 	 headers = []            :: [{atom() | binary(), binary()}],
 	 local_path = []         :: [binary()],
 	 q = []                  :: [{binary() | nokey, binary()}],
-	 buf                     :: binary()}).
+	 buf                     :: binary(),
+         http_opts = []          :: list()}).
+
+-type method() :: 'GET' | 'HEAD' | 'DELETE' | 'OPTIONS' | 'PUT' | 'POST' | 'TRACE'.
+-type protocol() :: http | https.
+-type http_request() :: #request{}.

include/ejabberd_sm.hrl

@@ -1,7 +1,13 @@
+-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 sid() :: {erlang:timestamp(), pid()} | {erlang:timestamp(), undefined}.
 -type ip() :: {inet:ip_address(), inet:port_number()} | undefined.
 -type info() :: [{conn, atom()} | {ip, ip()} | {node, atom()}
-                 | {oor, boolean()} | {auth_module, atom()}].
+                 | {oor, boolean()} | {auth_module, atom()}
+                 | {num_stanzas_in, non_neg_integer()}].
 -type prio() :: undefined | integer().
+
+-endif.

include/ejabberd_sql_pt.hrl

@@ -0,0 +1,33 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2016   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(SQL_MARK, sql__mark_).
+-define(SQL(SQL), ?SQL_MARK(SQL)).
+
+-define(SQL_UPSERT_MARK, sql_upsert__mark_).
+-define(SQL_UPSERT(Host, Table, Fields),
+        ejabberd_sql:sql_query(Host, ?SQL_UPSERT_MARK(Table, Fields))).
+-define(SQL_UPSERT_T(Table, Fields),
+        ejabberd_sql:sql_query_t(?SQL_UPSERT_MARK(Table, Fields))).
+
+-record(sql_query, {hash, format_query, format_res, args, loc}).
+
+-record(sql_escape, {string, integer, boolean}).
+

include/ejabberd_web_admin.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/eldap.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/http_bind.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -38,9 +38,12 @@
 -define(AC_MAX_AGE,
 	{<<"Access-Control-Max-Age">>, <<"86400">>}).
 
+-define(NO_CACHE,
+        {<<"Cache-Control">>, <<"max-age=0, no-cache, no-store">>}).
+
 -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]).
+	[?CT_XML, ?AC_ALLOW_ORIGIN, ?AC_ALLOW_HEADERS, ?NO_CACHE]).

include/jlib.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -20,9 +20,9 @@
 
 -include("ns.hrl").
 -ifdef(NO_EXT_LIB).
--include("xml.hrl").
+-include("fxml.hrl").
 -else.
--include_lib("p1_xml/include/xml.hrl").
+-include_lib("fast_xml/include/fxml.hrl").
 -endif.
 
 -define(STANZA_ERROR(Code, Type, Condition),

include/logger.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -18,8 +18,6 @@
 %%%
 %%%----------------------------------------------------------------------
 -define(PRINT(Format, Args), io:format(Format, Args)).
-
--ifdef(LAGER).
 -compile([{parse_transform, lager_transform}]).
 
 -define(DEBUG(Format, Args),
@@ -37,20 +35,9 @@
 -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.
+%% Use only when trying to troubleshoot test problem with ExUnit
+-define(EXUNIT_LOG(Format, Args),
+        case lists:keyfind(logger, 1, application:loaded_applications()) of
+            false -> ok;
+            _ -> 'Elixir.Logger':bare_log(error, io_lib:format(Format, Args), [?MODULE])
+        end).

include/mod_announce.hrl

@@ -0,0 +1,5 @@
+-record(motd, {server = <<"">> :: binary(),
+               packet = #xmlel{} :: xmlel()}).
+
+-record(motd_users, {us = {<<"">>, <<"">>} :: {binary(), binary()} | '$1',
+                     dummy = [] :: [] | '_'}).

include/mod_caps.hrl

@@ -0,0 +1,4 @@
+-record(caps_features,
+	{node_pair = {<<"">>, <<"">>} :: {binary(), binary()},
+	 features  = []               :: [binary()] | pos_integer()
+	}).

include/mod_carboncopy.hrl

@@ -0,0 +1,4 @@
+-type matchspec_atom() :: '_' | '$1' | '$2' | '$3'.
+-record(carboncopy, {us       :: {binary(), binary()} | matchspec_atom(), 
+		     resource :: binary() | matchspec_atom(),
+		     version  :: binary() | matchspec_atom()}).

include/mod_irc.hrl

@@ -0,0 +1,15 @@
+-type conn_param() :: {binary(), binary(), inet:port_number(), binary()} |
+                      {binary(), binary(), inet:port_number()} |
+                      {binary(), binary()} |
+                      {binary()}.
+
+-type irc_data() :: [{username, binary()} | {connections_params, [conn_param()]}].
+
+-record(irc_connection,
+        {jid_server_host = {#jid{}, <<"">>, <<"">>} :: {jid(), binary(), binary()},
+         pid = self()                               :: pid()}).
+
+-record(irc_custom,
+        {us_host = {{<<"">>, <<"">>}, <<"">>} :: {{binary(), binary()},
+                                                  binary()},
+         data = [] :: irc_data()}).

include/mod_last.hrl

@@ -0,0 +1,3 @@
+-record(last_activity, {us = {<<"">>, <<"">>} :: {binary(), binary()},
+                        timestamp = 0 :: non_neg_integer(),
+                        status = <<"">> :: binary()}).

include/mod_mam.hrl

@@ -0,0 +1,15 @@
+-record(archive_msg,
+	{us = {<<"">>, <<"">>}                :: {binary(), binary()} | '$2',
+	 id = <<>>                            :: binary() | '_',
+	 timestamp = p1_time_compat:timestamp() :: erlang:timestamp() | '_' | '$1',
+	 peer = {<<"">>, <<"">>, <<"">>}      :: ljid() | '_' | '$3' | undefined,
+	 bare_peer = {<<"">>, <<"">>, <<"">>} :: ljid() | '_' | '$3',
+	 packet = #xmlel{}                    :: xmlel() | '_',
+	 nick = <<"">>                        :: binary(),
+	 type = chat                          :: chat | groupchat}).
+
+-record(archive_prefs,
+	{us = {<<"">>, <<"">>} :: {binary(), binary()},
+	 default = never       :: never | always | roster,
+	 always = []           :: [ljid()],
+	 never = []            :: [ljid()]}).

include/mod_muc.hrl

@@ -0,0 +1,33 @@
+%%%----------------------------------------------------------------------
+%%% File    : mod_muc.hrl
+%%%
+%%% ejabberd, Copyright (C) 2002-2016   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(muc_room, {name_host = {<<"">>, <<"">>} :: {binary(), binary()} |
+                                                   {'_', binary()},
+                   opts = [] :: list() | '_'}).
+
+-record(muc_online_room,
+        {name_host = {<<"">>, <<"">>} :: {binary(), binary()} | '$1' |
+                                         {'_', binary()} | '_',
+         pid = self() :: pid() | '$2' | '_' | '$1'}).
+
+-record(muc_registered,
+        {us_host = {{<<"">>, <<"">>}, <<"">>} :: {{binary(), binary()}, binary()} | '$1',
+         nick = <<"">> :: binary()}).

include/mod_muc_room.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -56,12 +56,15 @@
     password_protected                   = false :: boolean(),
     password                             = <<"">> :: binary(),
     anonymous                            = true :: boolean(),
+    presence_broadcast                   = [moderator, participant, visitor] ::
+          [moderator | participant | visitor],
     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
+    captcha_whitelist                    = (?SETS):empty() :: ?TGB_SET,
+    mam                                  = false :: boolean()
 }).
 
 -type config() :: #config{}.
@@ -110,8 +113,8 @@
 
 -record(muc_online_users, {us = {<<>>, <<>>} :: {binary(), binary()},
                            resource = <<>> :: binary() | '_',
-                           room = <<>> :: binary() | '_',
-                           host = <<>> :: binary() | '_'}).
+                           room = <<>> :: binary() | '_' | '$1',
+                           host = <<>> :: binary() | '_' | '$2'}).
 
 -type muc_online_users() :: #muc_online_users{}.
 

include/mod_offline.hrl

@@ -0,0 +1,11 @@
+-record(offline_msg,
+	{us = {<<"">>, <<"">>} :: {binary(), binary()},
+	 timestamp = now()     :: erlang:timestamp() | '_',
+	 expire = now()        :: erlang:timestamp() | never | '_',
+	 from = #jid{}         :: jid() | '_',
+	 to = #jid{}           :: jid() | '_',
+	 packet = #xmlel{}     :: xmlel() | '_'}).
+
+-record(state,
+	{host = <<"">> :: binary(),
+	 access_max_offline_messages}).

include/mod_privacy.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_private.hrl

@@ -0,0 +1,4 @@
+-record(private_storage,
+        {usns = {<<"">>, <<"">>, <<"">>} :: {binary(), binary(), binary() |
+                                             '$1' | '_'},
+         xml = #xmlel{} :: xmlel() | '_' | '$1'}).

include/mod_proxy65.hrl

@@ -2,7 +2,7 @@
 %%% RFC 1928 constants.
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_roster.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_shared_roster.hrl

@@ -0,0 +1,5 @@
+-record(sr_group, {group_host = {<<"">>, <<"">>} :: {'$1' | binary(), '$2' | binary()},
+                   opts = [] :: list() | '_' | '$2'}).
+
+-record(sr_user, {us = {<<"">>, <<"">>} :: {binary(), binary()},
+                  group_host = {<<"">>, <<"">>} :: {binary(), binary()}}).

include/mod_vcard.hrl

@@ -0,0 +1,8 @@
+-record(vcard_search,
+	{us, user, luser, fn, lfn, family, lfamily, given,
+	 lgiven, middle, lmiddle, nickname, lnickname, bday,
+	 lbday, ctry, lctry, locality, llocality, email, lemail,
+	 orgname, lorgname, orgunit, lorgunit}).
+
+-record(vcard, {us = {<<"">>, <<"">>} :: {binary(), binary()} | binary(),
+                vcard = #xmlel{} :: xmlel()}).

include/mod_vcard_xupdate.hrl

@@ -0,0 +1,2 @@
+-record(vcard_xupdate, {us = {<<>>, <<>>} :: {binary(), binary()},
+                        hash = <<>>       :: binary()}).

include/ns.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -35,12 +35,10 @@
 -define(NS_BLOCKING, <<"urn:xmpp:blocking">>).
 -define(NS_PRIVATE, <<"jabber:iq:private">>).
 -define(NS_VERSION, <<"jabber:iq:version">>).
--define(NS_TIME90, <<"jabber:iq:time">>).
 -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_DELAY91, <<"jabber:x:delay">>).
 -define(NS_DELAY, <<"urn:xmpp:delay">>).
 -define(NS_HINTS, <<"urn:xmpp:hints">>).
 -define(NS_EXPIRE, <<"jabber:x:expire">>).
@@ -133,6 +131,7 @@
 -define(NS_FEATURE_COMPRESS,
 	<<"http://jabber.org/features/compress">>).
 -define(NS_FEATURE_MSGOFFLINE, <<"msgoffline">>).
+-define(NS_FLEX_OFFLINE, <<"http://jabber.org/protocol/offline">>).
 -define(NS_COMPRESS,
 	<<"http://jabber.org/protocol/compress">>).
 -define(NS_CAPS, <<"http://jabber.org/protocol/caps">>).
@@ -143,6 +142,10 @@
 -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_MAM_1, <<"urn:xmpp:mam:1">>).
+-define(NS_SID_0, <<"urn:xmpp:sid:0">>).
 -define(NS_PING, <<"urn:xmpp:ping">>).
 -define(NS_CARBONS_2, <<"urn:xmpp:carbons:2">>).
 -define(NS_CARBONS_1, <<"urn:xmpp:carbons:1">>).
@@ -150,3 +153,14 @@
 -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">>).
+-define(NS_HTTP_UPLOAD, <<"urn:xmpp:http:upload">>).
+-define(NS_HTTP_UPLOAD_OLD, <<"eu:siacs:conversations:http:upload">>).
+-define(NS_THUMBS_1, <<"urn:xmpp:thumbs:1">>).
+-define(NS_NICK,  <<"http://jabber.org/protocol/nick">>).
+-define(NS_MIX_0, <<"urn:xmpp:mix:0">>).
+-define(NS_MIX_SERVICEINFO_0, <<"urn:xmpp:mix:0#serviceinfo">>).
+-define(NS_MIX_NODES_MESSAGES, <<"urn:xmpp:mix:nodes:messages">>).
+-define(NS_MIX_NODES_PRESENCE, <<"urn:xmpp:mix:nodes:presence">>).
+-define(NS_MIX_NODES_PARTICIPANTS, <<"urn:xmpp:mix:nodes:participants">>).
+-define(NS_MIX_NODES_SUBJECT, <<"urn:xmpp:mix:nodes:subject">>).
+-define(NS_MIX_NODES_CONFIG, <<"urn:xmpp:mix:nodes:config">>).

include/pubsub.hrl

@@ -13,12 +13,12 @@
 %%% 
 %%%
 %%% The Initial Developer of the Original Code is ProcessOne.
-%%% Portions created by ProcessOne are Copyright 2006-2015, ProcessOne
+%%% Portions created by ProcessOne are Copyright 2006-2016, ProcessOne
 %%% All Rights Reserved.''
-%%% This software is copyright 2006-2015, ProcessOne.
+%%% This software is copyright 2006-2016, ProcessOne.
 %%%
 %%%
-%%% copyright 2006-2015 ProcessOne
+%%% copyright 2006-2016 ProcessOne
 %%%
 %%% This file contains pubsub types definition.
 %%% ====================================================================
@@ -65,7 +65,7 @@
 %% 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.
+%% indexing nodes, as this can be usefull with external backends such as sql.
 
 -type(itemId() :: binary()).
 %% @type itemId() = string().
@@ -93,7 +93,12 @@
 
 -type(subOptions() :: [mod_pubsub:subOption(),...]).
 
+-type(pubOption() ::
+    {Option::binary(),
+     Values::[binary()]
+}).
 
+-type(pubOptions() :: [mod_pubsub:pubOption()]).
 
 -type(affiliation() :: 'none'
                      | 'owner'

lib/ct_formatter.ex

@@ -0,0 +1,130 @@
+defmodule ExUnit.CTFormatter do
+  @moduledoc false
+
+  use GenEvent
+
+  import ExUnit.Formatter, only: [format_time: 2, format_filters: 2, format_test_failure: 5,
+                                  format_test_case_failure: 5]
+
+  def init(opts) do
+    file = File.open! "exunit.log", [:append]
+    # We do not print filter in log file as exclusion of test with tag
+    # pending: true is always done
+    config = %{
+      file: file,
+      seed: opts[:seed],
+      trace: opts[:trace],
+      colors: Keyword.put_new(opts[:colors], :enabled, false),
+      width: 80,
+      tests_counter: 0,
+      failures_counter: 0,
+      skipped_counter: 0,
+      invalids_counter: 0
+    }
+    {:ok, config}
+  end
+
+  def handle_event({:suite_started, _opts}, config) do
+    {:ok, config}
+  end
+
+  def handle_event({:suite_finished, run_us, load_us}, config) do
+    print_suite(config, run_us, load_us)
+    File.close config[:file]
+    :remove_handler
+  end
+
+  def handle_event({:test_started, %ExUnit.Test{} = test}, config) do
+    if config.tests_counter == 0, do: IO.binwrite config[:file], "== Running #{test.case} ==\n\n"
+    {:ok, config}
+  end
+
+  def handle_event({:test_finished, %ExUnit.Test{state: nil} = _test}, config) do
+    IO.binwrite config[:file], "."
+    {:ok, %{config | tests_counter: config.tests_counter + 1}}
+  end
+
+  def handle_event({:test_finished, %ExUnit.Test{state: {:skip, _}} = _test}, config) do
+    {:ok, %{config | tests_counter: config.tests_counter + 1,
+                     skipped_counter: config.skipped_counter + 1}}
+  end
+
+  def handle_event({:test_finished, %ExUnit.Test{state: {:invalid, _}} = _test}, config) do
+    IO.binwrite config[:file], "?"
+    {:ok, %{config | tests_counter: config.tests_counter + 1,
+                     invalids_counter: config.invalids_counter + 1}}
+  end
+
+  def handle_event({:test_finished, %ExUnit.Test{state: {:failed, failures}} = test}, config) do
+    formatted = format_test_failure(test, failures, config.failures_counter + 1,
+                                    config.width, &formatter(&1, &2, config))
+    print_failure(formatted, config)
+    print_logs(test.logs)
+
+    {:ok, %{config | tests_counter: config.tests_counter + 1,
+                     failures_counter: config.failures_counter + 1}}
+  end
+
+  def handle_event({:case_started, %ExUnit.TestCase{}}, config) do
+    {:ok, config}
+  end
+
+  def handle_event({:case_finished, %ExUnit.TestCase{state: nil}}, config) do
+    {:ok, config}
+  end
+
+  def handle_event({:case_finished, %ExUnit.TestCase{state: {:failed, failures}} = test_case}, config) do
+    formatted = format_test_case_failure(test_case, failures, config.failures_counter + 1,
+                                         config.width, &formatter(&1, &2, config))
+    print_failure(formatted, config)
+    {:ok, %{config | failures_counter: config.failures_counter + 1}}
+  end
+
+  ## Printing
+
+  defp print_suite(config, run_us, load_us) do
+    IO.binwrite config[:file], "\n\n"
+    IO.binwrite config[:file], format_time(run_us, load_us)
+    IO.binwrite config[:file], "\n\n"
+
+    # singular/plural
+    test_pl = pluralize(config.tests_counter, "test", "tests")
+    failure_pl = pluralize(config.failures_counter, "failure", "failures")
+
+    message =
+      "#{config.tests_counter} #{test_pl}, #{config.failures_counter} #{failure_pl}"
+      |> if_true(config.skipped_counter > 0, & &1 <> ", #{config.skipped_counter} skipped")
+      |> if_true(config.invalids_counter > 0, & &1 <> ", #{config.invalids_counter} invalid")
+
+    cond do
+      config.failures_counter > 0 -> IO.binwrite config[:file], message
+      config.invalids_counter > 0 -> IO.binwrite config[:file], message
+      true                        -> IO.binwrite config[:file], message
+    end
+
+    IO.binwrite config[:file], "\nRandomized with seed #{config.seed}\n\n\n\n"
+  end
+
+  defp if_true(value, false, _fun), do: value
+  defp if_true(value, true, fun), do: fun.(value)
+
+  defp print_failure(formatted, config) do
+    IO.binwrite config[:file], "\n"
+    IO.binwrite config[:file], formatted
+    IO.binwrite config[:file], "\n"
+  end
+
+  defp formatter(_,  msg, _config),
+    do: msg
+
+  defp pluralize(1, singular, _plural), do: singular
+  defp pluralize(_, _singular, plural), do: plural
+
+  defp print_logs(""), do: nil
+
+  defp print_logs(output) do
+    indent = "\n     "
+    output = String.replace(output, "\n", indent)
+    IO.puts(["     The following output was logged:", indent | output])
+  end
+end

lib/ejabberd.ex

@@ -1,2 +0,0 @@
-defmodule Ejabberd do
-end

mix.exs

@@ -3,44 +3,71 @@ defmodule Ejabberd.Mixfile do
 
   def project do
     [app: :ejabberd,
-     version: "15.03.0",
-     elixir: "~> 1.0",
+     version: "16.06.0",
+     description: description,
+     elixir: "~> 1.2",
      elixirc_paths: ["lib"],
      compile_path: ".",
      compilers: [:asn1] ++ Mix.compilers,
      erlc_options: erlc_options,
      erlc_paths: ["asn1", "src"],
+     package: package,
      deps: deps]
   end
 
+  defp description do
+    """
+    Robust, ubiquitous and massively scalable Jabber / XMPP Instant Messaging platform.
+    """
+  end
+
   def application do
     [mod: {:ejabberd_app, []},
-     applications: [:kernel, :stdlib]]
+     applications: [:ssl],
+     included_applications: [:lager, :mnesia, :p1_utils, :cache_tab,
+                             :fast_tls, :stringprep, :fast_xml,
+                             :stun, :fast_yaml, :ezlib, :iconv,
+                             :esip, :jiffy, :p1_oauth2, :p1_xmlrpc, :eredis,
+                             :p1_mysql, :p1_pgsql, :sqlite3]]
   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)
+    # Use our own includes + includes from all dependencies
+    includes = ["include"] ++ Path.wildcard(Path.join("..", "/*/include"))
+    [:debug_info] ++ 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"}
-     ]
+    [{:lager, "~> 3.0.0"},
+     {:p1_utils, "~> 1.0"},
+     {:cache_tab, "~> 1.0"},
+     {:stringprep, "~> 1.0"},
+     {:fast_yaml, "~> 1.0"},
+     {:fast_tls, "~> 1.0"},
+     {:fast_xml, "~> 1.1"},
+     {:stun, "~> 1.0"},
+     {:esip, "~> 1.0"},
+     {:jiffy, "~> 0.14.7"},
+     {:p1_oauth2, "~> 0.6.1"},
+     {:p1_xmlrpc, "~> 1.15"},
+     {:p1_mysql, "~> 1.0"},
+     {:p1_pgsql, "~> 1.1"},
+     {:sqlite3, "~> 1.1"},
+     {:ezlib, "~> 1.0"},
+     {:iconv, "~> 1.0"},
+     {:eredis, "~> 1.0"},
+     {:exrm, "~> 1.0.0-rc7", only: :dev}]
+  end
+
+  defp package do
+    [# These are the default files included in the package
+      files: ["lib", "src", "priv", "mix.exs", "include", "README.md", "COPYING"],
+      maintainers: ["ProcessOne"],
+      licenses: ["GPLv2"],
+      links: %{"Site" => "https://www.ejabberd.im",
+               "Documentation" => "http://docs.ejabberd.im",
+               "Source" => "https://github.com/processone/ejabberd",
+               "ProcessOne" => "http://www.process-one.net/"}]
   end
 end
 
@@ -65,7 +92,7 @@ defmodule Mix.Tasks.Compile.Asn1 do
         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       
+          error -> error
         end
     end)
   end

mix.lock

@@ -0,0 +1,26 @@
+%{"bbmustache": {:hex, :bbmustache, "1.0.4", "7ba94f971c5afd7b6617918a4bb74705e36cab36eb84b19b6a1b7ee06427aa38", [:rebar], []},
+  "cache_tab": {:hex, :cache_tab, "1.0.2", "c12099fff8b0f7011e7656844f5f67b958b7033a521c69595dbf2a5d7c8bb34f", [:rebar3], [{:p1_utils, "1.0.3", [hex: :p1_utils, optional: false]}]},
+  "cf": {:hex, :cf, "0.2.1", "69d0b1349fd4d7d4dc55b7f407d29d7a840bf9a1ef5af529f1ebe0ce153fc2ab", [:rebar3], []},
+  "eredis": {:hex, :eredis, "1.0.8", "ab4fda1c4ba7fbe6c19c26c249dc13da916d762502c4b4fa2df401a8d51c5364", [:rebar], []},
+  "erlware_commons": {:hex, :erlware_commons, "0.19.0", "7b43caf2c91950c5f60dc20451e3c3afba44d3d4f7f27bcdc52469285a5a3e70", [:rebar3], [{:cf, "0.2.1", [hex: :cf, optional: false]}]},
+  "esip": {:hex, :esip, "1.0.4", "47426c264f6ea5a2a74b53ecf825593b689b47ed3eab873ff8a595ea35aa8507", [:rebar3], [{:stun, "1.0.3", [hex: :stun, optional: false]}, {:p1_utils, "1.0.3", [hex: :p1_utils, optional: false]}, {:fast_tls, "1.0.3", [hex: :fast_tls, optional: false]}]},
+  "exrm": {:hex, :exrm, "1.0.5", "53ecb20da2f4e5b4c82ea6776824fbc677c8d287bf20efc9fc29cacc2cca124f", [:mix], [{:relx, "~> 3.5", [hex: :relx, optional: false]}]},
+  "ezlib": {:hex, :ezlib, "1.0.1", "add8b2770a1a70c174aaea082b4a8668c0c7fdb03ee6cc81c6c68d3a6c3d767d", [:rebar3], []},
+  "fast_tls": {:hex, :fast_tls, "1.0.3", "7ccd02ffcba24f8792dd88bd71fa543ea438c58bd0f132576031533083ede578", [:rebar3], [{:p1_utils, "1.0.3", [hex: :p1_utils, optional: false]}]},
+  "fast_xml": {:hex, :fast_xml, "1.1.11", "1d9aedbe367a3d42ba2c6d9d4ee5808c0846e06a28e366e262e41d3ce462cbdf", [:rebar3], [{:p1_utils, "1.0.3", [hex: :p1_utils, optional: false]}]},
+  "fast_yaml": {:hex, :fast_yaml, "1.0.3", "862e3f89d52aa6a72eef3121edf303aac2f3c559cbaba2d2a1fd0c09d5f15f9a", [:rebar3], [{:p1_utils, "1.0.3", [hex: :p1_utils, optional: false]}]},
+  "getopt": {:hex, :getopt, "0.8.2", "b17556db683000ba50370b16c0619df1337e7af7ecbf7d64fbf8d1d6bce3109b", [:rebar], []},
+  "goldrush": {:hex, :goldrush, "0.1.7", "349a351d17c71c2fdaa18a6c2697562abe136fec945f147b381f0cf313160228", [:rebar3], []},
+  "iconv": {:hex, :iconv, "1.0.0", "5ff1c54e5b3b9a8235de872632e9612c7952acdf89bc21db2f2efae0e72647be", [:rebar3], []},
+  "jiffy": {:hex, :jiffy, "0.14.7", "9f33b893edd6041ceae03bc1e50b412e858cc80b46f3d7535a7a9940a79a1c37", [:rebar, :make], []},
+  "lager": {:hex, :lager, "3.0.2", "25dc81bc3659b62f5ab9bd073e97ddd894fc4c242019fccef96f3889d7366c97", [:rebar3], [{:goldrush, "0.1.7", [hex: :goldrush, optional: false]}]},
+  "p1_mysql": {:hex, :p1_mysql, "1.0.1", "d2be1cfc71bb4f1391090b62b74c3f5cb8e7a45b0076b8cb290cd6b2856c581b", [:rebar3], []},
+  "p1_oauth2": {:hex, :p1_oauth2, "0.6.1", "4e021250cc198c538b097393671a41e7cebf463c248980320e038fe0316eb56b", [:rebar3], []},
+  "p1_pgsql": {:hex, :p1_pgsql, "1.1.0", "ca525c42878eac095e5feb19563acc9915c845648f48fdec7ba6266c625d4ac7", [:rebar3], []},
+  "p1_utils": {:hex, :p1_utils, "1.0.3", "8d469a34e8fe3898dda9dfda545fdb69cabfee144ebe31732d2c7905420603ec", [:rebar3], []},
+  "p1_xmlrpc": {:hex, :p1_xmlrpc, "1.15.1", "a382b62dc21bb372281c2488f99294d84f2b4020ed0908a1c4ad710ace3cf35a", [:rebar3], []},
+  "providers": {:hex, :providers, "1.6.0", "db0e2f9043ae60c0155205fcd238d68516331d0e5146155e33d1e79dc452964a", [:rebar3], [{:getopt, "0.8.2", [hex: :getopt, optional: false]}]},
+  "relx": {:hex, :relx, "3.19.0", "286dd5244b4786f56aac75d5c8e2d1fb4cfd306810d4ec8548f3ae1b3aadb8f7", [:rebar3], [{:providers, "1.6.0", [hex: :providers, optional: false]}, {:getopt, "0.8.2", [hex: :getopt, optional: false]}, {:erlware_commons, "0.19.0", [hex: :erlware_commons, optional: false]}, {:cf, "0.2.1", [hex: :cf, optional: false]}, {:bbmustache, "1.0.4", [hex: :bbmustache, optional: false]}]},
+  "sqlite3": {:hex, :sqlite3, "1.1.5", "794738b6d07b6d36ec6d42492cb9d629bad9cf3761617b8b8d728e765db19840", [:rebar3], []},
+  "stringprep": {:hex, :stringprep, "1.0.3", "0fc697484a83c868817c5c6d74c310a1f821b3cf8b6c0eb105335421d0b94d99", [:rebar3], [{:p1_utils, "1.0.3", [hex: :p1_utils, optional: false]}]},
+  "stun": {:hex, :stun, "1.0.3", "d8dcf8beb38939f3fcded73e89e5753cb5a2fed2e74fa5b658124849a9e97fe9", [:rebar3], [{:p1_utils, "1.0.3", [hex: :p1_utils, optional: false]}, {:fast_tls, "1.0.3", [hex: :fast_tls, optional: false]}]}}

plugins/deps_erl_opts.erl

@@ -0,0 +1,12 @@
+-module(deps_erl_opts).
+-export([preprocess/2]).
+
+preprocess(Config, Dirs) ->
+    ExtraOpts = rebar_config:get(Config, deps_erl_opts, []),
+    Opts = rebar_config:get(Config, erl_opts, []),
+    NewOpts = lists:foldl(fun(Opt, Acc) when is_tuple(Opt) ->
+                                  lists:keystore(element(1, Opt), 1, Acc, Opt);
+                             (Opt, Acc) ->
+                                  [Opt | lists:delete(Opt, Acc)]
+                          end, Opts, ExtraOpts),
+    {ok, rebar_config:set(Config, erl_opts, NewOpts), []}.

priv/msgs/ca.msg

@@ -1,8 +1,10 @@
 %% -*- coding: latin-1 -*-
+{"Accept","Acceptar"}.
 {"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,6 +13,7 @@
 {"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"}.
@@ -18,17 +21,19 @@
 {"Allow users to query other users","Permetre que els usuaris fagen peticions a altres usuaris"}.
 {"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 change nickname","Permetre als visitants canviar el sobrenom"}.
 {"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 contrasenya 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 ~p","Còpia de seguretat de ~p"}.
 {"Backup to File at ","Desar còpia de seguretat a fitxer en "}.
 {"Bad format","Format erroni"}.
 {"Birthday","Aniversari"}.
@@ -48,6 +53,7 @@
 {"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:"}.
@@ -55,10 +61,10 @@
 {"Country","Pais"}.
 {"CPU Time:","Temps de CPU"}.
 {"Database","Base de dades"}.
+{"Database Tables at ~p","Taules de la base de dades en ~p"}.
 {"Database Tables Configuration at ","Configuració de la base de dades en "}.
 {"December","Decembre"}.
 {"Default users as participants","Els usuaris són participants per defecte"}.
-{"Delete","Eliminar"}.
 {"Delete message of the day","Eliminar el missatge del dia"}.
 {"Delete message of the day on all hosts","Elimina el missatge del dis de tots els hosts"}.
 {"Delete Selected","Eliminar els seleccionats"}.
@@ -75,17 +81,20 @@
 {"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 Multicast service","Servei de Multicast d'ejabberd"}.
 {"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 Web Admin","Web d'administració del ejabberd"}.
 {"Elements","Elements"}.
 {"Email","Email"}.
+{"Empty Rooms","Sales buides "}.
 {"Enable logging","Habilitar el registre de la conversa"}.
+{"Enable message archiving","Activar l'emmagatzematge de missatges"}.
 {"Encoding for server ~b","Codificació pel servidor ~b"}.
 {"End User Session","Finalitzar Sesió d'Usuari"}.
 {"Enter list of {Module, [Options]}","Introdueix llista de {mòdul, [opcions]}"}.
-{"Enter nickname you want to register","Introdueix el nickname que vols registrar"}.
+{"Enter nickname you want to register","Introdueix el sobrenom que vols registrar"}.
 {"Enter path to backup file","Introdueix ruta al fitxer de còpia de seguretat"}.
 {"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"}.
@@ -97,8 +106,10 @@
 {"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 all tables as SQL queries to a file:","Exporta totes les taules a un fitxer SQL:"}.
 {"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):"}.
+{"Failed to extract JID from your voice request approval","No s'ha pogut extraure el JID de la teva aprovació de petició de veu"}.
 {"Family Name","Cognom"}.
 {"February","Febrer"}.
 {"Fill in fields to search for any matching Jabber User","Emplena camps per a buscar usuaris Jabber que concorden"}.
@@ -132,6 +143,9 @@
 {"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"}.
+{"Incoming s2s Connections:","Connexions s2s d'entrada"}.
+{"Incorrect password","Contrasenya incorrecta"}.
 {"Invalid affiliation: ~s","Afiliació invàlida: ~s"}.
 {"Invalid role: ~s","Rol invàlid: ~s"}.
 {"IP addresses","Adreça IP"}.
@@ -143,6 +157,10 @@
 {"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 error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","No està permés enviar missatges d'error a la sala. El participant (~s) ha enviat un missatge d'error (~s) i ha sigut expulsat de la sala"}.
+{"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"}.
@@ -161,6 +179,7 @@
 {"Listened Ports at ","Ports a la escolta en "}.
 {"Listened Ports","Ports a l'escolta"}.
 {"List of modules to start","Llista de mòduls a iniciar"}.
+{"List of rooms","Llista de sales"}.
 {"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"}.
@@ -174,29 +193,36 @@
 {"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"}.
 {"Minimum interval between voice requests (in seconds)","Interval mínim entre peticions de veu (en segons)"}.
+{"Moderator","Moderador"}.
+{"Moderator privileges required","Es necessita tenir privilegis de moderador"}.
 {"moderators only","només moderadors"}.
 {"Modified modules","Mòduls modificats"}.
 {"Module","Mòdul"}.
+{"Modules at ~p","Mòduls en ~p"}.
 {"Modules","Mòduls"}.
 {"Monday","Dilluns"}.
+{"Multicast","Multicast"}.
+{"Multi-User Chat","Multi-Usuari Converses"}.
 {"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"}.
+{"Nickname Registration at ","Registre del sobrenom en "}.
+{"Nickname ~s does not exist in the room","El sobrenom ~s no existeix a la sala"}.
+{"Nickname","Sobrenom"}.
 {"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 not found","Node no trobat"}.
+{"Node ~p","Node ~p"}.
 {"Nodes","Nodes"}.
 {"No limit","Sense Llímit"}.
 {"None","Cap"}.
@@ -218,15 +244,21 @@
 {"Online Users","Usuaris conectats"}.
 {"Online Users:","Usuaris en línia:"}.
 {"Only deliver notifications to available users","Sols enviar notificacions als usuaris disponibles"}.
+{"Only members may query archives of this room","Només membres poden consultar l'arxiu de missatges d'aquesta sala"}.
 {"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 moderators can approve voice requests","Només els moderadors poden aprovar les peticions de veu"}.
+{"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 sol·licituds 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"}.
+{"Participant","Participant"}.
 {"Password ~b","Contrasenya ~b"}.
 {"Password:","Contrasenya:"}.
 {"Password","Contrasenya"}.
@@ -236,9 +268,13 @@
 {"Path to File","Ruta al fitxer"}.
 {"Pending","Pendent"}.
 {"Period: ","Període: "}.
+{"Permanent rooms","Sales permanents"}.
 {"Persist items to storage","Persistir elements al guardar"}.
 {"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.","Recorda que aquestes opcions només fan còpia de seguretat de la base de dades Mnesia. Si estàs utilitzant el mòdul d'ODBC també deus de fer una còpia de seguretat de la base de dades de SQL a part."}.
+{"Please specify file name.","Per favor especifica el nom del fitxer."}.
+{"Please specify file size.","Per favor especifica la mida del fitxer."}.
+{"Please, wait for a while before sending new voice request","Si us plau, espera una mica abans d'enviar una nova petició de veu"}.
 {"Pong","Pong"}.
 {"Port ~b","Port ~b"}.
 {"Port","Port"}.
@@ -248,11 +284,14 @@
 {"Publish-Subscribe","Publicar-subscriure't"}.
 {"PubSub subscriber request","Petició de subscriptor PubSub"}.
 {"Purge all items when the relevant publisher goes offline","Eliminar tots els elements quan el publicant relevant es desconnecti"}.
+{"Queries to the conference members are not allowed in this room"," En aquesta sala no es permeten sol·licituds als membres de la conferència"}.
 {"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 nicknames","Sobrenoms registrats"}.
 {"Registered Users:","Usuaris registrats:"}.
 {"Registered Users","Usuaris registrats"}.
 {"Register","Registrar"}.
@@ -270,7 +309,9 @@
 {"Restore binary backup immediately:","Restaurar una còpia de seguretat binària ara mateix."}.
 {"Restore plain text backup immediately:","Restaurar una còpia de seguretat en format de text pla ara mateix:"}.
 {"Restore","Restaurar"}.
+{"Roles for which Presence is Broadcasted","Rols per als que sí se difon la seua presencia"}.
 {"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"}.
@@ -292,6 +333,7 @@
 {"September","Setembre"}.
 {"Server ~b","Servidor ~b"}.
 {"Server:","Servidor:"}.
+{"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"}.
@@ -299,7 +341,7 @@
 {"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."}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","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"}.
@@ -322,33 +364,44 @@
 {"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 verification has failed","La verificació CAPTCHA ha fallat"}.
 {"The collections with which a node is affiliated","Les col.leccions amb les que un node està afiliat"}.
 {"the password is","la contrasenya és"}.
+{"The password is too weak","La contrasenya és massa simple"}.
 {"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 IP address is blacklisted in ~s","Esta adreça IP està a la llista negra en ~s"}.
 {"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"}.
+{"Too many CAPTCHA requests","Massa peticions de CAPTCHA"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Massa autenticacions (~p) han fallat des d'aquesta adreça IP (~s). L'adreça serà desbloquejada en ~s UTC"}.
+{"Too many unacked stanzas","Massa missatges sense haver reconegut la seva recepció"}.
 {"To","Per a"}.
 {"To ~s","A ~s"}.
+{"Total rooms","Nombre total de sales"}.
+{"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"}.
 {"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)"}.
+{"Update ~p","Actualitzar ~p"}.
 {"Update plan","Pla d'actualització"}.
 {"Update script","Script d'actualització"}.
 {"Uptime:","Temps en marxa"}.
@@ -356,22 +409,32 @@
 {"User JID","JID del usuari "}.
 {"User Management","Gestió d'Usuaris"}.
 {"Username:","Nom d'usuari:"}.
+{"Users are not allowed to register accounts so quickly","Els usuaris no tenen permís per a crear comptes tan depresa"}.
 {"Users Last Activity","Última activitat d'usuari"}.
+{"User ~s","Usuari  ~s"}.
 {"Users","Usuaris"}.
 {"User","Usuari"}.
 {"Validate","Validar"}.
 {"vCard User Search","Recerca de vCard d'usuari"}.
 {"Virtual Hosts","Hosts virtuals"}.
+{"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"}.
+{"Visitor","Visitant"}.
 {"Voice request","Petició de veu"}.
+{"Voice requests are disabled in this conference","Les peticions de veu es troben desactivades en aquesta conferència"}.
 {"Wednesday","Dimecres"}.
 {"When to send the last published item","Quan s'ha enviat l'última publicació"}.
 {"Whether to allow subscriptions","Permetre subscripcions"}.
 {"You can later change your password using a Jabber client.","Podràs canviar la teva contrasenya més endavant utilitzant un client Jabber."}.
+{"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 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 a client that supports x:data to register the nickname","Necessites un client amb suport x:data per a poder registrar el sobrenom"}.
 {"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 search","Necessites un client amb suport x:data per a poder buscar"}.
+{"Your active privacy list has denied the routing of this stanza.","La teva llista de privacitat activa ha denegat l'encaminament d'aquesta stanza."}.
+{"Your contact offline message queue is full. The message has been discarded.","La cua de missatges offline és plena. El missatge ha sigut descartat"}.
 {"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"}.

priv/msgs/cs.msg

@@ -1,8 +1,10 @@
 %% -*- coding: latin-1 -*-
+{"Accept","Přijmout"}.
 {"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,6 +13,7 @@
 {"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?"}.
@@ -25,9 +28,11 @@
 {"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 ~p","Záloha ~p"}.
 {"Backup to File at ","Záloha do souboru na "}.
 {"Backup","Zálohovat"}.
 {"Bad format","Nesprávný formát"}.
@@ -48,6 +53,7 @@
 {"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:"}.
@@ -55,13 +61,13 @@
 {"Country","Země"}.
 {"CPU Time:","Čas procesoru"}.
 {"Database","Databáze"}.
+{"Database Tables at ~p","Databázové tabulky na ~p"}.
 {"Database Tables Configuration at ","Konfigurace databázových tabulek "}.
 {"December",". prosince"}.
 {"Default users as participants","Uživatelé jsou implicitně členy"}.
 {"Delete message of the day on all hosts","Smazat zprávu dne na všech hostitelích"}.
 {"Delete message of the day","Smazat zprávu dne"}.
 {"Delete Selected","Smazat vybrané"}.
-{"Delete","Smazat"}.
 {"Delete User","Smazat uživatele"}.
 {"Deliver event notifications","Doručovat upozornění na události"}.
 {"Deliver payloads with event notifications","Doručovat náklad s upozorněním na událost"}.
@@ -75,13 +81,16 @@
 {"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 Multicast service","Služba ejabberd Multicast"}.
 {"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","Webová administrace ejabberd"}.
 {"Elements","Položek"}.
 {"Email","E-mail"}.
+{"Empty Rooms","Prázdné konference"}.
 {"Enable logging","Zaznamenávat konverzace"}.
+{"Enable message archiving","Povolit ukládání historie zpráv"}.
 {"Encoding for server ~b","Kódování pro server ~b"}.
 {"End User Session","Ukončit sezení uživatele"}.
 {"Enter list of {Module, [Options]}","Vložte seznam modulů {Modul, [Parametry]}"}.
@@ -97,8 +106,10 @@
 {"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 all tables as SQL queries to a file:","Zálohovat všechny tabulky jako SQL dotazy do souboru:"}.
 {"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):"}.
+{"Failed to extract JID from your voice request approval","Došlo k chybě při získávání Jabber ID z vaší žádosti o voice práva"}.
 {"Family Name","Příjmení"}.
 {"February",". února"}.
 {"Fill in fields to search for any matching Jabber User","Vyplňte políčka pro vyhledání uživatele Jabberu"}.
@@ -132,6 +143,9 @@
 {"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"}.
+{"Incoming s2s Connections:",""}.
+{"Incorrect password","Nesprávné heslo"}.
 {"Invalid affiliation: ~s","Neplatné přiřazení: ~s"}.
 {"Invalid role: ~s","Neplatná role: ~s"}.
 {"IP addresses","IP adresy"}.
@@ -143,6 +157,10 @@
 {"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 error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","Není povoleno posílat chybové zprávy do konference. Účastník (~s) odeslal chybovou zprávu (~s) a byl vyhozen z konference."}.
+{"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é"}.
@@ -161,6 +179,7 @@
 {"Listened Ports at ","Otevřené porty na "}.
 {"Listened Ports","Otevřené porty"}.
 {"List of modules to start","Seznam modulů, které mají být spuštěné"}.
+{"List of rooms","Seznam konferencí"}.
 {"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"}.
@@ -175,16 +194,22 @@
 {"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"}.
 {"Minimum interval between voice requests (in seconds)","Minimální interval mezi žádostmi o voice práva (v sekundách)"}.
+{"Moderator","Moderátor"}.
+{"Moderator privileges required","Potřebujete práva moderátora"}.
 {"moderators only","moderátorům"}.
 {"Modified modules","Aktualizované moduly"}.
 {"Module","Modul"}.
+{"Modules at ~p","Moduly v ~p"}.
 {"Modules","Moduly"}.
 {"Monday","Pondělí"}.
+{"Multicast","Multicast"}.
+{"Multi-User Chat","Víceuživatelský chat"}.
 {"Name:","Jméno:"}.
 {"Name","Jméno"}.
 {"Never","Nikdy"}.
@@ -197,6 +222,7 @@
 {"No Data","Žádná data"}.
 {"Node ID","ID uzlu"}.
 {"Node not found","Uzel nenalezen"}.
+{"Node ~p","Uzel ~p"}.
 {"Nodes","Uzly"}.
 {"No limit","Bez limitu"}.
 {"None","Nic"}.
@@ -218,15 +244,21 @@
 {"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 members may query archives of this room","Pouze moderátoři mají povoleno měnit téma místnosti"}.
 {"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 moderators can approve voice requests","Pouze moderátoři mohou schválit žádosti o voice práva"}.
+{"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"}.
+{"Participant","Účastník"}.
 {"Password ~b","Heslo ~b"}.
 {"Password:","Heslo:"}.
 {"Password","Heslo"}.
@@ -236,9 +268,13 @@
 {"Path to File","Cesta k souboru"}.
 {"Pending","Čekající"}.
 {"Period: ","Čas: "}.
+{"Permanent rooms","Stálých konferencí"}.
 {"Persist items to storage","Uložit položky natrvalo do úložiště"}.
 {"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.","Podotýkáme, že tato nastavení budou zálohována do zabudované databáze Mnesia. Pokud používáte ODBC modul, musíte zálohovat svoji SQL databázi samostatně."}.
+{"Please specify file name.","Zvolit jméno souboru."}.
+{"Please specify file size.","Zvolit velikost souboru."}.
+{"Please, wait for a while before sending new voice request","Prosím, počkejte chvíli před posláním nové žádosti o voice práva"}.
 {"Pong","Pong"}.
 {"Port ~b","Port ~b"}.
 {"Port","Port"}.
@@ -248,11 +284,14 @@
 {"Publish-Subscribe","Publish-Subscribe"}.
 {"PubSub subscriber request","Žádost odběratele PubSub"}.
 {"Purge all items when the relevant publisher goes offline","Smazat všechny položky, pokud se příslušný poskytovatel odpojí"}.
+{"Queries to the conference members are not allowed in this room","Požadavky (queries) na členy konference nejsou v této místnosti povolené"}.
 {"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 nicknames","Registrované přezdívky"}.
 {"Registered Users","Registrovaní uživatelé"}.
 {"Registered Users:","Registrovaní živatelé:"}.
 {"Register","Zaregistrovat se"}.
@@ -270,7 +309,9 @@
 {"Restore binary backup immediately:","Okamžitě obnovit binární zálohu:"}.
 {"Restore","Obnovit"}.
 {"Restore plain text backup immediately:","Okamžitě obnovit zálohu z textového souboru:"}.
+{"Roles for which Presence is Broadcasted","Role, pro které je zpráva o stavu šířena"}.
 {"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"}.
@@ -292,6 +333,7 @@
 {"September",". září"}.
 {"Server ~b","Server ~b"}.
 {"Server:","Server:"}.
+{"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ů"}.
@@ -299,7 +341,7 @@
 {"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."}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","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í"}.
@@ -322,33 +364,44 @@
 {"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 verification has failed","Ověření CAPTCHA se nezdařilo"}.
 {"The collections with which a node is affiliated","Kolekce, se kterými je uzel spřízněn"}.
 {"the password is","heslo je"}.
+{"The password is too weak","Heslo je příliš slabé"}.
 {"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 IP address is blacklisted in ~s","IP adresa je blokována na ~s"}.
 {"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"}.
+{"Too many CAPTCHA requests","Přiliš mnoho CAPTCHA žádostí"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Příliš mnoho (~p) chybných pokusů o přihlášení z této IP adresy (~s). Adresa bude zablokována do ~s UTC"}.
+{"Too many unacked stanzas","Příliš mnoho nepotvrzených stanz"}.
 {"To","Pro"}.
 {"To ~s","Pro ~s"}.
+{"Total rooms","Celkem konferencí"}.
+{"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í"}.
 {"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 ~p","Aktualizovat ~p"}.
 {"Update plan","Aktualizovat plán"}.
 {"Update script","Aktualizované skripty"}.
 {"Uptime:","Čas běhu:"}.
@@ -356,22 +409,32 @@
 {"User JID","Jabber ID uživatele"}.
 {"User Management","Správa uživatelů"}.
 {"Username:","Uživatelské jméno:"}.
+{"User ~s",""}.
+{"Users are not allowed to register accounts so quickly","Je zakázáno registrovat účty v tak rychlém sledu"}.
 {"Users Last Activity","Poslední aktivita uživatele"}.
 {"Users","Uživatelé"}.
 {"User","Uživatel"}.
 {"Validate","Ověřit"}.
 {"vCard User Search","Hledání uživatelů podle vizitek"}.
 {"Virtual Hosts","Virtuální hostitelé"}.
+{"Visitor","Návštěvník"}.
+{"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"}.
+{"Voice requests are disabled in this conference","Voice žádosti jsou v této konferenci zakázány"}.
 {"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 can later change your password using a Jabber client.","Později můžete své heslo změnit pomocí klienta Jabberu."}.
+{"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 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 search","K vyhledávání potřebujete klienta podporujícího x:data"}.
+{"Your active privacy list has denied the routing of this stanza.","Vaše nastavení soukromí znemožnilo směrování této stance."}.
+{"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"}.

priv/msgs/de.msg

@@ -1,16 +1,19 @@
 %% -*- coding: latin-1 -*-
+{"Accept","Akzeptieren"}.
 {"Access Configuration","Zugangskonfiguration"}.
 {"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","Neue hinzufügen"}.
+{"Add New","Neue(n) 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 merkbarer Name für den Knoten"}.
 {"All activity","Alle Aktivitäten"}.
 {"Allow this Jabber ID to subscribe to this pubsub node?","Dieser Jabber-ID das Abonnement dieses pubsub-Knotens erlauben?"}.
@@ -18,17 +21,19 @@
 {"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 change nickname","Erlaube Besuchern ihren Benutzernamen zu ändern"}.
 {"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","jeden"}.
+{"A password is required to enter this room","Sie brauchen ein Passwort um diesen Raum zu betreten"}.
 {"April","April"}.
 {"August","August"}.
 {"Backup","Datensicherung"}.
 {"Backup Management","Datensicherungsverwaltung"}.
+{"Backup of ~p","Sicherung von ~p"}.
 {"Backup to File at ","Datensicherung in die Datei "}.
 {"Bad format","Ungültiges Format"}.
 {"Birthday","Geburtsdatum"}.
@@ -45,9 +50,10 @@
 {"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 Sie, ob dieses Abonnement akzeptiert werden soll."}.
+{"Choose whether to approve this entity's subscription.","Wählen 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 Ressourcen:"}.
@@ -55,10 +61,10 @@
 {"Country","Land"}.
 {"CPU Time:","CPU-Zeit:"}.
 {"Database","Datenbank"}.
+{"Database Tables at ~p","Datenbanktabellen auf ~p"}.
 {"Database Tables Configuration at ","Datenbanktabellen-Konfiguration auf "}.
 {"December","Dezember"}.
-{"Default users as participants","Standardbenutzer als Teilnehmer"}.
-{"Delete","Löschen"}.
+{"Default users as participants","Benutzer werden standardmäßig vollwertige Teilnehmer"}.
 {"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","Markierte löschen"}.
@@ -75,34 +81,39 @@
 {"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 Multicast service","ejabberd Multicast Dienst"}.
 {"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"}.
+{"Empty Rooms","Leere Räume"}.
 {"Enable logging","Protokollierung aktivieren"}.
+{"Enable message archiving","Nachrichtenarchivierung aktivieren"}.
 {"Encoding for server ~b","Kodierung für Server ~b"}.
 {"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 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 und Zeichenkodierung für die Verbindung zum IRC-Server an"}.
+{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Geben sie den Benutzernamen, Zeichenkodierung, Ports und Passwörter, die sie für die Verbindung zum IRC-Server verwenden wollen, 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 all tables as SQL queries to a file:","Alle Tabellen als SQL Abfragen in eine Datei exportieren:"}.
 {"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:"}.
+{"Failed to extract JID from your voice request approval","Fehler beim Auslesen der JID aus der Anfragenbestätigung für Sprachrechte"}.
 {"Family Name","Nachname"}.
 {"February","Februar"}.
-{"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)"}.
+{"Fill in fields to search for any matching Jabber User","Füllen sie die Felder aus, um nach bestimmten 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"}.
@@ -116,10 +127,10 @@
 {"Group ","Gruppe "}.
 {"Groups","Gruppen"}.
 {"has been banned","wurde gebannt"}.
-{"has been kicked because of an affiliation change","wurde wegen Änderung des Mitgliederstatus gekickt"}.
-{"has been kicked because of a system shutdown","wurde wegen Systemabschaltung gekickt"}.
-{"has been kicked because the room has been changed to members-only","wurde gekickt weil der Raum auf Nur-Mitglieder umgestellt wurde"}.
-{"has been kicked","wurde gekickt"}.
+{"has been kicked because of an affiliation change","wurde wegen Änderung des Mitgliederstatus entfernt"}.
+{"has been kicked because of a system shutdown","wurde wegen einer Systemabschaltung entfernt"}.
+{"has been kicked because the room has been changed to members-only","wurde entfernt weil der Raum auf Nur-Mitglieder umgestellt wurde"}.
+{"has been kicked","wurde entfernt"}.
 {" has set the subject to: "," hat das Thema geändert auf: "}.
 {"Host","Host"}.
 {"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."}.
@@ -132,6 +143,9 @@
 {"Import users data from jabberd14 spool directory:","Importiere Benutzer von jabberd14 Spool Verzeichnis:"}.
 {"Import Users from Dir at ","Benutzer importieren aus dem Verzeichnis "}.
 {"Import Users From jabberd14 Spool Files","Importiere Benutzer aus jabberd14-Spool-Dateien"}.
+{"Improper message type","Unzulässiger Nachrichtentyp"}.
+{"Incoming s2s Connections:","Eingehende s2s-Verbindungen:"}.
+{"Incorrect password","Falsches Passwort"}.
 {"Invalid affiliation: ~s","Ungültige Mitgliedschaft: ~s"}.
 {"Invalid role: ~s","Ungültige Rolle: ~s"}.
 {"IP addresses","IP Adressen"}.
@@ -143,6 +157,10 @@
 {"IRC username","IRC Benutzername"}.
 {"IRC Username","IRC-Benutzername"}.
 {"is now known as","ist nun bekannt als"}.
+{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","Es ist nicht erlaubt Fehlermeldungen an den Raum zu senden. Der Teilnehmer (~s) hat eine Fehlermeldung (~s) gesendet und wurde aus dem Raum entfernt"}.
+{"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","Die Jabber-ID ~s ist ungültig"}.
@@ -161,6 +179,7 @@
 {"Listened Ports","Aktive Ports"}.
 {"Listened Ports at ","Aktive Ports bei"}.
 {"List of modules to start","Liste der zu startenden Module"}.
+{"List of rooms","Liste von Chaträumen"}.
 {"Low level update script","Low level Aktualisierungsscript"}.
 {"Make participants list public","Teilnehmerliste öffentlich machen"}.
 {"Make room CAPTCHA protected","Raum mit Verifizierung (Captcha) versehen"}.
@@ -174,29 +193,36 @@
 {"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"}.
 {"Minimum interval between voice requests (in seconds)","Mindestdauer zwischen Anfragen für Sprachrechte (in Sekunden)"}.
+{"Moderator","Moderator"}.
+{"Moderator privileges required","Moderatorrechte benötigt"}.
 {"moderators only","ausschliesslich Moderatoren"}.
 {"Modified modules","Geänderte Module"}.
 {"Module","Modul"}.
+{"Modules at ~p","Module bei ~p"}.
 {"Modules","Module"}.
 {"Monday","Montag"}.
+{"Multicast","Multicast"}.
+{"Multi-User Chat","Mehrbenutzer-Chat (MUC)"}.
 {"Name:","Name:"}.
 {"Name","Vorname"}.
 {"Never","Nie"}.
 {"New Password:","Neues Passwort:"}.
 {"Nickname","Benutzername"}.
-{"Nickname Registration at ","Registrieren des Benutzernames auf"}.
+{"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 body provided for announce message","Kein Text für die Ankündigungsnachricht angegeben"}.
 {"No Data","Keine Daten"}.
 {"Node ID","Knoten-ID"}.
 {"Node not found","Knoten nicht gefunden"}.
+{"Node ~p","Knoten ~p"}.
 {"Nodes","Knoten"}.
 {"No limit","Keine Begrenzung"}.
 {"None","Keine"}.
@@ -218,15 +244,21 @@
 {"Online Users:","Angemeldete Benutzer:"}.
 {"Online Users","Angemeldete Benutzer"}.
 {"Only deliver notifications to available users","Benachrichtigungen nur an verfügbare Benutzer schicken"}.
+{"Only members may query archives of this room","Nur Mitglieder dürfen den Verlauf dieses Raumes abrufen"}.
 {"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 moderators can approve voice requests","Nur Moderatoren können Anfragen für Sprachrechte bestätigen"}.
+{"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 berechtigt Anfragen an die Konferenz zu senden"}.
+{"Only service administrators are allowed to send service messages","Nur Service-Administratoren sind berechtigt, Servicenachrichten zu versenden"}.
 {"Options","Optionen"}.
-{"Organization Name","Organisation"}.
+{"Organization Name","Name der 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"}.
 {"Packet","Paket"}.
+{"Participant","Teilnehmer"}.
 {"Password ~b","Passwort ~b"}.
 {"Password:","Passwort:"}.
 {"Password","Passwort"}.
@@ -234,11 +266,15 @@
 {"Password Verification","Passwort bestätigen"}.
 {"Path to Dir","Pfad zum Verzeichnis"}.
 {"Path to File","Pfad zur Datei"}.
-{"Pending","anhängig"}.
+{"Pending","Schwebend"}.
 {"Period: ","Zeitraum: "}.
+{"Permanent rooms","Permanente Chaträume"}.
 {"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 sichern. Wenn sie das ODBC-Modul verwenden, müssen sie die SQL-Datenbank manuell sichern."}.
+{"Please specify file name.","Bitte geben Sie den Dateinamen an."}.
+{"Please specify file size.","Bitte geben Sie die Dateigröße an."}.
+{"Please, wait for a while before sending new voice request","Bitte warten sie ein wenig, bevor sie eine weitere Anfrage für Sprachrechte senden"}.
 {"Pong","Pong"}.
 {"Port ~b","Port ~b"}.
 {"Port","Port"}.
@@ -248,12 +284,15 @@
 {"Publish-Subscribe","Publish-Subscribe"}.
 {"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"}.
+{"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 Festplatte"}.
 {"RAM copy","Nur RAM"}.
 {"Raw","Unformatiert"}.
 {"Really delete message of the day?","Die Nachricht des Tages wirklich löschen?"}.
+{"Recipient is not in the conference room","Der Empfänger ist nicht im Raum"}.
 {"Register a Jabber account","Jabber Konto registrieren"}.
 {"Register","Anmelden"}.
+{"Registered nicknames","Registrierte Benutzernamen"}.
 {"Registered Users:","Registrierte Benutzer:"}.
 {"Registered Users","Registrierte Benutzer"}.
 {"Registration in mod_irc for ","Registrierung in mod_irc für "}.
@@ -270,7 +309,9 @@
 {"Restore binary backup immediately:","Stelle binäre Sicherung sofort wieder her:"}.
 {"Restore plain text backup immediately:","Stelle Klartext-Sicherung sofort wieder her:"}.
 {"Restore","Wiederherstellung"}.
+{"Roles for which Presence is Broadcasted","Rollen, für die der Status übertragen wird"}.
 {"Room Configuration","Raum-Konfiguration"}.
+{"Room creation is denied by service policy","Anlegen des Raumes aufgrund der Dienstrichtlinien verweigert"}.
 {"Room description","Raum Beschreibung"}.
 {"Room Occupants","Teilnehmer in diesem Raum"}.
 {"Room title","Raumname"}.
@@ -292,14 +333,15 @@
 {"September","September"}.
 {"Server ~b","Server ~b"}.
 {"Server:","Server:"}.
+{"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"}.
+{"Show Integral Table","Integrale Tabelle anzeigen"}.
+{"Show Ordinary Table","Gewöhnliche Tabelle anzeigen"}.
 {"Shut Down Service","Dienst herunterfahren"}.
-{"~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."}.
+{"~s invites you to the room ~s","~s lädt sie in den Raum ~s ein"}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","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"}.
@@ -308,10 +350,10 @@
 {"Start Modules","Module starten"}.
 {"Start","Starten"}.
 {"Statistics of ~p","Statistiken von ~p"}.
-{"Statistics","Statistik"}.
+{"Statistics","Statistiken"}.
 {"Stop Modules at ","Stoppe Module auf "}.
 {"Stop Modules","Module stoppen"}.
-{"Stopped Nodes","Inaktive Knoten"}.
+{"Stopped Nodes","Angehaltene Knoten"}.
 {"Stop","Stoppen"}.
 {"Storage Type","Speichertyp"}.
 {"Store binary backup:","Speichere binäre Sicherung:"}.
@@ -322,33 +364,44 @@
 {"Subscriber Address","Abonnenten-Adresse"}.
 {"Subscription","Abonnement"}.
 {"Sunday","Sonntag"}.
+{"That nickname is already in use by another occupant","Dieser Benutzername wird bereits von einem Teilnehmer genutzt"}.
+{"That nickname is registered by another person","Dieser Benutzername wurde bereits von jemand anderem registriert"}.
 {"The CAPTCHA is valid.","Die Verifizierung ist gültig."}.
+{"The CAPTCHA verification has failed","Die CAPTCHA Verifizierung schlug fehl"}.
 {"The collections with which a node is affiliated","Sammlungen, mit denen ein Knoten verknüpft ist"}.
 {"the password is","das Passwort lautet"}.
+{"The password is too weak","Das Passwort ist zu einfach"}.
 {"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:"}.
+{"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 IP address is blacklisted in ~s","Diese IP Adresse ist blockiert in ~s"}.
 {"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"}.
+{"Too many CAPTCHA requests","Zu viele CAPTCHA Anfragen"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Zu viele (~p) fehlgeschlagene Anmeldeversuche von dieser IP Adresse (~s). Die Adresse wird bis ~s UTC blockiert."}.
+{"Too many unacked stanzas","Zu viele unbestätigte Stanzas"}.
 {"To ~s","An ~s"}.
+{"Total rooms","Alle Chaträume"}.
+{"Traffic rate limit is exceeded","Datenratenlimit wurde überschritten"}.
 {"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 CAPTCHA nicht erstellen"}.
 {"Unauthorized","Nicht berechtigt"}.
 {"Unregister","Abmelden"}.
 {"Unregister a Jabber account","Jabber Konto entfernen"}.
 {"Update","Aktualisieren"}.
 {"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 ~p","Aktualisierung ~p"}.
 {"Update plan","Aktualisierungsplan"}.
 {"Update script","Aktualisierungsscript"}.
 {"Uptime:","Betriebszeit:"}.
@@ -357,21 +410,31 @@
 {"User JID","Benutzer JID"}.
 {"User Management","Benutzerverwaltung"}.
 {"Username:","Benutzername:"}.
+{"Users are not allowed to register accounts so quickly","Benutzer dürfen Konten nicht so schnell registrieren"}.
 {"Users","Benutzer"}.
+{"User ~s","Benutzer ~s"}.
 {"Users Last Activity","Letzte Benutzeraktivität"}.
 {"Validate","Validieren"}.
 {"vCard User Search","vCard-Benutzer-Suche"}.
 {"Virtual Hosts","Virtuelle Hosts"}.
+{"Visitor","Besucher"}.
+{"Visitors are not allowed to change their nicknames in this room","Besucher dürfen in diesem Raum ihren Benutzernamen nicht ändern"}.
+{"Visitors are not allowed to send messages to all occupants","Besucher dürfen nicht an alle Teilnehmer Nachrichten verschicken"}.
 {"Voice request","Anfrage für Sprachrechte"}.
+{"Voice requests are disabled in this conference","Anfragen für Sprachrechte sind in diesem Raum deaktiviert"}.
 {"Wednesday","Mittwoch"}.
-{"When to send the last published item","Wann soll das letzte veröffentlichte Objekt gesendet werden"}.
+{"When to send the last published item","Wann das letzte veröffentlichte Objekt gesendet werden soll"}.
 {"Whether to allow subscriptions","Ob Abonnements erlaubt sind"}.
 {"You can later change your password using a Jabber client.","Sie können das Passwort später mit einem Jabber Client Programm ändern."}.
+{"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 \"Benutzername\" ausfüllen"}.
 {"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 search","Sie benötigen einen Client, der x:data unterstützt, um die Suche verwenden zu können"}.
+{"Your active privacy list has denied the routing of this stanza.","Ihre aktive Privacy Liste hat die Weiterleitung des Stanzas unterbunden."}.
+{"Your contact offline message queue is full. The message has been discarded.","Ihre Offline-Nachrichten-Warteschlange ist voll. Die Nachricht wurde verworfen."}.
 {"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"}.

priv/msgs/el.msg

@@ -3,6 +3,7 @@
 {"Access Control List Configuration","Διαχείριση στις Λίστες Ελέγχου Πρόσβασης"}.
 {"Access control lists","Λίστες Ελέγχου Πρόσβασης"}.
 {"Access Control Lists","Λίστες Ελέγχου Πρόσβασης"}.
+{"Access denied by service policy","Άρνηση πρόσβασης, λόγω τακτικής παροχής υπηρεσιών"}.
 {"Access rules","Κανόνες Πρόσβασης"}.
 {"Access Rules","Κανόνες Πρόσβασης"}.
 {"Action on user","Eνέργεια για το χρήστη"}.
@@ -11,6 +12,7 @@
 {"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 Ταυτότητα να εγγραφεί σε αυτό τον κόμβο Δημοσίευσης-Εγγραφής;"}.
@@ -25,6 +27,7 @@
 {"All Users","Όλοι οι χρήστες"}.
 {"Announcements","Ανακοινώσεις"}.
 {"anyone","οποιοσδήποτε"}.
+{"A password is required to enter this room","Απαιτείται κωδικός πρόσβασης για είσοδο σε αυτή την αίθουσα"}.
 {"April","Απρίλιος"}.
 {"August","Αύγουστος"}.
 {"Backup Management","Διαχείριση Αντιγράφου Ασφαλείας"}.
@@ -48,6 +51,7 @@
 {"Choose whether to approve this entity's subscription.","Επιλέξτε αν θα εγκρίθεί η εγγραφή αυτής της οντότητας."}.
 {"City","Πόλη"}.
 {"Commands","Εντολές"}.
+{"Conference room does not exist","Αίθουσα σύνεδριασης δεν υπάρχει"}.
 {"Configuration of room ~s","Διαμόρφωση Αίθουσας σύνεδριασης ~s"}.
 {"Configuration","Διαμόρφωση"}.
 {"Connected Resources:","Συνδεδεμένοι Πόροι:"}.
@@ -62,7 +66,6 @@
 {"Delete message of the day","Διαγράψτε το μήνυμα της ημέρας"}.
 {"Delete Selected","Διαγραφή επιλεγμένων"}.
 {"Delete User","Διαγραφή Χρήστη"}.
-{"Delete","Διαγραφή"}.
 {"Deliver event notifications","Κοινοποιήσεις παράδοσης"}.
 {"Deliver payloads with event notifications","Κοινοποιήσεις με την παράδοση φορτίων"}.
 {"Description:","Περιγραφή:"}.
@@ -99,6 +102,7 @@
 {"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):"}.
+{"Failed to extract JID from your voice request approval","Απέτυχε η εξαγωγή JID από την έγκριση του αιτήματος φωνής σας"}.
 {"Family Name","Επώνυμο"}.
 {"February","Φεβρουάριος"}.
 {"Fill in fields to search for any matching Jabber User","Συμπληρώστε τα πεδία για να αναζητήσετε οποιαδήποτε ταιριάζοντα Jabber χρήστη"}.
@@ -132,6 +136,8 @@
 {"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"}.
@@ -143,6 +149,9 @@
 {"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"}.
@@ -174,12 +183,14 @@
 {"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","Πατρώνυμο"}.
 {"Minimum interval between voice requests (in seconds)","Ελάχιστο χρονικό διάστημα μεταξύ αιτημάτων φωνής (σε δευτερόλεπτα)"}.
+{"Moderator privileges required","Aπαιτούνται προνόμια συντονιστή"}.
 {"moderators only","συντονιστές μόνο"}.
 {"Modified modules","Τροποποιημένα modules"}.
 {"Module","Module"}.
@@ -220,12 +231,16 @@
 {"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 moderators can approve voice requests","Μόνο οι συντονιστές μπορούν να εγκρίνουν τις αιτήσεις φωνής"}.
+{"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:","Επαλήθευση κωδικού πρόσβασης:"}.
@@ -239,6 +254,7 @@
 {"Persist items to storage","Μονιμη αποθήκευση στοιχείων"}.
 {"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.","Παρακαλώ σημειώστε ότι οι επιλογές αυτές θα αποθήκευσουν Αντιγράφο Ασφαλείας μόνο της ενσωματωμένης βάσης δεδομένων Mnesia. Εάν χρησιμοποιείτε το module ODBC, θα πρέπει επίσης να κάνετε χωριστά Αντιγράφο Ασφαλείας της SQL βάση δεδομένων σας ."}.
+{"Please, wait for a while before sending new voice request","Παρακαλώ, περιμένετε για λίγο πριν την αποστολή νέου αιτήματος φωνής"}.
 {"Pong","Πονγκ"}.
 {"Port ~b","Θύρα ~b"}.
 {"Port","Θύρα"}.
@@ -248,10 +264,12 @@
 {"Publish-Subscribe","Δημοσίευση-Εγγραφή"}.
 {"PubSub subscriber request","Αίτηση συνδρομητή Δημοσίευσης-Εγγραφής"}.
 {"Purge all items when the relevant publisher goes offline","Διαγραφή όλων των στοιχείων όταν ο σχετικός εκδότης αποσυνδέεται"}.
+{"Queries to the conference members are not allowed in this room","Ερωτήματα πρώς τα μέλη της διασκέψεως δεν επιτρέπονται σε αυτήν την αίθουσα"}.
 {"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","Εγγεγραμμένοι Χρήστες"}.
@@ -271,6 +289,7 @@
 {"Restore plain text backup immediately:","Επαναφορά αντιγράφου ασφαλείας από αρχείο κειμένου αμέσως:"}.
 {"Restore","Επαναφορά Αντιγράφου Ασφαλείας"}.
 {"Room Configuration","Διαμόρφωση Αίθουσας σύνεδριασης"}.
+{"Room creation is denied by service policy","Άρνηση δημιουργίας αίθουσας , λόγω τακτικής παροχής υπηρεσιών"}.
 {"Room description","Περιγραφή Αίθουσας"}.
 {"Room Occupants","Συμετεχόντες Αίθουσας σύνεδριασης"}.
 {"Room title","Τίτλος Αίθουσας "}.
@@ -299,7 +318,7 @@
 {"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 μπορεί να αποθηκεύσουν τον κωδικό πρόσβασής σας στον υπολογιστή σας. Χρησιμοποιήστε αυτό το χαρακτηριστικό μόνο εάν εμπιστεύεστε την ασφάλεια του υπολογιστή σας."}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Μερικοί πελάτες Jabber μπορεί να αποθηκεύσουν τον κωδικό πρόσβασής σας στον υπολογιστή σας. Χρησιμοποιήστε αυτό το χαρακτηριστικό μόνο εάν εμπιστεύεστε την ασφάλεια του υπολογιστή σας."}.
 {"Specify the access model","Καθορίστε το μοντέλο πρόσβασης"}.
 {"Specify the event message type","Καθορίστε τον τύπο μηνύματος συμβάντος"}.
 {"Specify the publisher model","Καθορίστε το μοντέλο εκδότη"}.
@@ -322,8 +341,12 @@
 {"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 verification has failed","Η επαλήθευση της εικόνας CAPTCHA απέτυχε"}.
 {"The collections with which a node is affiliated","Οι συλλογές με την οποία είναι ένας κόμβος συνδέεται"}.
+{"The password is too weak","Ο κωδικός πρόσβασης είναι πολύ ασθενές"}.
 {"the password is","ο κωδικός πρόσβασης είναι"}.
 {"The password of your Jabber account was successfully changed.","Ο κωδικός  πρόσβασης του Jabber λογαριασμού σας έχει αλλάξει επιτυχώς."}.
 {"There was an error changing the password: ","Υπήρξε ένα σφάλμα κατά την αλλαγή του κωδικού πρόσβασης:"}.
@@ -332,17 +355,19 @@
 {"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","Χρόνος"}.
+{"Too many CAPTCHA requests","Πάρα πολλά αιτήματα CAPTCHA"}.
 {"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","Καταργήση εγγραφής"}.
@@ -356,22 +381,30 @@
 {"User JID","JID Χρήστη"}.
 {"User Management","Διαχείριση χρηστών"}.
 {"Username:","Όνομα χρήστη"}.
+{"Users are not allowed to register accounts so quickly","Οι χρήστες δεν επιτρέπεται να εγγραφούν λογαριασμούς τόσο γρήγορα"}.
 {"Users Last Activity","Τελευταία Δραστηριότητα Χρήστη"}.
 {"Users","Χρήστες"}.
 {"User","Χρήστης"}.
 {"Validate","Επαληθεύστε"}.
 {"vCard User Search","vCard Αναζήτηση χρηστών"}.
 {"Virtual Hosts","εικονικοί κεντρικοί υπολογιστές"}.
+{"Visitors are not allowed to change their nicknames in this room","Οι επισκέπτες δεν επιτρέπεται να αλλάξουν τα ψευδώνυμα τους σε αυτή την αίθουσα"}.
+{"Visitors are not allowed to send messages to all occupants","Οι επισκέπτες δεν επιτρέπεται να στείλουν μηνύματα σε όλους τους συμμετέχωντες"}.
+{"Voice requests are disabled in this conference","Τα αιτήματα φωνής είναι απενεργοποιημένα, σε αυτό το συνέδριο"}.
 {"Voice request","Αίτημα φωνής"}.
 {"Wednesday","Τετάρτη"}.
 {"When to send the last published item","Πότε να αποσταλθεί το τελευταίο στοιχείο που δημοσιεύθηκε"}.
 {"Whether to allow subscriptions","Εάν επιτρέποντε συνδρομές"}.
 {"You can later change your password using a Jabber client.","Μπορείτε αργότερα να αλλάξετε τον κωδικό πρόσβασής σας χρησιμοποιώντας έναν πελάτη Jabber."}.
+{"You have been banned from this room","Σας έχει απαγορευθεί η είσοδος σε αυτή την αίθουσα"}.
+{"You must fill in field \"Nickname\" in the form","Θα πρέπει να συμπληρώσετε το πεδίο \"Ψευδώνυμο\" στη φόρμα"}.
 {"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 search","Χρειάζεστε ένα  x:data ικανό πελάτη για αναζήτηση"}.
+{"Your active privacy list has denied the routing of this stanza.","Ο ενεργός κατάλογος απορρήτου, έχει αρνηθεί τη δρομολόγηση αυτής της στροφής (stanza)."}.
+{"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"}.

priv/msgs/eo.msg

@@ -3,6 +3,7 @@
 {"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,6 +12,7 @@
 {"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"}.
@@ -25,10 +27,12 @@
 {"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 ~p","Sekurkopio de ~p"}.
 {"Backup to File at ","Faru sekurkopion je "}.
 {"Bad format","Malĝusta formo"}.
 {"Birthday","Naskiĝtago"}.
@@ -48,6 +52,7 @@
 {"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:"}.
@@ -55,10 +60,10 @@
 {"Country","Lando"}.
 {"CPU Time:","CPU-tempo"}.
 {"Database","Datumbazo"}.
+{"Database Tables at ~p","Datumbaz-tabeloj je ~p"}.
 {"Database Tables Configuration at ","Agordo de datumbaz-tabeloj je "}.
 {"December","Decembro"}.
 {"Default users as participants","Kutime farigu uzantojn kiel partpoprenantoj"}.
-{"Delete","Forigu"}.
 {"Delete message of the day","Forigu mesaĝo de la tago"}.
 {"Delete message of the day on all hosts","Forigu mesaĝo de la tago je ĉiu gastigo"}.
 {"Delete Selected","Forigu elektata(j)n"}.
@@ -75,6 +80,7 @@
 {"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 Multicast service","ejabberd Multicast-servo"}.
 {"ejabberd Publish-Subscribe module","ejabberd Public-Abonada modulo"}.
 {"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 Bajtfluo modulo"}.
 {"ejabberd vCard module","ejabberd vCard-modulo"}.
@@ -82,6 +88,7 @@
 {"Elements","Eroj"}.
 {"Email","Retpoŝto"}.
 {"Enable logging","Ŝaltu protokoladon"}.
+{"Enable message archiving","Ŝaltu mesaĝo-arkivo"}.
 {"Encoding for server ~b","Enkodigo por servilo ~b"}.
 {"End User Session","Haltigu Uzant-seancon"}.
 {"Enter list of {Module, [Options]}","Enmetu liston de {Modulo, [Elektebloj]}"}.
@@ -91,13 +98,16 @@
 {"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 enkodigojn 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 all tables as SQL queries to a file:","Eksportu ĉiuj tabeloj kiel SQL-informmendo al dosierujo:"}.
 {"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):"}.
+{"Failed to extract JID from your voice request approval","Malsukcesis ekstrakti JID-on de via voĉ-pet-aprobo"}.
 {"Family Name","Lasta Nomo"}.
 {"February","Februaro"}.
 {"Fill in fields to search for any matching Jabber User","Kompletigu la formon por serĉi rekonata Jabber-uzanto"}.
@@ -131,6 +141,8 @@
 {"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"}.
@@ -142,6 +154,9 @@
 {"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"}.
@@ -160,6 +175,7 @@
 {"Listened Ports at ","Atentataj pordoj je "}.
 {"Listened Ports","Atentataj pordoj"}.
 {"List of modules to start","Listo de moduloj por starti"}.
+{"List of rooms","Listo de babilejoj"}.
 {"Low level update script","Bazanivela ĝisdatigo-skripto"}.
 {"Make participants list public","Farigu partoprento-liston publika"}.
 {"Make room CAPTCHA protected","Farigu babilejon protektata per CAPTCHA"}.
@@ -173,17 +189,22 @@
 {"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"}.
 {"Minimum interval between voice requests (in seconds)","Minimuma intervalo inter voĉ-petoj (je sekundoj)"}.
+{"Moderator privileges required","Moderantaj rajtoj bezonata"}.
 {"moderators only","moderantoj sole"}.
 {"Modified modules","Ĝisdatigitaj moduloj"}.
 {"Module","Modulo"}.
+{"Modules at ~p","Moduloj je ~p"}.
 {"Modules","Moduloj"}.
 {"Monday","Lundo"}.
+{"Multicast","Multicast"}.
+{"Multi-User Chat","Grupbabilado"}.
 {"Name:","Nomo:"}.
 {"Name","Nomo"}.
 {"Never","Neniam"}.
@@ -196,6 +217,7 @@
 {"No Data","Neniu datumo"}.
 {"Node ID","Nodo ID"}.
 {"Node not found","Nodo ne trovita"}.
+{"Node ~p","Nodo ~p"}.
 {"Nodes","Nodoj"}.
 {"No limit","Neniu limigo"}.
 {"None","Nenio"}.
@@ -219,12 +241,16 @@
 {"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 moderators can approve voice requests","Nur moderigantoj povas aprobi voĉ-petojn"}.
+{"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:"}.
@@ -235,9 +261,11 @@
 {"Path to File","Voje de dosiero"}.
 {"Pending","Atendanta"}.
 {"Period: ","Periodo: "}.
+{"Permanent rooms","Permanentaj babilejoj"}.
 {"Persist items to storage","Savu erojn en konservado"}.
 {"Ping","Sondaĵo"}.
 {"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.","Rimarku ke ĉi tiuj elektebloj nur sekurkopias la propran Mnesia-datumbazon. Se vi uzas la ODBC-modulon, vi ankaŭ devas sekurkopii tiujn SQL-datumbazoj aparte."}.
+{"Please, wait for a while before sending new voice request","Bonvolu atendi iomete antaŭ ol sendi plian voĉ-peton"}.
 {"Pong","Resondaĵo"}.
 {"Port ~b","Pordo ~b"}.
 {"Port","Pordo"}.
@@ -247,11 +275,14 @@
 {"Publish-Subscribe","Public-Abonado"}.
 {"PubSub subscriber request","PubAbo abonpeto"}.
 {"Purge all items when the relevant publisher goes offline","Forigu ĉiujn erojn kiam la rilata publikanto malkonektiĝas"}.
+{"Queries to the conference members are not allowed in this room","Malpermesas informmendoj al partoprenantoj en ĉi tiu babilejo"}.
 {"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 nicknames","Registritaj uzantnomoj"}.
 {"Registered Users:","Registritaj uzantoj:"}.
 {"Registered Users","Registritaj uzantoj"}.
 {"Register","Registru"}.
@@ -270,6 +301,7 @@
 {"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"}.
@@ -298,7 +330,7 @@
 {"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."}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","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"}.
@@ -321,33 +353,44 @@
 {"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 CAPTCHA ĝustas"}.
+{"The CAPTCHA verification has failed","La CAPTCHA-kontrolado malsukcesis"}.
 {"The collections with which a node is affiliated","Aro kun kiu nodo estas filigita"}.
 {"the password is","la pasvorto estas"}.
+{"The password is too weak","La pasvorto estas ne sufiĉe forta"}.
 {"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 IP address is blacklisted in ~s","Ĉi tiu IP-adreso estas barata in ~s"}.
 {"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"}.
+{"Too many CAPTCHA requests","Tro multaj CAPTCHA-petoj"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Tro da malsukcesaj aŭtentprovoj (~p) de ĉi tiu IP-adreso (~s). La adreso estos malbarata je ~s UTC."}.
+{"Too many unacked stanzas","Tro da neagnoskitaj stancoj"}.
 {"To ~s","Al ~s"}.
+{"Total rooms","Babilejoj"}.
+{"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 CAPTCHA"}.
 {"Unauthorized","Nepermesita"}.
 {"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)"}.
+{"Update ~p","Ĝisdatigu ~p-n"}.
 {"Update plan","Ĝisdatigo-plano"}.
 {"Update script","Ĝisdatigo-skripto"}.
 {"Uptime:","Daŭro de funkciado"}.
@@ -355,22 +398,31 @@
 {"User JID","Uzant-JID"}.
 {"User Management","Uzanto-administrado"}.
 {"Username:","Uzantnomo"}.
+{"Users are not allowed to register accounts so quickly","Ne estas permesata al uzantoj registri tiel rapide"}.
 {"Users Last Activity","Lasta aktiveco de uzanto"}.
 {"Users","Uzantoj"}.
+{"User ~s","Uzanto ~s"}.
 {"User","Uzanto"}.
 {"Validate","Validigu"}.
 {"vCard User Search","Serĉado de vizitkartoj"}.
 {"Virtual Hosts","Virtual-gastigoj"}.
+{"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"}.
+{"Voice requests are disabled in this conference","Voĉ-petoj estas malebligita en jena babilejo"}.
 {"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 can later change your password using a Jabber client.","Poste vi povas ŝanĝi vian pasvorton per Ĵabber-kliento."}.
+{"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 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 search","Vi bezonas klienton kun x:data-funkcio por serĉado"}.
+{"Your active privacy list has denied the routing of this stanza.","Via aktiva privatec-listo malpermesas enkursigi ĉi-tiun pakaĵon"}.
+{"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"}.

priv/msgs/es.msg

@@ -1,8 +1,10 @@
 %% -*- coding: latin-1 -*-
+{"Accept","Aceptar"}.
 {"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,6 +13,7 @@
 {"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 Jabber ID que se subscriba a este nodo PubSub?"}.
@@ -25,6 +28,7 @@
 {"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"}.
@@ -49,6 +53,7 @@
 {"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:"}.
@@ -60,7 +65,6 @@
 {"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"}.
-{"Delete","Eliminar"}.
 {"Delete message of the day","Borrar mensaje del dia"}.
 {"Delete message of the day on all hosts","Borrar el mensaje del día en todos los dominios"}.
 {"Delete Selected","Eliminar los seleccionados"}.
@@ -77,13 +81,16 @@
 {"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 Multicast service","Servicio Multicast de 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 Web Admin","ejabberd Web Admin"}.
 {"Elements","Elementos"}.
 {"Email","correo"}.
+{"Empty Rooms","Salas vacías"}.
 {"Enable logging","Guardar históricos"}.
+{"Enable message archiving","Activar el almacenamiento de mensajes"}.
 {"Encoding for server ~b","Codificación del servidor ~b"}.
 {"End User Session","Cerrar sesión de usuario"}.
 {"Enter list of {Module, [Options]}","Introduce lista de {módulo, [opciones]}"}.
@@ -102,6 +109,7 @@
 {"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):"}.
+{"Failed to extract JID from your voice request approval","Fallo al extraer el Jabber ID de tu aprobación de petición de voz"}.
 {"Family Name","Apellido"}.
 {"February","febrero"}.
 {"Fill in fields to search for any matching Jabber User","Rellena campos para buscar usuarios Jabber que concuerden"}.
@@ -135,6 +143,9 @@
 {"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"}.
+{"Incoming s2s Connections:","Conexiones S2S entrantes:"}.
+{"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"}.
@@ -146,6 +157,10 @@
 {"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 error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","No está permitido enviar mensajes de error a la sala. Este participante (~s) ha enviado un mensaje de error (~s) y fue expulsado de la sala"}.
+{"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"}.
@@ -164,6 +179,7 @@
 {"Listened Ports at ","Puertos de escucha en "}.
 {"Listened Ports","Puertos de escucha"}.
 {"List of modules to start","Lista de módulos a iniciar"}.
+{"List of rooms","Lista de salas"}.
 {"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"}.
@@ -177,18 +193,23 @@
 {"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"}.
 {"Minimum interval between voice requests (in seconds)","Intervalo mínimo entre peticiones de voz (en segundos)"}.
+{"Moderator","Moderador"}.
+{"Moderator privileges required","Se necesita privilegios de moderador"}.
 {"moderators only","solo moderadores"}.
 {"Modified modules","Módulos modificados"}.
 {"Module","Módulo"}.
 {"Modules at ~p","Módulos en ~p"}.
 {"Modules","Módulos"}.
 {"Monday","lunes"}.
+{"Multicast","Multicast"}.
+{"Multi-User Chat","Salas de Charla"}.
 {"Name:","Nombre:"}.
 {"Name","Nombre"}.
 {"Never","Nunca"}.
@@ -223,15 +244,21 @@
 {"Online Users:","Usuarios conectados:"}.
 {"Online Users","Usuarios conectados"}.
 {"Only deliver notifications to available users","Solo enviar notificaciones a los usuarios disponibles"}.
+{"Only members may query archives of this room","Solo miembros pueden consultar el archivo de mensajes de la sala"}.
 {"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 moderators can approve voice requests","Solo los moderadores pueden aprobar peticiones de voz"}.
+{"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"}.
+{"Participant","Participante"}.
 {"Password ~b","Contraseña ~b"}.
 {"Password:","Contraseña:"}.
 {"Password","Contraseña"}.
@@ -241,9 +268,13 @@
 {"Path to File","Ruta al fichero"}.
 {"Pending","Pendiente"}.
 {"Period: ","Periodo: "}.
+{"Permanent rooms","Salas permanentes"}.
 {"Persist items to storage","Persistir elementos al almacenar"}.
 {"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.","Ten en cuenta que estas opciones solo harán copia de seguridad de la base de datos Mnesia embebida. Si estás usando ODBC tendrás que hacer también copia de seguridad de tu base de datos SQL."}.
+{"Please specify file name.","Por favor especifica el nombre del fichero."}.
+{"Please specify file size.","Por favor especifica el tamaño del  fichero."}.
+{"Please, wait for a while before sending new voice request","Por favor, espera un poco antes de enviar otra petición de voz"}.
 {"Pong","Pong"}.
 {"Port ~b","Puerto ~b"}.
 {"Port","Puerto"}.
@@ -253,11 +284,14 @@
 {"Publish-Subscribe","Servicio de Publicar-Subscribir"}.
 {"PubSub subscriber request","Petición de subscriptor de PubSub"}.
 {"Purge all items when the relevant publisher goes offline","Borra todos los elementos cuando el publicador relevante se desconecta"}.
+{"Queries to the conference members are not allowed in this room","En esta sala no se permiten solicitudes a los miembros de la sala"}.
 {"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 nicknames","Apodos registrados"}.
 {"Registered Users:","Usuarios registrados:"}.
 {"Registered Users","Usuarios registrados"}.
 {"Register","Registrar"}.
@@ -275,7 +309,9 @@
 {"Restore binary backup immediately:","Restaurar inmediatamente copia de seguridad binaria:"}.
 {"Restore plain text backup immediately:","Restaurar copias de seguridad de texto plano inmediatamente:"}.
 {"Restore","Restaurar"}.
+{"Roles for which Presence is Broadcasted","Roles para los que sí se difunde su Presencia"}.
 {"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"}.
@@ -297,6 +333,7 @@
 {"September","septiembre"}.
 {"Server ~b","Servidor ~b"}.
 {"Server:","Servidor:"}.
+{"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"}.
@@ -304,7 +341,7 @@
 {"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."}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","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"}.
@@ -327,9 +364,13 @@
 {"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 verification has failed","La verificación de CAPTCHA ha fallado"}.
 {"The collections with which a node is affiliated","Las colecciones a las que un nodo está afiliado"}.
 {"the password is","la contraseña es"}.
+{"The password is too weak","La contraseña es demasiado débil"}.
 {"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:"}.
@@ -338,19 +379,22 @@
 {"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 CAPTCHA requests","Demasiadas peticiones de CAPTCHA"}.
 {"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"}.
+{"Total rooms","Salas totales"}.
+{"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"}.
 {"Unregister a Jabber account","Borrar una cuenta Jabber"}.
 {"Unregister","Borrar"}.
@@ -365,6 +409,7 @@
 {"User JID","Jabber ID del usuario"}.
 {"User Management","Administración de usuarios"}.
 {"Username:","Nombre de usuario:"}.
+{"Users are not allowed to register accounts so quickly","Los usuarios no tienen permitido crear cuentas con tanta rapidez"}.
 {"Users Last Activity","Última actividad de los usuarios"}.
 {"User ~s","Usuario ~s"}.
 {"Users","Usuarios"}.
@@ -372,16 +417,24 @@
 {"Validate","Validar"}.
 {"vCard User Search","Buscar vCard de usuario"}.
 {"Virtual Hosts","Dominios Virtuales"}.
+{"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"}.
+{"Visitor","Visitante"}.
 {"Voice request","Petición de voz"}.
+{"Voice requests are disabled in this conference","Las peticiones de voz están desactivadas en esta sala"}.
 {"Wednesday","miércoles"}.
 {"When to send the last published item","Cuando enviar el último elemento publicado"}.
 {"Whether to allow subscriptions","Permitir subscripciones"}.
 {"You can later change your password using a Jabber client.","Puedes cambiar tu contraseña después, usando un cliente Jabber."}.
+{"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 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 search","Necesitas un cliente con soporte de x:data para poder buscar"}.
+{"Your active privacy list has denied the routing of this stanza.","Tu lista de privacidad activa ha denegado el encío de este paquete."}.
+{"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"}.

priv/msgs/fr.msg

@@ -3,6 +3,7 @@
 {"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,6 +12,7 @@
 {"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"}.
@@ -19,13 +21,17 @@
 {"Allow users to send invites","Permettre aux utilisateurs d'envoyer des invitations"}.
 {"Allow users to send private messages","Autoriser les utilisateurs à envoyer des messages privés"}.
 {"Allow visitors to change nickname","Autoriser les visiteurs à changer de pseudo"}.
+{"Allow visitors to send private messages to","Autoriser les visiteurs à envoyer des messages privés"}.
 {"Allow visitors to send status text in presence updates","Autoriser les visiteurs à envoyer un message d'état avec leur présence"}.
+{"Allow visitors to send voice requests","Permettre aux visiteurs d'envoyer des demandes de 'voice'"}.
 {"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 ~p","Sauvegarde de ~p"}.
 {"Backup","Sauvegarde"}.
 {"Backup to File at ","Sauvegarde sur fichier sur "}.
 {"Bad format","Mauvais format"}.
@@ -46,6 +52,7 @@
 {"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:"}.
@@ -53,13 +60,13 @@
 {"Country","Pays"}.
 {"CPU Time:","Temps CPU :"}.
 {"Database","Base de données"}.
+{"Database Tables at ~p","Tables de base de données sur ~p"}.
 {"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"}.
 {"Delete message of the day on all hosts","Supprimer le message du jour sur tous les domaines"}.
 {"Delete message of the day","Supprimer le message du jour"}.
 {"Delete Selected","Suppression des éléments sélectionnés"}.
-{"Delete","Supprimer"}.
 {"Delete User","Supprimer l'utilisateur"}.
 {"Deliver event notifications","Envoyer les notifications d'événement"}.
 {"Deliver payloads with event notifications","Inclure le contenu du message avec la notification"}.
@@ -70,8 +77,10 @@
 {"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"}.
+{"Either approve or decline the voice request.","Approuver ou refuser la demande de 'voice'"}.
 {"ejabberd IRC module","Module IRC ejabberd"}.
 {"ejabberd MUC module","Module MUC ejabberd"}.
+{"ejabberd Multicast service","Service de Multidiffusion d'ejabberd"}.
 {"ejabberd Publish-Subscribe module","Module Publish-Subscribe d'ejabberd"}.
 {"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 Bytestreams module"}.
 {"ejabberd vCard module","Module vCard ejabberd"}.
@@ -79,6 +88,7 @@
 {"Elements","Éléments"}.
 {"Email","Email"}.
 {"Enable logging","Activer l'archivage"}.
+{"Enable message archiving","Activer l'archivage de messages"}.
 {"Encoding for server ~b","Codage pour le serveur ~b"}.
 {"End User Session","Terminer la session de l'utilisateur"}.
 {"Enter list of {Module, [Options]}","Entrez une liste de {Module, [Options]}"}.
@@ -93,6 +103,8 @@
 {"Erlang Jabber Server","Serveur Jabber Erlang"}.
 {"Error","Erreur"}.
 {"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","Exempter des Jabberd IDs du test CAPTCHA"}.
+{"Export all tables as SQL queries to a file:","Exporter toutes les tables en tant que requêtes SQL vers un fichier:"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Exporter les données de tous les utilisateurs du serveur vers un fichier PIEFXIS (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Exporter les données utilisateurs d'un hôte vers un fichier PIEFXIS (XEP-0227):"}.
 {"Family Name","Nom de famille"}.
@@ -108,6 +120,7 @@
 {"Get User Last Login Time","Récupérer la dernière date de connexion de l'utilisateur"}.
 {"Get User Password","Récupérer le mot de passe de l'utilisateur"}.
 {"Get User Statistics","Récupérer les statistiques de l'utilisateur"}.
+{"Grant voice to this person?","Accorder 'voice' à cet utilisateur"}.
 {"Group ","Groupe "}.
 {"Groups","Groupes"}.
 {"has been banned","a été banni"}.
@@ -127,6 +140,8 @@
 {"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,6 +153,9 @@
 {"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"}.
@@ -156,6 +174,7 @@
 {"Listened Ports at ","Ports ouverts sur "}.
 {"Listened Ports","Ports ouverts"}.
 {"List of modules to start","Liste des modules à démarrer"}.
+{"List of rooms","Liste des salons"}.
 {"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"}.
@@ -169,16 +188,22 @@
 {"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"}.
+{"Minimum interval between voice requests (in seconds)","Intervalle minimum entre les demandes de 'voice' (en secondes)"}.
+{"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 ~p","Modules sur ~p"}.
 {"Modules","Modules"}.
 {"Monday","Lundi"}.
+{"Multicast","Multidiffusion"}.
+{"Multi-User Chat","Discussion de groupe"}.
 {"Name:","Nom :"}.
 {"Name","Nom"}.
 {"Never","Jamais"}.
@@ -186,10 +211,12 @@
 {"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"}.
+{"nobody","personne"}.
 {"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 not found","Noeud non trouvé"}.
+{"Node ~p","Noeud ~p"}.
 {"Nodes","Noeuds"}.
 {"No limit","Pas de limite"}.
 {"None","Aucun"}.
@@ -213,12 +240,15 @@
 {"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:"}.
@@ -229,6 +259,7 @@
 {"Path to File","Chemin vers le fichier"}.
 {"Pending","En suspens"}.
 {"Period: ","Période :"}.
+{"Permanent rooms","Salons persistent"}.
 {"Persist items to storage","Stockage persistant des éléments"}.
 {"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.","Ces options sauvegardent uniquement la base de données interne Mnesia. Si vous utilisez le module ODBC vous devez sauvegarde votre base SQL séparément."}.
@@ -241,11 +272,14 @@
 {"Publish-Subscribe","Publication-Abonnement"}.
 {"PubSub subscriber request","Demande d'abonnement PubSub"}.
 {"Purge all items when the relevant publisher goes offline","Purger tous les items lorsque publieur est hors-ligne"}.
+{"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"}.
 {"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 nicknames","Pseudos enregistrés"}.
 {"Registered Users:","Utilisateurs enregistrés:"}.
 {"Registered Users","Utilisateurs enregistrés"}.
 {"Register","Enregistrer"}.
@@ -264,6 +298,7 @@
 {"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"}.
@@ -292,7 +327,7 @@
 {"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."}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","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"}.
@@ -315,27 +350,36 @@
 {"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 verification has failed","La vérification du CAPTCHA a échoué"}.
 {"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"}.
+{"The password is too weak","Le mot de passe est trop faible"}.
 {"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 IP address is blacklisted in ~s","Cette adresse IP est blacklistée dans ~s"}.
 {"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"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Trop (~p) d'authentification ont échoué pour cette adresse IP (~s). L'adresse sera débloquée à ~s UTC"}.
+{"Too many unacked stanzas","Trop de stanzas sans accusé de réception (ack)"}.
 {"To ~s","A ~s"}.
+{"Total rooms","Nombre de salons"}.
+{"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"}.
@@ -343,26 +387,37 @@
 {"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 plan","Plan de mise à jour"}.
+{"Update ~p","Mise à jour de ~p"}.
 {"Update script","Script de mise à jour"}.
 {"Uptime:","Temps depuis le démarrage :"}.
 {"Use of STARTTLS required","L'utilisation de STARTTLS est impérative"}.
+{"User JID","JID de l'utilisateur "}.
 {"User Management","Gestion des utilisateurs"}.
 {"Username:","Nom d'utilisateur :"}.
+{"Users are not allowed to register accounts so quickly","Les utilisateurs ne sont pas autorisés à enregistrer des comptes si rapidement"}.
 {"Users Last Activity","Dernière activité des utilisateurs"}.
+{"User ~s","Utilisateur ~s"}.
 {"Users","Utilisateurs"}.
 {"User","Utilisateur"}.
 {"Validate","Valider"}.
 {"vCard User Search","Recherche dans l'annnuaire"}.
 {"Virtual Hosts","Serveurs virtuels"}.
+{"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"}.
+{"Voice request","Demande de 'voice'"}.
 {"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 can later change your password using a Jabber client.","Vous pouvez changer votre mot de passe plus tard en utilisant un client Jabber."}.
+{"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 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 search","Vous avez besoin d'un client supportant x:data pour faire une recherche"}.
+{"Your active privacy list has denied the routing of this stanza.","Votre règle de flitrage active a empêché le routage de ce stanza."}.
+{"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"}.

priv/msgs/gl.msg

@@ -3,6 +3,7 @@
 {"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,6 +12,7 @@
 {"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?"}.
@@ -23,6 +25,7 @@
 {"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"}.
@@ -40,6 +43,7 @@
 {"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:"}.
@@ -50,7 +54,6 @@
 {"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"}.
-{"Delete","Eliminar"}.
 {"Delete message of the day","Borrar mensaxe do dia"}.
 {"Delete message of the day on all hosts","Borrar a mensaxe do día en todos os dominios"}.
 {"Delete Selected","Eliminar os seleccionados"}.
@@ -119,6 +122,8 @@
 {"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"}.
@@ -130,6 +135,9 @@
 {"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,10 +168,12 @@
 {"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"}.
@@ -201,12 +211,15 @@
 {"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:"}.
@@ -227,10 +240,12 @@
 {"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"}.
@@ -248,6 +263,7 @@
 {"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"}.
@@ -296,15 +312,17 @@
 {"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 collections with which a node is affiliated","As coleccións coas que un nodo está afiliado"}.
 {"the password is","a contrasinal é"}.
-{"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:"}.
@@ -319,16 +337,22 @@
 {"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"}.
 {"Validate","Validar"}.
 {"vCard User Search","Procura de usuario en vCard"}.
 {"Virtual Hosts","Hosts Virtuais"}.
+{"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"}.
 {"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 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"}.

priv/msgs/he.msg

@@ -1,35 +1,40 @@
 %% -*- coding: latin-1 -*-
+{"Accept","קבל"}.
 {"Access Configuration","תצורת גישה"}.
 {"Access Control List Configuration","תצורת רשימת בקרת גישה"}.
 {"Access control lists","רשימות בקרת גישה"}.
 {"Access Control Lists","רשימות בקרת גישה"}.
+{"Access denied by service policy","גישה נדחתה על ידי פוליסת שירות"}.
 {"Access rules","כללי גישה"}.
 {"Access Rules","כללי גישה"}.
 {"Action on user","פעולה על משתמש"}.
-{"Add Jabber ID","הוסף JID"}.
+{"Add Jabber ID","הוסף מזהה Jabber"}.
 {"Add New","הוסף חדש"}.
 {"Add User","הוסף משתמש"}.
 {"Administration of ","ניהול של "}.
 {"Administration","הנהלה"}.
-{"A friendly name for the node","שם ידידותי עבור הממסר"}.
+{"Administrator privileges required","נדרשות הרשאות מנהל"}.
+{"A friendly name for the node","שם ידידותי עבור הצומת"}.
 {"All activity","כל פעילות"}.
-{"Allow this Jabber ID to subscribe to this pubsub node?","להתיר לכתובת JID זו להירשם אל ממסר PubSub זה?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","להתיר למזהה Jabber זה להירשם לצומת PubSub זה?"}.
 {"Allow users to change the subject","התר למשתמשים לשנות את הנושא"}.
 {"Allow users to query other users","התר למשתמשים לתשאל משתמשים אחרים"}.
 {"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 status text in presence updates","התר למבקרים לשלוח טקסט מצב בתוך עדכוני נוכחות"}.
 {"Allow visitors to send voice requests","התר למבקרים לשלוח בקשות ביטוי"}.
 {"All Users","כל המשתמשים"}.
-{"Announcements","מודעות"}.
+{"Announcements","בשורות"}.
 {"anyone","לכל אחד"}.
+{"A password is required to enter this room","נדרשת סיסמה כדי להיכנס אל חדר זה"}.
 {"April","אפריל"}.
 {"August","אוגוסט"}.
 {"Backup Management","ניהול גיבוי"}.
-{"Backup to File at ","גבה אל קובץ אצל "}.
-{"Backup","גבה"}.
+{"Backup of ~p","גיבוי של ~p"}.
+{"Backup to File at ","גבה לקובץ אצל "}.
+{"Backup","גיבוי"}.
 {"Bad format","פורמט רע"}.
 {"Birthday","יום הולדת"}.
 {"CAPTCHA web page","עמוד רשת CAPTCHA"}.
@@ -37,74 +42,81 @@
 {"Change User Password","שנה סיסמת משתמש"}.
 {"Characters not allowed:","תווים לא מורשים:"}.
 {"Chatroom configuration modified","תצורת חדר שיחה שונתה"}.
-{"Chatroom is created","חדר שיחה נוצר"}.
-{"Chatroom is destroyed","חדר שיחה הרוס"}.
-{"Chatroom is started","חדר שיחה מותחל"}.
-{"Chatroom is stopped","חדר שיחה הופסק"}.
+{"Chatroom is created","חדר שיחה נוצר כעת"}.
+{"Chatroom is destroyed","חדר שיחה הינו הרוס"}.
+{"Chatroom is started","חדר שיחה מותחל כעת"}.
+{"Chatroom is stopped","חדר שיחה הינו מופסק"}.
 {"Chatrooms","חדרי שיחה"}.
-{"Choose a username and password to register with this server","בחר שם משתמש וסיסמה להירשם עם שרת זה"}.
+{"Choose a username and password to register with this server","בחר שם משתמש וסיסמה כדי להירשם בעזרת שרת זה"}.
 {"Choose modules to stop","בחר מודולים להפסקה"}.
 {"Choose storage type of tables","בחר טיפוס אחסון של טבלאות"}.
-{"Choose whether to approve this entity's subscription.","בחר האם לאשר את המנוי של ישות זו."}.
+{"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 ~p","טבלאות מסד נתונים אצל ~p"}.
 {"Database Tables Configuration at ","תצורת טבלאות מסד נתונים אצל "}.
 {"Database","מסד נתונים"}.
 {"December","דצמבר"}.
-{"Default users as participants","משתמשים משתמטים כמשתתפים"}.
-{"Delete message of the day on all hosts","מחק הודעת היום בכל המארחים"}.
-{"Delete message of the day","מחק הודעת היום"}.
+{"Default users as participants","משתמשים שגרתיים כמשתתפים"}.
+{"Delete message of the day on all hosts","מחק את בשורת היום בכל המארחים"}.
+{"Delete message of the day","מחק את בשורת היום"}.
 {"Delete Selected","מחק נבחרות"}.
 {"Delete User","מחק משתמש"}.
-{"Delete","מחק"}.
-{"Deliver event notifications","מסירת התראות אירוע"}.
-{"Deliver payloads with event notifications","מסירת מטען ייעוד (מטע״ד) יחד עם התראות אירוע"}.
+{"Deliver event notifications","מסור התראות אירוע"}.
+{"Deliver payloads with event notifications","מסור מטעני ייעוד (מטע״ד) יחד עם התראות אירוע"}.
 {"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","השלך אל קובץ טקסט"}.
+{"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.","או שתאשר או שתדחה את בקשת הביטוי."}.
+{"Either approve or decline the voice request.","אשר או דחה בקשת ביטוי."}.
 {"ejabberd IRC module","מודול IRC של ejabberd"}.
 {"ejabberd MUC module","מודול MUC של ejabberd"}.
+{"ejabberd Multicast service","שירות שידור מרובב של ejabberd"}.
 {"ejabberd Publish-Subscribe module","מודול Publish-Subscribe של ejabberd"}.
 {"ejabberd SOCKS5 Bytestreams module","מודול SOCKS5 Bytestreams של ejabberd"}.
 {"ejabberd vCard module","מודול vCard של ejabberd"}.
 {"ejabberd Web Admin","מנהל רשת ejabberd"}.
 {"Elements","אלמנטים"}.
 {"Email","דוא״ל"}.
-{"Enable logging","אפשור רישום פעילות"}.
+{"Empty Rooms","חדרים ריקים"}.
+{"Enable logging","אפשר רישום פעילות"}.
+{"Enable message archiving","אפשר אחסון הודעות"}.
 {"Encoding for server ~b","קידוד עבור שרת ~b"}.
 {"End User Session","סיים סשן משתמש"}.
 {"Enter list of {Module, [Options]}","הזן רשימה של {מודול, [אפשרויות]}"}.
-{"Enter nickname you want to register","הזן שם כינוי אשר ברצונך לרושמו"}.
-{"Enter path to backup file","הזן נתיב אל קובץ גיבוי"}.
-{"Enter path to jabberd14 spool dir","הזן נתיב אל מדור סליל (spool dir) של jabberd14"}.
-{"Enter path to jabberd14 spool file","הזן נתיב אל קובץ סליל (spool file) של jabberd14"}.
-{"Enter path to text file","הזן נתיב אל קובץ טקסט"}.
-{"Enter the text you see","הזן את הטקסט אותו הינך רואה"}.
-{"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.","הזן שם משתמש וקידודים בהם ברצונך להשתמש לשם התחברות אל שרתים של IRC.  לחץ 'הבא' כדי להשיג עוד שדות למילוי.  לחץ 'סיים' כדי לשמור הגדרות."}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","הזן שם משתמש, קידודים, פורטים וסיסמאות בהם ברצונך להשתמש לשם התחברות אל שרתים של IRC"}.
+{"Enter nickname you want to register","הזן שם כינוי אשר ברצונך לרשום"}.
+{"Enter path to backup file","הזן נתיב לקובץ גיבוי"}.
+{"Enter path to jabberd14 spool dir","הזן נתיב למדור סליל (spool dir) של jabberd14"}.
+{"Enter path to jabberd14 spool file","הזן נתיב לקובץ סליל (spool file) של jabberd14"}.
+{"Enter path to text file","הזן נתיב לקובץ טקסט"}.
+{"Enter the text you see","הזן את הכיתוב שאתה רואה"}.
+{"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.","הזן שם משתמש וקידודים בהם ברצונך להשתמש לצורך התחברות לשרתי IRC.  לחץ 'הבא' כדי להשיג עוד שדות למילוי.  לחץ 'סיים' כדי לשמור הגדרות."}.
+{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","הזן שם משתמש, קידודים, פורטים וסיסמאות בהם ברצונך להשתמש לצורך התחברות לשרתי IRC"}.
+{"Erlang Jabber Server","שרת ג׳אבּר Erlang"}.
 {"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):"}.
+{"Exclude Jabber IDs from CAPTCHA challenge","הוצא כתובות Jabber מתוך אתגר CAPTCHA"}.
+{"Export all tables as SQL queries to a file:","יצא את כל הטבלאות בתור שאילתות SQL לתוך קובץ:"}.
+{"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):"}.
+{"Failed to extract JID from your voice request approval","נכשל לחלץ JID מתוך אישור בקשת הביטוי שלך"}.
 {"Family Name","שם משפחה"}.
 {"February","פברואר"}.
 {"Fill in fields to search for any matching Jabber User","מלא את שדות אלו כדי לחפש עבור כל משתמש Jabber מבוקש"}.
-{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","מלא את התבניות כדי לחפש עבור כל משתמש Jabber מבוקש (באפשרותך להוסיף * בסוף שדה כדי להתאים אל מחרוזת-משנה)"}.
+{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","מלא את הטופס כדי לחפש אחר כל משתמש Jabber מבוקש (באפשרותך להוסיף * בסוף שדה כדי להתאים למחרוזת-משנה)"}.
 {"Friday","יום שישי"}.
 {"From ~s","מאת ~s"}.
-{"From","מן"}.
+{"From","מאת"}.
 {"Full Name","שם מלא"}.
 {"Get Number of Online Users","השג מספר של משתמשים מקוונים"}.
 {"Get Number of Registered Users","השג מספר של משתמשים רשומים"}.
@@ -121,16 +133,19 @@
 {"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 server\", \"encoding\", port, \"password\"}'.  באופן משתמט שירות זה משתמש בקידוד \"~s\", פורט ~p, סיסמה ריקה."}.
+{"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 server\", \"encoding\", port, \"password\"}'.  באופן שגרתי שירות זה משתמש בקידוד \"~s\", פורט ~p, סיסמה ריקה."}.
 {"Import Directory","ייבוא מדור"}.
 {"Import File","ייבוא קובץ"}.
-{"Import user data from jabberd14 spool file:","ייבוא נתוני משתמש מתוך קובץ סליל (spool file) של jabberd14:"}.
+{"Import user data from jabberd14 spool file:","יבא נתוני משתמש מתוך קובץ סליל (spool file) של jabberd14:"}.
 {"Import User from File at ","ייבוא משתמש מתוך קובץ אצל "}.
-{"Import users data from a PIEFXIS file (XEP-0227):","ייבוא מידע משתמשים מתוך קובץ PIEFXIS ‏(XEP-0227):"}.
-{"Import users data from jabberd14 spool directory:","ייבוא נתוני משתמשים מתוך מדור סליל (spool directory) של jabberd14:"}.
+{"Import users data from a PIEFXIS file (XEP-0227):","יבא מידע משתמשים מתוך קובץ PIEFXIS ‏(XEP-0227):"}.
+{"Import users data from jabberd14 spool directory:","יבא נתוני משתמשים מתוך מדור סליל (spool directory) של jabberd14:"}.
 {"Import Users from Dir at ","ייבוא משתמשים מתוך מדור אצל "}.
-{"Import Users From jabberd14 Spool Files","ייבוא משתמשים מתוך קבצי סליל (Spool Files) של jabberd14"}.
+{"Import Users From jabberd14 Spool Files","יבא משתמשים מתוך קבצי סליל (Spool Files) של jabberd14"}.
+{"Improper message type","טיפוס הודעה לא מתאים"}.
+{"Incoming s2s Connections:","חיבורי s2s נכנסים:"}.
+{"Incorrect password","מילת מעבר שגויה"}.
 {"Invalid affiliation: ~s","סינוף שגוי: ~s"}.
 {"Invalid role: ~s","תפקיד שגוי: ~s"}.
 {"IP addresses","כתובות IP"}.
@@ -138,49 +153,63 @@
 {"IRC channel (don't put the first #)","ערוץ IRC (אל תשים סימן # ראשון)"}.
 {"IRC server","שרת IRC"}.
 {"IRC settings","הגדרות IRC"}.
-{"IRC Transport","מוביל IRC"}.
+{"IRC Transport","טרנספורט IRC"}.
 {"IRC username","שם משתמש IRC"}.
 {"IRC Username","שם משתמש IRC"}.
 {"is now known as","ידועה כעת בכינוי"}.
+{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","אין זה מותר לשלוח הודעות שגיאה לחדר. משתתף זה (~s) שלח הודעת שגיאה (~s) ונבעט מתוך החדר"}.
+{"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","ינואר"}.
-{"Join IRC channel","הצטרף אל ערוץ IRC"}.
+{"Join IRC channel","הצטרף לערוץ IRC"}.
 {"joins the room","נכנס/ת אל החדר"}.
-{"Join the IRC channel here.","הצטרף אל ערוץ IRC כאן."}.
-{"Join the IRC channel in this Jabber ID: ~s","הצטרף אל ערוץ IRC במזהה Jabber זה: ~s"}.
+{"Join the IRC channel here.","הצטרף לערוץ IRC כאן."}.
+{"Join the IRC channel in this Jabber ID: ~s","הצטרף לערוץ IRC במזהה Jabber זה: ~s"}.
 {"July","יולי"}.
 {"June","יוני"}.
 {"Last Activity","פעילות אחרונה"}.
 {"Last login","כניסה אחרונה"}.
 {"Last month","חודש אחרון"}.
 {"Last year","שנה אחרונה"}.
-{"leaves the room","עוזב/ת אל החדר"}.
+{"leaves the room","עוזב/ת את החדר"}.
+{"Listened Ports at ","פורטים מואזנים אצל "}.
+{"Listened Ports","פורטים מואזנים"}.
 {"List of modules to start","רשימה של מודולים להפעלה"}.
-{"Make participants list public","הפוך רשימת משתתפים אל פומבית"}.
-{"Make room CAPTCHA protected","הפוך חדר אל מוגן CAPTCHA"}.
-{"Make room members-only","הפוך חדר אל חברים-בלבד"}.
-{"Make room moderated","הפוך חדר אל מבוקר"}.
-{"Make room password protected","הפוך חדר אל מוגן במילת מעבר"}.
-{"Make room persistent","הפוך חדר אל קבוע"}.
-{"Make room public searchable","הפוך חדר אל בר חיפוש פומבי"}.
+{"List of rooms","רשימה של חדרים"}.
+{"Low level update script","תסריט עדכון Low level"}.
+{"Make participants list public","הפוך רשימת משתתפים לפומבית"}.
+{"Make room CAPTCHA protected","הפוך חדר לחדר מוגן CAPTCHA"}.
+{"Make room members-only","הפוך חדר לחדר עבור חברים-בלבד"}.
+{"Make room moderated","הפוך חדר לחדר מבוקר"}.
+{"Make room password protected","הפוך חדר לחדר מוגן במילת מעבר"}.
+{"Make room persistent","הפוך חדר לחדר קבוע"}.
+{"Make room public searchable","הפוך חדר לחדר שנתון לחיפוש פומבי"}.
 {"March","מרץ"}.
 {"Maximum Number of Occupants","מספר מרבי של נוכחים"}.
 {"Max # of items to persist","מספר מרבי של פריטים לקיבוע"}.
-{"Max payload size in bytes","גודל מרבי של מטען הייעוד ביחידות מידה של byte"}.
+{"Max payload size in bytes","גודל מרבי של מטען ייעוד (payload) ביחידות מידה של byte"}.
 {"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","שם אמצעי"}.
 {"Minimum interval between voice requests (in seconds)","תדירות מינימלית בין בקשות ביטוי (בשניות)"}.
+{"Moderator privileges required","נדרשות הרשאות אחראי"}.
 {"moderators only","לאחראים בלבד"}.
+{"Moderator","אחראי"}.
 {"Modified modules","מודולים שהותאמו"}.
+{"Modules at ~p","מודולים אצל ~p"}.
 {"Modules","מודולים"}.
 {"Module","מודול"}.
 {"Monday","יום שני"}.
+{"Multicast","שידור מרובב"}.
+{"Multi-User Chat","שיחה מרובת משתמשים"}.
 {"Name:","שם:"}.
 {"Name","שם"}.
 {"Never","אף פעם"}.
@@ -188,17 +217,20 @@
 {"Nickname Registration at ","רישום שם כינוי אצל "}.
 {"Nickname ~s does not exist in the room","שם כינוי ~s לא קיים בחדר"}.
 {"Nickname","שם כינוי"}.
+{"No body provided for announce message","לא סופק גוף עבור הודעת בשורה"}.
 {"nobody","אף אחד"}.
 {"No Data","אין מידע"}.
-{"Node ID","מזהה ממסר (NID)"}.
-{"Node not found","ממסר לא נמצא"}.
-{"Nodes","ממסרים"}.
+{"Node ID","מזהה צומת (NID)"}.
+{"Node not found","צומת לא נמצא"}.
+{"Node ~p","צומת ~p"}.
+{"Nodes","צמתים"}.
 {"No limit","ללא הגבלה"}.
+{"None","אין"}.
 {"No resource provided","לא סופק משאב"}.
 {"Not Found","לא נמצא"}.
-{"Notify subscribers when items are removed from the node","הודע מנויים כאשר פריטים מוסרים מתוך הממסר"}.
-{"Notify subscribers when the node configuration changes","הודע מנויים כאשר תצורת הממסר משתנה"}.
-{"Notify subscribers when the node is deleted","הודע מנויים כאשר הממסר נמחק"}.
+{"Notify subscribers when items are removed from the node","הודע מנויים כאשר פריטים מוסרים מתוך הצומת"}.
+{"Notify subscribers when the node configuration changes","הודע מנויים כאשר תצורת הצומת משתנה"}.
+{"Notify subscribers when the node is deleted","הודע מנויים כאשר הצומת נמחק"}.
 {"November","נובמבר"}.
 {"Number of occupants","מספר של נוכחים"}.
 {"Number of online users","מספר של משתמשים מקוונים"}.
@@ -211,43 +243,60 @@
 {"Online Users:","משתמשים מקוונים:"}.
 {"Online Users","משתמשים מקוונים"}.
 {"Online","מקוון"}.
-{"Only deliver notifications to available users","מסור התראות אל משתמשים זמינים בלבד"}.
+{"Only deliver notifications to available users","מסור התראות למשתמשים זמינים בלבד"}.
+{"Only members may query archives of this room","רק חברים רשאים לתשאל ארכיונים של חדר זה"}.
 {"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 moderators can approve voice requests","רק אחראים יכולים לאשר בקשות ביטוי"}.
+{"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","נדרשות הרשאות בעלים"}.
+{"Packet","חבילת מידע"}.
+{"Participant","משתתף"}.
 {"Password ~b","סיסמה ~b"}.
 {"Password Verification:","אימות סיסמה:"}.
 {"Password Verification","אימות סיסמה"}.
 {"Password:","סיסמה:"}.
 {"Password","סיסמה"}.
-{"Path to Dir","נתיב אל מדור"}.
-{"Path to File","נתיב אל קובץ"}.
+{"Path to Dir","נתיב למדור"}.
+{"Path to File","נתיב לקובץ"}.
+{"Pending","ממתינות"}.
 {"Period: ","משך זמן: "}.
+{"Permanent rooms","חדרים קבועים"}.
 {"Persist items to storage","פריטים קבועים לאחסון"}.
 {"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.","נא לשים לב כי אפשרויות אלו יגבו את מסד הנתונים המובנה Mnesia בלבד. אם הינך עושה שימוש במודול ODBC, עליך גם לגבות את מסד הנתונים SQL אשר מצוי ברשותך בנפרד."}.
+{"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.","אנא שים לב כי אפשרויות אלו יגבו את מסד הנתונים המובנה Mnesia בלבד. אם הינך עושה שימוש במודול ODBC, עליך גם לגבות את מסד הנתונים SQL אשר מצוי ברשותך בנפרד."}.
+{"Please specify file name.","אנא ציין שם קובץ."}.
+{"Please specify file size.","אנא ציין גודל קובץ."}.
+{"Please, wait for a while before sending new voice request","אנא, המתן לזמן מה לפני שליחת בקשת ביטוי חדשה"}.
 {"Pong","פונג"}.
 {"Port ~b","פורט ~b"}.
 {"Port","פורט"}.
-{"Present real Jabber IDs to","הצג כתובות JID ממשיות"}.
+{"Present real Jabber IDs to","הצג כתובות Jabber ממשיות"}.
+{"private, ","פרטי, "}.
 {"Protocol","פרוטוקול"}.
 {"Publish-Subscribe","‫Publish-Subscribe"}.
 {"PubSub subscriber request","בקשת מנוי PubSub"}.
-{"Purge all items when the relevant publisher goes offline","טיהור כל הפריטים כאשר המפרסם הרלוונטי "}.
+{"Purge all items when the relevant publisher goes offline","טהר את כל הפריטים כאשר המפרסם הרלוונטי הופך לבלתי מקוון"}.
+{"Queries to the conference members are not allowed in this room","שאילתות אל חברי הועידה אינן מותרות בחדר זה"}.
 {"RAM and disc copy","העתק RAM וגם תקליטור"}.
 {"RAM copy","העתק RAM"}.
-{"Really delete message of the day?","באמת למחוק את הודעת היום?"}.
+{"Raw","גולמי"}.
+{"Really delete message of the day?","באמת למחוק את בשורת היום?"}.
+{"Recipient is not in the conference room","מקבל אינו מצוי בחדר הועידה"}.
 {"Register a Jabber account","רשום חשבון Jabber"}.
+{"Registered nicknames","שמות כינוי רשומים"}.
 {"Registered Users:","משתמשים רשומים:"}.
 {"Registered Users","משתמשים רשומים"}.
 {"Register","הרשם"}.
 {"Registration in mod_irc for ","רישום בתוך mod_irc עבור "}.
-{"Remote copy","עותק מרוחק"}.
+{"Remote copy","העתק מרוחק"}.
 {"Remove All Offline Messages","הסר את כל ההודעות הלא מקוונות"}.
 {"Remove User","הסר משתמש"}.
 {"Remove","הסר"}.
@@ -260,7 +309,9 @@
 {"Restore binary backup immediately:","שחזר גיבוי בינארי לאלתר:"}.
 {"Restore plain text backup immediately:","שחזר גיבוי טקסט גלוי (plain text) לאלתר:"}.
 {"Restore","שחזר"}.
+{"Roles for which Presence is Broadcasted","תפקידים להם נוכחות הינה משודרת"}.
 {"Room Configuration","תצורת חדר"}.
+{"Room creation is denied by service policy","יצירת חדר נדחתה על ידי פוליסת שירות"}.
 {"Room description","תיאור חדר"}.
 {"Room Occupants","נוכחי חדר"}.
 {"Room title","כותרת חדר"}.
@@ -269,91 +320,121 @@
 {"Roster size","גודל רשימה"}.
 {"Roster","רשימה"}.
 {"RPC Call Error","שגיאת קריאת RPC"}.
-{"Running Nodes","ממסרים שמורצים כעת"}.
+{"Running Nodes","צמתים מורצים"}.
 {"~s access rule configuration","~s תצורת כללי גישה"}.
 {"Saturday","יום שבת"}.
+{"Script check","בדיקת תסריט"}.
 {"Search Results for ","תוצאות חיפוש עבור "}.
 {"Search users in ","חיפוש משתמשים אצל "}.
-{"Send announcement to all online users on all hosts","שלח מודעות אל כל המשתמשים המקוונים בכל המארחים"}.
-{"Send announcement to all online users","שלח מודעות אל כל המשתמשים המקוונים"}.
-{"Send announcement to all users on all hosts","שלח מודעות אל כל המשתמשים בכל המארחים"}.
-{"Send announcement to all users","שלח מודעות אל כל המשתמשים"}.
+{"Send announcement to all online users on all hosts","שלח בשורה לכל המשתמשים המקוונים בכל המארחים"}.
+{"Send announcement to all online users","שלח בשורה לכל המשתמשים המקוונים"}.
+{"Send announcement to all users on all hosts","שלח בשורה לכל המשתמשים בכל המארחים"}.
+{"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","קבע הודעת היום בכל המארחים ושלח אל משתמשים מקוונים"}.
+{"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","קבוצות רשימה משותפות"}.
 {"Show Integral Table","הצג טבלה אינטגרלית"}.
 {"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 invites you to the room ~s","‫~s מזמינך לחדר ~s"}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","ישנם לקוחות Jabber אשר מסוגלים לאחסן את הסיסמה שלך בתוך המחשב, אולם עליך לעשות זאת רק בתוך המחשב האישי שלך מסיבות ביטחוניות."}.
+{"Specify the access model","ציין מודל גישה"}.
+{"Specify the event message type","ציין טיפוס הודעת אירוע"}.
+{"Specify the publisher model","ציין מודל פרסום"}.
 {"~s's Offline Messages Queue","תור הודעות לא מקוונות של ~s"}.
+{"Start Modules at ","התחל מודולים אצל "}.
 {"Start Modules","התחל מודולים"}.
 {"Start","התחל"}.
-{"Statistics of ~p","סטטיסטיקות עבור ~p"}.
+{"Statistics of ~p","סטטיסטיקות של ~p"}.
 {"Statistics","סטטיסטיקה"}.
+{"Stop Modules at ","הפסק מודולים אצל "}.
 {"Stop Modules","הפסק מודולים"}.
-{"Stopped Nodes","ממסרים שנפסקו"}.
+{"Stopped Nodes","צמתים שנפסקו"}.
 {"Stop","הפסק"}.
 {"Storage Type","טיפוס אחסון"}.
 {"Store binary backup:","אחסן גיבוי בינארי:"}.
 {"Store plain text backup:","אחסן גיבוי טקסט גלוי (plain text):"}.
 {"Subject","נושא"}.
-{"Submit","שליחה"}.
+{"Submitted","נשלח"}.
+{"Submit","שלח"}.
 {"Subscriber Address","כתובת מנוי"}.
-{"Subscription","מִנּוּי"}.
+{"Subscription","הרשמה"}.
 {"Sunday","יום ראשון"}.
-{"The CAPTCHA is valid.","‏CAPTCHA הינה בתוקף."}.
+{"That nickname is already in use by another occupant","שם כינוי זה כבר מצוי בשימוש על ידי נוכח אחר"}.
+{"That nickname is registered by another person","שם כינוי זה הינו רשום על ידי מישהו אחר"}.
+{"The CAPTCHA is valid.","‏CAPTCHA הינה תקפה."}.
+{"The CAPTCHA verification has failed","אימות CAPTCHA נכשל"}.
+{"The collections with which a node is affiliated","האוספים עמם צומת מסונף"}.
+{"The password is too weak","הסיסמה חלשה מדי"}.
 {"the password is","הסיסמה היא"}.
 {"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 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) תגובש באופן של: username@server. נא לקרוא בזהירות את ההוראות למילוי השדות באופן נכון."}.
-{"This page allows to unregister a Jabber account in this Jabber server.","עמוד זה מתיר לך לבטל רישום של חשבון Jabber בשרת Jabber זה."}.
-{"This room is not anonymous","חדר זה אינו אנונימי"}.
+{"This IP address is blacklisted in ~s","כתובת IP זו רשומה ברשימה שחורה בתוך ~s"}.
+{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","חלק זה אינו ער לרישיות: macbeth הינה זהה למחרוזת MacBeth וגם 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) תגובש באופן של: username@server. אנא קרא בזהירות את ההוראות למילוי נכון של השדות."}.
+{"This page allows to unregister a Jabber account in this Jabber server.","עמוד זה מתיר לך לבטל רישום של חשבון Jabber בתוך שרת Jabber זה."}.
 {"Thursday","יום חמישי"}.
 {"Time delay","זמן שיהוי"}.
 {"Time","זמן"}.
+{"Too many CAPTCHA requests","יותר מדי בקשות CAPTCHA"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","יותר מדי (~p) אימותים כושלים מתוך כתובת IP זו (~s). הכתובת תורשה לקבל גישה בשעה ~s UTC"}.
+{"Too many unacked stanzas","יותר מדי סטנזות בלי אישורי קבלה"}.
 {"To ~s","אל ~s"}.
-{"To","אל"}.
-{"Transactions Aborted:","טרנזקציות בוטלו:"}.
-{"Transactions Committed:","טרנזקציות בוצעו:"}.
-{"Transactions Logged:","טרנזקציות נרשמו:"}.
-{"Transactions Restarted:","טרנזקציות הותחלו מחדש:"}.
+{"Total rooms","חדרים סה״כ"}.
+{"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 message of the day (don't send)","עדכן את בשורת היום (אל תשלח)"}.
+{"Update message of the day on all hosts (don't send)","עדכן את בשורת היום בכל המארחים (אל תשלח)"}.
+{"Update plan","תכנית עדכון"}.
+{"Update ~p","עדכון ~p"}.
+{"Update script","תסריט עדכון"}.
 {"Update","עדכן"}.
 {"Uptime:","זמן פעילות:"}.
 {"Use of STARTTLS required","נדרש שימוש של STARTTLS"}.
 {"User JID","‏JID משתמש"}.
 {"User Management","ניהול משתמשים"}.
 {"Username:","שם משתמש:"}.
+{"Users are not allowed to register accounts so quickly","משתמשים אינם מורשים לרשום חשבונות כל כך במהירות"}.
 {"Users Last Activity","פעילות משתמשים אחרונה"}.
+{"User ~s","משתמש ~s"}.
 {"Users","משתמשים"}.
 {"User","משתמש"}.
 {"Validate","הענק תוקף"}.
 {"vCard User Search","חיפוש משתמש vCard"}.
 {"Virtual Hosts","מארחים מדומים"}.
+{"Visitors are not allowed to change their nicknames in this room","מבקרים אינם מורשים לשנות את שמות הכינויים שלהם בחדר זה"}.
+{"Visitors are not allowed to send messages to all occupants","מבקרים אינם מורשים לשלוח הודעות אל כל הנוכחים"}.
+{"Visitor","מבקר"}.
+{"Voice requests are disabled in this conference","בקשות ביטוי מנוטרלות בועידה זו"}.
 {"Voice request","בקשת ביטוי"}.
 {"Wednesday","יום רביעי"}.
-{"When to send the last published item","מתי לשלוח פריט מפורסם אחרון"}.
-{"Whether to allow subscriptions","האם להתיר מנויים"}.
-{"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 search","עליך להשתמש בלקוח אשר מסוגל להבין x:data בכדי לחפש"}.
+{"When to send the last published item","מתי לשלוח את הפריט המפורסם האחרון"}.
+{"Whether to allow subscriptions","האם להתיר הרשמות"}.
+{"You can later change your password using a Jabber client.","באפשרותך לשנות את הסיסמה שלך מאוחר יותר באמצעות לקוח Jabber."}.
+{"You have been banned from this room","נאסרת מן חדר זה"}.
+{"You must fill in field \"Nickname\" in the form","עליך למלא את השדה \"שם כינוי\" בתוך התבנית"}.
+{"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 search","עליך להשתמש בלקוח אשר מסוגל להבין x:data כדי לחפש"}.
+{"Your active privacy list has denied the routing of this stanza.","רשימת הפרטיות הפעילה שלך אסרה את הניתוב של סטנזה זו."}.
+{"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"}.
+{"Your messages to ~s are being blocked. To unblock them, visit ~s","ההודעות שלך לערוץ ~s הינן חסומות. כדי לבטל את חסימתן, בקר בכתובת ~s"}.

priv/msgs/id.msg

@@ -3,6 +3,7 @@
 {"Access Control List Configuration","Konfigurasi Daftar Akses Pengendalian"}.
 {"Access Control Lists","Akses Daftar Pengendalian"}.
 {"Access control lists","Daftar Pengendalian Akses"}.
+{"Access denied by service policy","Akses ditolak oleh kebijakan layanan"}.
 {"Access rules","Akses peraturan"}.
 {"Access Rules","Aturan Akses"}.
 {"Action on user","Tindakan pada pengguna"}.
@@ -11,6 +12,7 @@
 {"Add User","Tambah Pengguna"}.
 {"Administration","Administrasi"}.
 {"Administration of ","Administrasi"}.
+{"Administrator privileges required","Hak istimewa Administrator dibutuhkan"}.
 {"A friendly name for the node","Nama yang dikenal untuk node"}.
 {"All activity","Semua aktifitas"}.
 {"Allow this Jabber ID to subscribe to this pubsub node?","Izinkan ID Jabber ini untuk berlangganan pada node pubsub ini?"}.
@@ -23,6 +25,7 @@
 {"All Users","Semua Pengguna"}.
 {"Announcements","Pengumuman"}.
 {"anyone","Siapapun"}.
+{"A password is required to enter this room","Diperlukan kata sandi untuk masuk ruangan ini"}.
 {"April","April"}.
 {"August","Agustus"}.
 {"Backup","Backup"}.
@@ -46,6 +49,7 @@
 {"Choose whether to approve this entity's subscription.","Pilih apakah akan menyetujui hubungan pertemanan ini."}.
 {"City","Kota"}.
 {"Commands","Perintah"}.
+{"Conference room does not exist","Ruang Konferensi tidak ada"}.
 {"Configuration of room ~s","Pengaturan ruangan ~s"}.
 {"Configuration","Pengaturan"}.
 {"Connected Resources:","Sumber Daya Terhubung:"}.
@@ -56,7 +60,6 @@
 {"Database Tables Configuration at ","Database Tabel Konfigurasi pada"}.
 {"December","Desember"}.
 {"Default users as participants","pengguna pertama kali masuk sebagai participant"}.
-{"Delete","Hapus"}.
 {"Delete message of the day","Hapus pesan harian"}.
 {"Delete message of the day on all hosts","Hapus pesan harian pada semua host"}.
 {"Delete Selected","Hapus Yang Terpilih"}.
@@ -127,6 +130,8 @@
 {"Import users data from jabberd14 spool directory:","Импорт пользовательских данных из буферной директории jabberd14:"}.
 {"Import Users from Dir at ","Impor Pengguna dari Dir di"}.
 {"Import Users From jabberd14 Spool Files","Impor Pengguna Dari jabberd14 Spool File"}.
+{"Improper message type","Jenis pesan yang tidak benar"}.
+{"Incorrect password","Kata sandi salah"}.
 {"Invalid affiliation: ~s","Afiliasi tidak valid: ~s"}.
 {"Invalid role: ~s","Peran tidak valid: ~s"}.
 {"IP addresses","Alamat IP"}.
@@ -138,6 +143,9 @@
 {"IRC username","Nama Pengguna IRC"}.
 {"IRC Username","Nama Pengguna IRC"}.
 {"is now known as","sekarang dikenal sebagai"}.
+{"It is not allowed to send private messages","Hal ini tidak diperbolehkan untuk mengirim pesan pribadi"}.
+{"It is not allowed to send private messages of type \"groupchat\"","Hal ini tidak diperbolehkan untuk mengirim pesan pribadi jenis \"groupchat \""}.
+{"It is not allowed to send private messages to the conference","Hal ini tidak diperbolehkan untuk mengirim pesan pribadi ke konferensi"}.
 {"Jabber Account Registration","Pendaftaran Akun Jabber"}.
 {"Jabber ID","Jabber ID"}.
 {"Jabber ID ~s is invalid","Jabber ID ~s tidak valid"}.
@@ -170,10 +178,12 @@
 {"Max payload size in bytes","Max kapasitas ukuran dalam bytes"}.
 {"May","Mei"}.
 {"Members:","Anggota:"}.
+{"Membership is required to enter this room","Hanya Member yang dapat masuk ruangan ini"}.
 {"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.","Hafalkan kata sandi Anda, atau dicatat dan letakkan di tempat yang aman. Didalam Jabber tidak ada cara otomatis untuk mendapatkan kembali password Anda jika Anda lupa."}.
 {"Memory","Memori"}.
 {"Message body","Isi Pesan"}.
 {"Middle Name","Nama Tengah"}.
+{"Moderator privileges required","Hak istimewa moderator dibutuhkan"}.
 {"moderators only","Hanya moderator"}.
 {"Modified modules","Modifikasi modul-modul"}.
 {"Module","Modul"}.
@@ -213,12 +223,15 @@
 {"Only deliver notifications to available users","Hanya mengirimkan pemberitahuan kepada pengguna yang tersedia"}.
 {"Only moderators and participants are allowed to change the subject in this room","Hanya moderator dan peserta yang diizinkan untuk mengganti topik pembicaraan di ruangan ini"}.
 {"Only moderators are allowed to change the subject in this room","Hanya moderator yang diperbolehkan untuk mengubah topik dalam ruangan ini"}.
+{"Only occupants are allowed to send messages to the conference","Hanya penghuni yang diizinkan untuk mengirim pesan ke konferensi"}.
+{"Only occupants are allowed to send queries to the conference","Hanya penghuni diizinkan untuk mengirim permintaan ke konferensi"}.
+{"Only service administrators are allowed to send service messages","Layanan hanya diperuntukan kepada administrator yang diizinkan untuk mengirim layanan pesan"}.
 {"Options","Pilihan-pilihan"}.
 {"Organization Name","Nama Organisasi"}.
 {"Organization Unit","Unit Organisasi"}.
 {"Outgoing s2s Connections","Koneksi Keluar s2s"}.
 {"Outgoing s2s Connections:","Koneksi s2s yang keluar:"}.
-{"Outgoing s2s Servers:","Layanan s2s yang keluar:"}.
+{"Owner privileges required","Hak istimewa owner dibutuhkan"}.
 {"Packet","Paket"}.
 {"Password ~b","Kata Sandi ~b"}.
 {"Password:","Kata Sandi:"}.
@@ -241,10 +254,12 @@
 {"Publish-Subscribe","Setujui-Pertemanan"}.
 {"PubSub subscriber request","Permintaan pertemanan PubSub"}.
 {"Purge all items when the relevant publisher goes offline","Bersihkan semua item ketika penerbit yang relevan telah offline"}.
+{"Queries to the conference members are not allowed in this room","Permintaan untuk para anggota konferensi tidak diperbolehkan di ruangan ini"}.
 {"RAM and disc copy","RAM dan disc salinan"}.
 {"RAM copy","Salinan RAM"}.
 {"Raw","mentah"}.
 {"Really delete message of the day?","Benar-benar ingin menghapus pesan harian?"}.
+{"Recipient is not in the conference room","Penerima tidak berada di ruangan konferensi"}.
 {"Register a Jabber account","Daftarkan sebuah akun jabber"}.
 {"Registered Users:","Pengguna Terdaftar:"}.
 {"Registered Users","Pengguna Terdaftar"}.
@@ -264,6 +279,7 @@
 {"Restore","Mengembalikan"}.
 {"Restore plain text backup immediately:","Segera mengembalikan cadangan teks biasa:"}.
 {"Room Configuration","Konfigurasi Ruangan"}.
+{"Room creation is denied by service policy","Pembuatan Ruangan ditolak oleh kebijakan layanan"}.
 {"Room description","Keterangan ruangan"}.
 {"Room Occupants","Penghuni Ruangan"}.
 {"Room title","Nama Ruangan"}.
@@ -292,7 +308,7 @@
 {"Show Ordinary Table","Tampilkan Tabel Normal"}.
 {"Shut Down Service","Shut Down Layanan"}.
 {"~s invites you to the room ~s","~s mengundang anda ke ruangan ~s"}.
-{"Some Jabber clients can store your password in your computer. Use that feature only if you trust your computer is safe.","Beberapa klien Jabber dapat menyimpan password di komputer Anda. Gunakan fitur itu hanya jika Anda mempercayai komputer Anda aman."}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Beberapa klien Jabber dapat menyimpan password di komputer Anda. Gunakan fitur itu hanya jika Anda mempercayai komputer Anda aman."}.
 {"Specify the access model","Tentukan model akses"}.
 {"Specify the event message type","Tentukan jenis acara pesan"}.
 {"Specify the publisher model","Tentukan model penerbitan"}.
@@ -315,9 +331,13 @@
 {"Subscriber Address","Alamat Pertemanan"}.
 {"Subscription","Berlangganan"}.
 {"Sunday","Minggu"}.
+{"That nickname is already in use by another occupant","Julukan itu sudah digunakan oleh penghuni lain"}.
+{"That nickname is registered by another person","Julukan tersebut telah didaftarkan oleh orang lain"}.
 {"The CAPTCHA is valid.","Captcha ini benar."}.
+{"The CAPTCHA verification has failed","Verifikasi CAPTCHA telah gagal"}.
 {"The collections with which a node is affiliated","Koleksi dengan yang berafiliasi dengan sebuah node"}.
 {"the password is","kata sandi yaitu:"}.
+{"The password is too weak","Kata sandi terlalu lemah"}.
 {"The password of your Jabber account was successfully changed.","Kata sandi pada akun Jabber Anda telah berhasil diubah."}.
 {"There was an error changing the password: ","Ada kesalahan dalam mengubah password:"}.
 {"There was an error creating the account: ","Ada kesalahan saat membuat akun:"}.
@@ -325,17 +345,18 @@
 {"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Pada bagian ini huruf besar dan kecil tidak dibedakan: Misalnya macbeth adalah sama dengan MacBeth juga 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.","Halaman ini memungkinkan untuk membuat akun Jabber di layanan Jabber ini. JID Anda (Jabber Pengenal) akan berbentuk: namapengguna@layanan. Harap baca dengan seksama petunjuk-petunjuk untuk mengisi kolom dengan benar."}.
 {"This page allows to unregister a Jabber account in this Jabber server.","Pada bagian ini memungkinkan Anda untuk membatalkan pendaftaran akun Jabber pada layanan Jabber ini."}.
-{"This room is not anonymous","Ruangan ini tidak dikenal"}.
 {"Thursday","Kamis"}.
 {"Time delay","Waktu tunda"}.
 {"Time","Waktu"}.
 {"To","Kepada"}.
 {"To ~s","Kepada ~s"}.
+{"Traffic rate limit is exceeded","Lalu lintas melebihi batas"}.
 {"Transactions Aborted:","Transaksi yang dibatalkan:"}.
 {"Transactions Committed:","Transaksi yang dilakukan:"}.
 {"Transactions Logged:","Transaksi yang ditempuh:"}.
 {"Transactions Restarted:","Transaksi yang dijalankan ulang:"}.
 {"Tuesday","Selasa"}.
+{"Unable to generate a CAPTCHA","Tidak dapat menghasilkan CAPTCHA"}.
 {"Unauthorized","Ditolak"}.
 {"Unregister a Jabber account","Nonaktifkan akun jabber"}.
 {"Unregister","Nonaktifkan"}.
@@ -349,20 +370,27 @@
 {"User Management","Manajemen Pengguna"}.
 {"Username:","Nama Pengguna:"}.
 {"User","Pengguna"}.
+{"Users are not allowed to register accounts so quickly","Pengguna tidak diperkenankan untuk mendaftar akun begitu cepat"}.
 {"Users Last Activity","Aktifitas terakhir para pengguna"}.
 {"Users","Pengguna"}.
 {"Validate","Mengesahkan"}.
 {"vCard User Search","vCard Pencarian Pengguna"}.
 {"Virtual Hosts","Virtual Hosts"}.
+{"Visitors are not allowed to change their nicknames in this room","Visitor tidak diperbolehkan untuk mengubah nama julukan di ruangan ini"}.
+{"Visitors are not allowed to send messages to all occupants","Visitor tidak diperbolehkan untuk mengirim pesan ke semua penghuni"}.
 {"Wednesday","Rabu"}.
 {"When to send the last published item","Ketika untuk mengirim item terakhir yang dipublikasikan"}.
 {"Whether to allow subscriptions","Apakah diperbolehkan untuk berlangganan"}.
 {"You can later change your password using a Jabber client.","Anda dapat mengubah kata sandi anda dilain waktu dengan menggunakan klien Jabber."}.
+{"You have been banned from this room","Anda telah diblokir dari ruangan ini"}.
+{"You must fill in field \"Nickname\" in the form","Anda harus mengisi kolom \"Julukan\" dalam formulir"}.
 {"You need a client that supports x:data and CAPTCHA to register","Anda memerlukan klien yang mendukung x:data dan CAPTCHA untuk mendaftar"}.
 {"You need a client that supports x:data to register the nickname","Anda memerlukan klien yang mendukung x:data untuk mendaftar julukan"}.
 {"You need an x:data capable client to configure mod_irc settings","Anda memerlukan x:data klien untuk mampu mengkonfigurasi pengaturan mod_irc"}.
 {"You need an x:data capable client to configure room","Anda memerlukan x:data klien untuk dapat mengkonfigurasi ruangan"}.
 {"You need an x:data capable client to search","Anda memerlukan x:data klien untuk melakukan pencarian"}.
+{"Your active privacy list has denied the routing of this stanza.","Daftar privasi aktif Anda telah menolak routing ztanza ini"}.
+{"Your contact offline message queue is full. The message has been discarded.","Kontak offline Anda pada antrian pesan sudah penuh. Pesan telah dibuang."}.
 {"Your Jabber account was successfully created.","Jabber akun Anda telah sukses dibuat"}.
 {"Your Jabber account was successfully deleted.","Jabber akun Anda berhasil dihapus."}.
 {"Your messages to ~s are being blocked. To unblock them, visit ~s","Pesan Anda untuk ~s sedang diblokir. Untuk membuka blokir tersebut, kunjungi ~s"}.

priv/msgs/it.msg

@@ -3,6 +3,7 @@
 {"Access Control List Configuration","Configurazione dei diritti di accesso (ACL)"}.
 {"Access control lists","Diritti di accesso (ACL)"}.
 {"Access Control Lists","Diritti di accesso (ACL)"}.
+{"Access denied by service policy","Accesso impedito dalle politiche del servizio"}.
 {"Access rules","Regole di accesso"}.
 {"Access Rules","Regole di accesso"}.
 {"Action on user","Azione sull'utente"}.
@@ -11,6 +12,7 @@
 {"Add User","Aggiungere un utente"}.
 {"Administration","Amministrazione"}.
 {"Administration of ","Amministrazione di "}.
+{"Administrator privileges required","Necessari i privilegi di amministratore"}.
 {"A friendly name for the node","Un nome comodo per il nodo"}.
 {"All activity","Tutta l'attività"}.
 {"Allow this Jabber ID to subscribe to this pubsub node?","Consentire a questo Jabber ID l'iscrizione a questo nodo pubsub?"}.
@@ -25,6 +27,7 @@
 {"All Users","Tutti gli utenti"}.
 {"Announcements","Annunci"}.
 {"anyone","tutti"}.
+{"A password is required to enter this room","Per entrare in questa stanza è prevista una password"}.
 {"April","Aprile"}.
 {"August","Agosto"}.
 {"Backup Management","Gestione dei salvataggi"}.
@@ -48,6 +51,7 @@
 {"Choose whether to approve this entity's subscription.","Scegliere se approvare l'iscrizione per questa entità"}.
 {"City","Città"}.
 {"Commands","Comandi"}.
+{"Conference room does not exist","La stanza per conferenze non esiste"}.
 {"Configuration","Configurazione"}.
 {"Configuration of room ~s","Configurazione per la stanza ~s"}.
 {"Connected Resources:","Risorse connesse:"}.
@@ -58,7 +62,6 @@
 {"Database Tables Configuration at ","Configurazione delle tabelle del database su "}.
 {"December","Dicembre"}.
 {"Default users as participants","Definire per default gli utenti come partecipanti"}.
-{"Delete","Eliminare"}.
 {"Delete message of the day","Eliminare il messaggio del giorno (MOTD)"}.
 {"Delete message of the day on all hosts","Eliminare il messaggio del giorno (MOTD) su tutti gli host"}.
 {"Delete Selected","Eliminare gli elementi selezionati"}.
@@ -99,6 +102,7 @@
 {"Exclude Jabber IDs from CAPTCHA challenge","Escludi degli ID Jabber dal passaggio CAPTCHA"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Esportare i dati di tutti gli utenti nel server in file PIEFXIS (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Esportare i dati degli utenti di un host in file PIEFXIS (XEP-0227):"}.
+{"Failed to extract JID from your voice request approval","Impossibile estrarre il JID dall'approvazione della richiesta di parola"}.
 {"Family Name","Cognome"}.
 {"February","Febbraio"}.
 {"Fill in fields to search for any matching Jabber User","Riempire i campi per la ricerca di utenti Jabber corrispondenti ai criteri"}.
@@ -132,6 +136,8 @@
 {"Import users data from jabberd14 spool directory:","Importare i dati utenti da directory di spool di jabberd14:"}.
 {"Import Users from Dir at ","Importare utenti dalla directory "}.
 {"Import Users From jabberd14 Spool Files","Importare utenti da file di spool di jabberd14"}.
+{"Improper message type","Tipo di messaggio non corretto"}.
+{"Incorrect password","Password non esatta"}.
 {"Invalid affiliation: ~s","Affiliazione non valida: ~s"}.
 {"Invalid role: ~s","Ruolo non valido: ~s"}.
 {"IP addresses","Indirizzi IP"}.
@@ -143,6 +149,9 @@
 {"IRC username","Nome utente IRC"}.
 {"IRC Username","Nome utente IRC"}.
 {"is now known as","è ora conosciuta/o come"}.
+{"It is not allowed to send private messages","Non è consentito l'invio di messaggi privati"}.
+{"It is not allowed to send private messages of type \"groupchat\"","Non è consentito l'invio di messaggi privati di tipo \"groupchat\""}.
+{"It is not allowed to send private messages to the conference","Non è consentito l'invio di messaggi privati alla conferenza"}.
 {"Jabber Account Registration","Registrazione account Jabber"}.
 {"Jabber ID","Jabber ID (Jabber ID)"}.
 {"Jabber ID ~s is invalid","Il Jabber ID ~s non è valido"}.
@@ -174,12 +183,14 @@
 {"Max # of items to persist","Numero massimo di elementi da conservare persistentemente"}.
 {"Max payload size in bytes","Dimensione massima del contenuto del messaggio in byte"}.
 {"May","Maggio"}.
+{"Membership is required to enter this room","Per entrare in questa stanza è necessario essere membro"}.
 {"Members:","Membri:"}.
 {"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.","Memorizza la password, o scrivila su un foglio di carta da conservare in un luogo sicuro. Jabber non prevede una modalità automatica per il recupero di una password dimenticata."}.
 {"Memory","Memoria"}.
 {"Message body","Corpo del messaggio"}.
 {"Middle Name","Altro nome"}.
 {"Minimum interval between voice requests (in seconds)","Intervallo minimo fra due richieste di parola (in secondi)"}.
+{"Moderator privileges required","Necessari i privilegi di moderatore"}.
 {"moderators only","moderatori soltanto"}.
 {"Modified modules","Moduli modificati"}.
 {"Module","Modulo"}.
@@ -220,12 +231,16 @@
 {"Only deliver notifications to available users","Inviare le notifiche solamente agli utenti disponibili"}.
 {"Only moderators and participants are allowed to change the subject in this room","La modifica dell'oggetto di questa stanza è consentita soltanto ai moderatori e ai partecipanti"}.
 {"Only moderators are allowed to change the subject in this room","La modifica dell'oggetto di questa stanza è consentita soltanto ai moderatori"}.
+{"Only moderators can approve voice requests","Soltanto i moderatori possono approvare richieste di parola"}.
+{"Only occupants are allowed to send messages to the conference","L'invio di messaggi alla conferenza è consentito soltanto ai presenti"}.
+{"Only occupants are allowed to send queries to the conference","L'invio di query alla conferenza è consentito ai soli presenti"}.
+{"Only service administrators are allowed to send service messages","L'invio di messaggi di servizio è consentito solamente agli amministratori del servizio"}.
 {"Options","Opzioni"}.
 {"Organization Name","Nome dell'organizzazione"}.
 {"Organization Unit","Unità dell'organizzazione"}.
 {"Outgoing s2s Connections:","Connessioni s2s in uscita:"}.
 {"Outgoing s2s Connections","Connessioni s2s in uscita"}.
-{"Outgoing s2s Servers:","Server s2s in uscita"}.
+{"Owner privileges required","Necessari i privilegi di proprietario"}.
 {"Packet","Pacchetto"}.
 {"Password ~b","Password ~b"}.
 {"Password:","Password:"}.
@@ -239,6 +254,7 @@
 {"Persist items to storage","Conservazione persistente degli elementi"}.
 {"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.","N.B.: Queste opzioni comportano il salvataggio solamente del database interno Mnesia. Se si sta utilizzando il modulo ODBC, è necessario salvare anche il proprio database SQL separatamente."}.
+{"Please, wait for a while before sending new voice request","Attendi qualche istante prima di inviare una nuova richiesta di parola"}.
 {"Pong","Pong"}.
 {"Port ~b","Porta ~b"}.
 {"Port","Porta"}.
@@ -248,10 +264,12 @@
 {"Publish-Subscribe","Pubblicazione-Iscrizione"}.
 {"PubSub subscriber request","Richiesta di iscrizione per PubSub"}.
 {"Purge all items when the relevant publisher goes offline","Cancella tutti gli elementi quando chi li ha pubblicati non è più online"}.
+{"Queries to the conference members are not allowed in this room","In questa stanza non sono consentite query ai membri della conferenza"}.
 {"RAM and disc copy","Copia in memoria (RAM) e su disco"}.
 {"RAM copy","Copia in memoria (RAM)"}.
 {"Raw","Grezzo"}.
 {"Really delete message of the day?","Si conferma l'eliminazione del messaggio del giorno (MOTD)?"}.
+{"Recipient is not in the conference room","Il destinatario non è nella stanza per conferenze"}.
 {"Register a Jabber account","Registra un account Jabber"}.
 {"Registered Users:","Utenti registrati:"}.
 {"Registered Users","Utenti registrati"}.
@@ -271,6 +289,7 @@
 {"Restore plain text backup immediately:","Recuperare un salvataggio come semplice testo adesso:"}.
 {"Restore","Recuperare"}.
 {"Room Configuration","Configurazione della stanza"}.
+{"Room creation is denied by service policy","La creazione di stanze è impedita dalle politiche del servizio"}.
 {"Room description","Descrizione della stanza"}.
 {"Room Occupants","Presenti nella stanza"}.
 {"Room title","Titolo della stanza"}.
@@ -299,7 +318,7 @@
 {"Show Ordinary Table","Mostrare la tabella normale"}.
 {"Shut Down Service","Terminare il servizio"}.
 {"~s invites you to the room ~s","~s ti invita nella stanza ~s"}.
-{"Some Jabber clients can store your password in your computer. Use that feature only if you trust your computer is safe.","Alcuni client Jabber possono conservare la password nel tuo computer. Utilizza tale funzione soltanto se ritieni che il tuo computer sia sicuro."}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Alcuni client Jabber possono conservare la password nel tuo computer. Utilizza tale funzione soltanto se ritieni che il tuo computer sia sicuro."}.
 {"Specify the access model","Specificare il modello di accesso"}.
 {"Specify the event message type","Specificare il tipo di messaggio di evento"}.
 {"Specify the publisher model","Definire il modello di pubblicazione"}.
@@ -322,9 +341,13 @@
 {"Subscriber Address","Indirizzo dell'iscritta/o"}.
 {"Subscription","Iscrizione"}.
 {"Sunday","Domenica"}.
+{"That nickname is already in use by another occupant","Il nickname è già in uso all'interno della conferenza"}.
+{"That nickname is registered by another person","Questo nickname è registrato da un'altra persona"}.
 {"The CAPTCHA is valid.","Il CAPTCHA è valido."}.
+{"The CAPTCHA verification has failed","La verifica del CAPTCHA ha avuto esito negativo"}.
 {"The collections with which a node is affiliated","Le collezioni a cui è affiliato un nodo"}.
 {"the password is","la password è"}.
+{"The password is too weak","La password è troppo debole"}.
 {"The password of your Jabber account was successfully changed.","Il cambio di password del tuo account Jabber è andato a buon fine."}.
 {"There was an error changing the password: ","Si è verificato un errore nel cambio di password: "}.
 {"There was an error creating the account: ","Si è verificato un errore nella creazione dell'account: "}.
@@ -332,17 +355,19 @@
 {"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Non fa differenza fra minuscolo e maiuscolo: macbeth, MacBeth e Macbeth si equivalgono."}.
 {"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.","Questa pagina consente di creare un account Jabber in questo server Jabber. Il tuo JID (Jabber IDentifier) avrà la forma: nome_utente@server. Leggi attentamente le istruzioni per compilare i campi correttamente."}.
 {"This page allows to unregister a Jabber account in this Jabber server.","Questa pagina consente di eliminare un account Jabber da questo server Jabber."}.
-{"This room is not anonymous","Questa stanza non è anonima"}.
 {"Thursday","Giovedì"}.
 {"Time delay","Ritardo"}.
 {"Time","Ora"}.
 {"To","A"}.
+{"Too many CAPTCHA requests","Troppe richieste CAPTCHA"}.
 {"To ~s","A ~s"}.
+{"Traffic rate limit is exceeded","Limite di traffico superato"}.
 {"Transactions Aborted:","Transazioni abortite:"}.
 {"Transactions Committed:","Transazioni avvenute:"}.
 {"Transactions Logged:","Transazioni con log:"}.
 {"Transactions Restarted:","Transazioni riavviate:"}.
 {"Tuesday","Martedì"}.
+{"Unable to generate a CAPTCHA","Impossibile generare un CAPTCHA"}.
 {"Unauthorized","Non autorizzato"}.
 {"Unregister a Jabber account","Elimina un account Jabber"}.
 {"Unregister","Elimina"}.
@@ -356,22 +381,30 @@
 {"User JID","JID utente"}.
 {"User Management","Gestione degli utenti"}.
 {"Username:","Nome utente:"}.
+{"Users are not allowed to register accounts so quickly","Non è consentito agli utenti registrare account così rapidamente"}.
 {"Users Last Activity","Ultima attività degli utenti"}.
 {"Users","Utenti"}.
 {"User","Utente"}.
 {"Validate","Validare"}.
 {"vCard User Search","Ricerca di utenti per vCard"}.
 {"Virtual Hosts","Host Virtuali"}.
+{"Visitors are not allowed to change their nicknames in this room","Non è consentito ai visitatori cambiare il nickname in questa stanza"}.
+{"Visitors are not allowed to send messages to all occupants","Non è consentito ai visitatori l'invio di messaggi a tutti i presenti"}.
 {"Voice request","Richiesta di parola"}.
+{"Voice requests are disabled in this conference","In questa conferenza le richieste di parola sono escluse"}.
 {"Wednesday","Mercoledì"}.
 {"When to send the last published item","Quando inviare l'ultimo elemento pubblicato"}.
 {"Whether to allow subscriptions","Consentire iscrizioni?"}.
 {"You can later change your password using a Jabber client.","Potrai in seguito cambiare la password utilizzando un client Jabber."}.
+{"You have been banned from this room","Sei stata/o bandita/o da questa stanza"}.
+{"You must fill in field \"Nickname\" in the form","Si deve riempire il campo \"Nickname\" nel modulo"}.
 {"You need a client that supports x:data and CAPTCHA to register","La registrazione richiede un client che supporti x:data e CAPTCHA"}.
 {"You need a client that supports x:data to register the nickname","Per registrare il nickname è necessario un client che supporti x:data"}.
 {"You need an x:data capable client to configure mod_irc settings","Per la configurazione del modulo IRC è necessario un client che supporti x:data"}.
 {"You need an x:data capable client to configure room","Per la configurazione della stanza è necessario un client che supporti x:data"}.
 {"You need an x:data capable client to search","Per effettuare ricerche è necessario un client che supporti x:data"}.
+{"Your active privacy list has denied the routing of this stanza.","In base alla tua attuale lista privacy questa stanza è stata esclusa dalla navigazione."}.
+{"Your contact offline message queue is full. The message has been discarded.","La coda dei messaggi offline del contatto è piena. Il messaggio è stato scartato"}.
 {"Your Jabber account was successfully created.","La creazione del tuo account Jabber è andata a buon fine."}.
 {"Your Jabber account was successfully deleted.","La cancellazione del tuo account Jabber è andata a buon fine."}.
 {"Your messages to ~s are being blocked. To unblock them, visit ~s","I messaggi verso ~s sono bloccati. Per sbloccarli, visitare ~s"}.

priv/msgs/ja.msg

@@ -1,19 +1,20 @@
 %% -*- coding: latin-1 -*-
-{" has set the subject to: "," は件名を設定しました: "}.
-{"A friendly name for the node","ノードのフレンドリネーム"}.
+{"Accept","許可"}.
 {"Access Configuration","アクセス設定"}.
 {"Access Control List Configuration","アクセスコントロールリスト設定"}.
-{"Access Control Lists","アクセスコントロールリスト"}.
-{"Access Rules","アクセスルール"}.
 {"Access control lists","アクセスコントロールリスト"}.
+{"Access Control Lists","アクセスコントロールリスト"}.
+{"Access denied by service policy","サービスポリシーによってアクセスが禁止されました"}.
 {"Access rules","アクセスルール"}.
+{"Access Rules","アクセスルール"}.
 {"Action on user","ユーザー操作"}.
 {"Add Jabber ID","Jabber ID を追加"}.
 {"Add New","新規追加"}.
 {"Add User","ユーザーを追加"}.
 {"Administration of ","管理: "}.
 {"Administration","管理"}.
-{"All Users","全ユーザー"}.
+{"Administrator privileges required","管理者権限が必要です"}.
+{"A friendly name for the node","ノードのフレンドリネーム"}.
 {"All activity","すべて"}.
 {"Allow this Jabber ID to subscribe to this pubsub node?","この Jabber ID に、この pubsubノードの購読を許可しますか ?"}.
 {"Allow users to change the subject","ユーザーによる件名の変更を許可"}.
@@ -24,17 +25,19 @@
 {"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","4月"}.
 {"August","8月"}.
+{"Backup","バックアップ"}.
 {"Backup Management","バックアップ管理"}.
 {"Backup of ~p","バックアップ: ~p"}.
 {"Backup to File at ","ファイルにバックアップ: "}.
-{"Backup","バックアップ"}.
 {"Bad format","不正なフォーマット"}.
 {"Birthday","誕生日"}.
 {"CAPTCHA web page","CAPTCHA ウェブページ"}.
-{"CPU Time:","CPU時間:"}.
 {"Change Password","パスワードを変更"}.
 {"Change User Password","パスワードを変更"}.
 {"Characters not allowed:","使用できない文字:"}.
@@ -50,34 +53,44 @@
 {"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","国"}.
-{"Database Tables Configuration at ","データーベーステーブル設定 "}.
-{"Database Tables at ~p","データーベーステーブル: ~p"}.
+{"CPU Time:","CPU時間:"}.
 {"Database","データーベース"}.
+{"Database Tables at ~p","データーベーステーブル: ~p"}.
+{"Database Tables Configuration at ","データーベーステーブル設定 "}.
 {"December","12月"}.
 {"Default users as participants","デフォルトのユーザーは参加者"}.
-{"Delete Selected","選択した項目を削除"}.
-{"Delete User","ユーザーを削除"}.
 {"Delete message of the day on all hosts","全ホストのお知らせメッセージを削除"}.
 {"Delete message of the day","お知らせメッセージを削除"}.
-{"Delete","削除"}.
+{"Delete Selected","選択した項目を削除"}.
+{"Delete User","ユーザーを削除"}.
 {"Deliver event notifications","イベント通知を配送する"}.
 {"Deliver payloads with event notifications","イベント通知と同時にペイロードを配送する"}.
 {"Description:","説明:"}.
 {"Disc only copy","ディスクだけのコピー"}.
-{"Displayed Groups:","表示グループ"}.
+{"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モジュール"}.
+{"ejabberd Multicast service","ejabberdマルチキャストサービス"}.
+{"ejabberd Publish-Subscribe module","ejabberd Publish-Subscribe モジュール"}.
+{"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 Bytestreams モジュール"}.
+{"ejabberd vCard module","ejabberd vCard モジュール"}.
+{"ejabberd Web Admin","ejabberd ウェブ管理"}.
 {"Elements","要素"}.
 {"Email","メールアドレス"}.
+{"Empty Rooms","空のルーム"}.
 {"Enable logging","ロギングを有効"}.
+{"Enable message archiving","メッセージアーカイブを有効化"}.
 {"Encoding for server ~b","サーバーのエンコーディング ~b"}.
 {"End User Session","エンドユーザーセッション"}.
 {"Enter list of {Module, [Options]}","{モジュール, [オプション]}のリストを入力してください"}.
@@ -92,16 +105,17 @@
 {"Erlang Jabber Server","Erlang Jabber Server"}.
 {"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","CAPTCHA 試験を免除する Jabber ID"}.
+{"Exclude Jabber IDs from CAPTCHA challenge","CAPTCHA 入力を免除する Jabber ID"}.
 {"Export all tables as SQL queries to a file:","すべてのテーブルをSQL形式でファイルにエクスポート: "}.
 {"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):"}.
+{"Failed to extract JID from your voice request approval","発言権要求の承認から JID を取り出すことに失敗しました"}.
 {"Family Name","姓"}.
 {"February","2月"}.
 {"Fill in fields to search for any matching Jabber User","項目を入力してユーザーを検索してください"}.
 {"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","項目を入力してユーザーを検索を行えます (* を使用すると部分文字列にマッチします)"}.
 {"Friday","金曜日"}.
-{"From ~s","差出人 ~s"}.
+{"From ~s","From ~s"}.
 {"From","差出人"}.
 {"Full Name","氏名"}.
 {"Get Number of Online Users","オンラインユーザー数を取得"}.
@@ -112,32 +126,47 @@
 {"Grant voice to this person?","この人に発言権を与えますか ?"}.
 {"Group ","グループ"}.
 {"Groups","グループ"}.
+{"has been banned","はバンされました"}.
+{"has been kicked","はキックされました"}.
+{"has been kicked because of an affiliation change","は分掌が変更されたためキックされました"}.
+{"has been kicked because of a system shutdown","はシステムシャットダウンのためキックされました"}.
+{"has been kicked because the room has been changed to members-only","はチャットルームがメンバー制に変更されたためキックされました"}.
+{" has set the subject to: "," は件名を設定しました: "}.
 {"Host","ホスト"}.
-{"IP addresses","IP アドレス"}.
-{"IP","IP"}.
-{"IRC Transport","IRCトランスポート"}.
-{"IRC Username","IRC ユーザー名"}.
-{"IRC channel (don't put the first #)","IRC チャンネル (先頭に#は不要)"}.
-{"IRC server","IRC サーバー"}.
-{"IRC settings","IRC 設定"}.
-{"IRC username","IRC ユーザー名"}.
 {"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 server\", \"encoding\", port, \"password\"}' という形式のリストを入力してください。デフォルトでエンコーディングは \"~s\" を使用し、ポートは ~p、パスワードは空になっています。"}.
 {"Import Directory","ディレクトリインポート"}.
 {"Import File","ファイルからインポート"}.
-{"Import User from File at ","ファイルからユーザーをインポート: "}.
-{"Import Users From jabberd14 Spool Files","jabberd14 Spool ファイルからユーザーをインポート"}.
-{"Import Users from Dir at ","ディレクトリからユーザーをインポート: "}.
 {"Import user data from jabberd14 spool file:","ユーザーデータを jabberd14 Spool ファイルからインポート:"}.
+{"Import User from File at ","ファイルからユーザーをインポート: "}.
 {"Import users data from a PIEFXIS file (XEP-0227):","ユーザーデータを PIEFXIS ファイルからインポート (XEP-0227):"}.
 {"Import users data from jabberd14 spool directory:","ユーザーデータを jabberd14 Spool ディレクトリからインポート:"}.
+{"Import Users from Dir at ","ディレクトリからユーザーをインポート: "}.
+{"Import Users From jabberd14 Spool Files","jabberd14 Spool ファイルからユーザーをインポート"}.
+{"Improper message type","誤ったメッセージタイプです"}.
+{"Incoming s2s Connections:","内向き s2s コネクション:"}.
+{"Incorrect password","パスワードが違います"}.
 {"Invalid affiliation: ~s","無効な分掌です: ~s"}.
 {"Invalid role: ~s","無効な役です: ~s"}.
+{"IP addresses","IP アドレス"}.
+{"IP","IP"}.
+{"IRC channel (don't put the first #)","IRC チャンネル (先頭に#は不要)"}.
+{"IRC server","IRC サーバー"}.
+{"IRC settings","IRC 設定"}.
+{"IRC Transport","IRCトランスポート"}.
+{"IRC username","IRC ユーザー名"}.
+{"IRC Username","IRC ユーザー名"}.
+{"is now known as","は名前を変更しました: "}.
+{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","このルームにエラーメッセージを送ることは許可されていません。参加者(~s)はエラーメッセージを(~s)を送信してルームからキックされました。"}.
+{"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 ID ~s は無効です"}.
 {"Jabber ID","Jabber ID"}.
+{"Jabber ID ~s is invalid","Jabber ID ~s は無効です"}.
 {"January","1月"}.
 {"Join IRC channel","IRC チャンネルに参加"}.
+{"joins the room","がチャットルームに参加しました"}.
 {"Join the IRC channel here.","この IRC チャンネルに参加します。"}.
 {"Join the IRC channel in this Jabber ID: ~s","Jabber ID: ~s でこの IRC チャンネルに参加"}.
 {"July","7月"}.
@@ -146,9 +175,11 @@
 {"Last login","最終ログイン"}.
 {"Last month","先月"}.
 {"Last year","去年"}.
-{"List of modules to start","起動モジュールの一覧"}.
+{"leaves the room","がチャットルームから退出しました"}.
 {"Listened Ports at ","Listen ポート "}.
 {"Listened Ports","Listen ポート"}.
+{"List of modules to start","起動モジュールの一覧"}.
+{"List of rooms","チャットルームの一覧"}.
 {"Low level update script","低レベル更新スクリプト"}.
 {"Make participants list public","参加者一覧を公開"}.
 {"Make room CAPTCHA protected","チャットルームを CAPTCHA で保護"}.
@@ -158,37 +189,44 @@
 {"Make room persistent","チャットルームを永続化"}.
 {"Make room public searchable","チャットルームを検索可"}.
 {"March","3月"}.
+{"Maximum Number of Occupants","最大在室者数"}.
 {"Max # of items to persist","アイテムの最大保存数"}.
 {"Max payload size in bytes","最大ぺイロードサイズ (byte)"}.
-{"Maximum Number of Occupants","最大在室者数"}.
 {"May","5月"}.
 {"Members:","メンバー:"}.
+{"Membership is required to enter this room","このチャットルームに入るにはメンバーでなければなりません"}.
 {"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","ミドルネーム"}.
 {"Minimum interval between voice requests (in seconds)","発言権の要求の最小時間間隔 (秒)"}.
+{"Moderator","モデレーター"}.
+{"Moderator privileges required","モデレーター権限が必要です"}.
+{"moderators only","モデレーターにのみ"}.
 {"Modified modules","更新されたモジュール"}.
 {"Module","モジュール"}.
-{"Modules at ~p","モジュール ~p"}.
 {"Modules","モジュール"}.
+{"Modules at ~p","モジュール ~p"}.
 {"Monday","月曜日"}.
+{"Multicast","マルチキャスト"}.
+{"Multi-User Chat","マルチユーザーチャット"}.
 {"Name","名"}.
 {"Name:","名前:"}.
 {"Never","なし"}.
 {"New Password:","新しいパスワード:"}.
+{"Nickname","ニックネーム"}.
 {"Nickname Registration at ","ニックネーム登録: "}.
 {"Nickname ~s does not exist in the room","ニックネーム ~s はこのチャットルームにいません"}.
-{"Nickname","ニックネーム"}.
-{"No Data","データなし"}.
 {"No body provided for announce message","アナウンスメッセージはありませんでした"}.
-{"No limit","制限なし"}.
-{"No resource provided","リソースが提供されませんでした"}.
+{"nobody","誰にも許可しない"}.
+{"No Data","データなし"}.
 {"Node ID","ノードID"}.
 {"Node not found","ノードが見つかりません"}.
 {"Node ~p","ノード ~p"}.
 {"Nodes","ノード"}.
+{"No limit","制限なし"}.
 {"None","なし"}.
+{"No resource provided","リソースが指定されていません"}.
 {"Not Found","見つかりません"}.
 {"Notify subscribers when items are removed from the node","アイテムがノードから消された時に購読者へ通知する"}.
 {"Notify subscribers when the node configuration changes","ノード設定に変更があった時に購読者へ通知する"}.
@@ -197,53 +235,66 @@
 {"Number of occupants","在室者の数"}.
 {"Number of online users","オンラインユーザー数"}.
 {"Number of registered users","登録ユーザー数"}.
-{"OK","OK"}.
 {"October","10月"}.
-{"Offline Messages","オフラインメッセージ"}.
 {"Offline Messages:","オフラインメッセージ:"}.
+{"Offline Messages","オフラインメッセージ"}.
+{"OK","OK"}.
 {"Old Password:","古いパスワード:"}.
-{"Online Users","オンラインユーザー"}.
-{"Online Users:","オンラインユーザー:"}.
 {"Online","オンライン"}.
+{"Online Users:","オンラインユーザー:"}.
+{"Online Users","オンラインユーザー"}.
 {"Only deliver notifications to available users","有効なユーザーにのみ告知を送信する"}.
+{"Only members may query archives of this room","メンバーのみがこのルームのアーカイブを取得できます"}.
 {"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 moderators can approve voice requests","モデレーターだけが発言権の要求を承認できます"}.
+{"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 サービス:"}.
+{"Outgoing s2s Connections","外向き s2s コネクション"}.
+{"Owner privileges required","主宰者の権限が必要です"}.
 {"Packet","パケット"}.
-{"Password Verification","パスワード (確認)"}.
-{"Password Verification:","パスワード (確認):"}.
-{"Password ~b","パスワード ~b"}.
+{"Participant","参加者"}.
+{"Password:","パスワード:"}.
 {"Password","パスワード"}.
-{"Password:","パスワード"}.
+{"Password ~b","パスワード ~b"}.
+{"Password Verification:","パスワード (確認):"}.
+{"Password Verification","パスワード (確認)"}.
 {"Path to Dir","ディレクトリのパス"}.
 {"Path to File","ファイルのパス"}.
 {"Pending","保留"}.
 {"Period: ","期間: "}.
+{"Permanent rooms","永続チャットルーム"}.
 {"Persist items to storage","アイテムをストレージに保存する"}.
 {"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.","これらのオプションは組み込みの Mnesia データーベースのバックアップのみを行うことに注意してください。もし ODBC モジュールを使用している場合は、SQL データーベースのバックアップを別に行う必要があります。"}.
+{"Please specify file name.","ファイル名を指定してください。"}.
+{"Please specify file size.","ファイルサイズを指定してください。"}.
+{"Please, wait for a while before sending new voice request","新しい発言権の要求を送るまで少し間をおいてください"}.
 {"Pong","Pong"}.
-{"Port ~b","ポート ~b"}.
 {"Port","ポート"}.
+{"Port ~b","ポート ~b"}.
 {"Present real Jabber IDs to","本当の Jabber ID を公開"}.
+{"private, ","プライベート、"}.
 {"Protocol","プロトコル"}.
-{"PubSub subscriber request","PubSub 購読者のリクエスト"}.
 {"Publish-Subscribe","Publish-Subscribe"}.
+{"PubSub subscriber request","PubSub 購読者のリクエスト"}.
 {"Purge all items when the relevant publisher goes offline","公開者がオフラインになるときに、すべてのアイテムを削除"}.
+{"Queries to the conference members are not allowed in this room","このチャットルームでは、会議のメンバーへのクエリーは禁止されています"}.
 {"RAM and disc copy","RAM, ディスクコピー"}.
 {"RAM copy","RAM コピー"}.
-{"RPC Call Error","RPC 呼び出しエラー"}.
 {"Raw","Raw"}.
 {"Really delete message of the day?","本当にお知らせメッセージを削除しますか ?"}.
+{"Recipient is not in the conference room","受信者はこの会議室にいません"}.
 {"Register a Jabber account","Jabber アカウントを登録"}.
-{"Register","登録"}.
-{"Registered Users","登録ユーザー"}.
+{"Registered nicknames","登録ニックネーム"}.
 {"Registered Users:","登録ユーザー:"}.
+{"Registered Users","登録ユーザー"}.
+{"Register","登録"}.
 {"Registration in mod_irc for ","mod_irc での登録: "}.
 {"Remote copy","リモートコピー"}.
 {"Remove All Offline Messages","すべてのオフラインメッセージを削除"}.
@@ -253,20 +304,24 @@
 {"Resources","リソース"}.
 {"Restart Service","サービスを再起動"}.
 {"Restart","再起動"}.
+{"Restore","リストア"}.
 {"Restore Backup from File at ","ファイルからバックアップをリストア: "}.
 {"Restore binary backup after next ejabberd restart (requires less memory):","ejabberd の再起動時にバイナリバックアップからリストア (メモリ少):"}.
 {"Restore binary backup immediately:","直ちにバイナリバックアップからリストア:"}.
 {"Restore plain text backup immediately:","直ちにプレーンテキストバックアップからリストア:"}.
-{"Restore","リストア"}.
+{"Roles for which Presence is Broadcasted","プレゼンスをブロードキャストするロール"}.
 {"Room Configuration","チャットルームの設定"}.
-{"Room Occupants","在室者"}.
+{"Room creation is denied by service policy","サービスポリシーによってチャットルームの作成が禁止されています"}.
 {"Room description","チャットルームの説明"}.
+{"Room Occupants","在室者"}.
 {"Room title","チャットルームのタイトル"}.
 {"Roster groups allowed to subscribe","名簿グループは購読を許可しました"}.
 {"Roster of ","名簿: "}.
 {"Roster size","名簿サイズ"}.
 {"Roster","名簿"}.
+{"RPC Call Error","RPC 呼び出しエラー"}.
 {"Running Nodes","起動ノード"}.
+{"~s access rule configuration","~s アクセスルール設定"}.
 {"Saturday","土曜日"}.
 {"Script check","スクリプトチェック"}.
 {"Search Results for ","検索結果: "}.
@@ -276,18 +331,21 @@
 {"Send announcement to all users on all hosts","全ホストのユーザーにアナウンスを送信"}.
 {"Send announcement to all users","すべてのユーザーにアナウンスを送信"}.
 {"September","9月"}.
-{"Server ~b","サーバー ~b"}.
 {"Server:","サーバー:"}.
+{"Server","サーバー"}.
+{"Server ~b","サーバー ~b"}.
 {"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","共有名簿グループ"}.
 {"Show Integral Table","累積の表を表示"}.
 {"Show Ordinary Table","通常の表を表示"}.
 {"Shut Down Service","サービスを停止"}.
-{"Some Jabber clients can store your password in your computer. Use that feature only if you trust your computer is safe.","Jabber クライアントはコンピューターにパスワードを記憶できます。コンピューターが安全であると信頼できる場合にのみ、この機能を使用してください。"}.
+{"~s invites you to the room ~s","~s はあなたをチャットルーム ~s に招待しています"}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Jabber クライアントはコンピューターにパスワードを記憶できます。コンピューターが安全であると信頼できる場合にのみ、この機能を使用してください。"}.
 {"Specify the access model","アクセスモデルを設定する"}.
 {"Specify the event message type","イベントメッセージ種別を設定"}.
 {"Specify the publisher model","公開モデルを指定する"}.
+{"~s's Offline Messages Queue","~s' のオフラインメッセージキュー"}.
 {"Start Modules at ","モジュールを開始: "}.
 {"Start Modules","モジュールを起動"}.
 {"Start","開始"}.
@@ -295,19 +353,24 @@
 {"Statistics","統計"}.
 {"Stop Modules at ","モジュールを停止: "}.
 {"Stop Modules","モジュールを停止"}.
-{"Stop","停止"}.
 {"Stopped Nodes","停止ノード"}.
+{"Stop","停止"}.
 {"Storage Type","ストレージタイプ"}.
 {"Store binary backup:","バイナリバックアップを保存:"}.
 {"Store plain text backup:","プレーンテキストバックアップを保存:"}.
 {"Subject","件名"}.
-{"Submit","送信"}.
 {"Submitted","送信完了"}.
+{"Submit","送信"}.
 {"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 verification has failed","CAPTCHA 検証は失敗しました"}.
 {"The collections with which a node is affiliated","提携されたノードの集合です"}.
+{"the password is","パスワードは"}.
+{"The password is too weak","このパスワードは単純過ぎます"}.
 {"The password of your Jabber account was successfully changed.","Jabber アカウントのパスワード変更に成功しました。"}.
 {"There was an error changing the password: ","パスワードの変更中にエラーが発生しました: "}.
 {"There was an error creating the account: ","アカウントの作成中にエラーが発生しました: "}.
@@ -315,73 +378,63 @@
 {"This IP address is blacklisted in ~s","このIPアドレスはアクセスを禁止されています ~s"}.
 {"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","大文字と小文字は区別しません: macbeth は MacBeth や 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 サーバーにアカウントを作成するページです。あなたの JID (JabberID) は username@server のような形式になります。注意事項どおり、正しく項目を記入してください。"}.
-{"This page allows to unregister a Jabber account in this Jabber server.","ここはこの Jabber サーバーのアカウントを削除するページです。"}.
-{"This room is not anonymous","このチャットルームは非匿名です"}.
+{"This page allows to unregister a Jabber account in this Jabber server.","このページはサーバー上のJabberアカウントを削除するページです。"}.
 {"Thursday","木曜日"}.
 {"Time delay","遅延時間"}.
 {"Time","時間"}.
-{"To ~s","宛先 ~s"}.
-{"To","宛先"}.
+{"Too many CAPTCHA requests","CAPTCHA 要求が多すぎます"}.
 {"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","~p回の認証に失敗しました。このIPアドレス(~s)は~s UTCまでブロックされます。"}.
 {"Too many unacked stanzas","多くのスタンザが応答していません"}.
+{"To ~s","宛先 ~s"}.
+{"Total rooms","チャットルーム数"}.
+{"To","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 ~p","更新 ~p"}.
+{"Update script","スクリプトの更新"}.
 {"Update","更新"}.
 {"Uptime:","起動時間:"}.
-{"Use of STARTTLS required","STARTTLS の使用が必要です"}.
+{"Use of STARTTLS required","STARTTLS の使用が必須です"}.
+{"User","ユーザー"}.
 {"User JID","ユーザー JID"}.
 {"User Management","ユーザー管理"}.
-{"User ~s","ユーザー ~s"}.
-{"User","ユーザー"}.
 {"Username:","ユーザー名:"}.
-{"Users Last Activity","ユーザーの活動履歴"}.
 {"Users","ユーザー"}.
+{"Users are not allowed to register accounts so quickly","それほど速くアカウントを登録することはできません"}.
+{"Users Last Activity","ユーザーの活動履歴"}.
+{"User ~s","ユーザー ~s"}.
 {"Validate","検証"}.
+{"vCard User Search","vCard検索"}.
 {"Virtual Hosts","バーチャルホスト"}.
+{"Visitors are not allowed to change their nicknames in this room","傍聴者はこのチャットルームでニックネームを変更することはできません"}.
+{"Visitors are not allowed to send messages to all occupants","傍聴者はすべての在室者にメッセージを送信することはできません"}.
+{"Visitor","傍聴者"}.
+{"Voice requests are disabled in this conference","この会議では、発言権の要求はできません"}.
 {"Voice request","発言権を要求"}.
 {"Wednesday","水曜日"}.
 {"When to send the last published item","最後の公開アイテムを送信するタイミングで"}.
 {"Whether to allow subscriptions","購読を許可するかどうか"}.
 {"You can later change your password using a Jabber client.","あなたは後で Jabber クライアントを使用してパスワードを変更できます。"}.
+{"You have been banned from this room","あなたはこのチャットルームからバンされています"}.
+{"You must fill in field \"Nickname\" in the form","フォームの\"ニックネーム\"欄を入力する必要があります"}.
 {"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","mod_irc の設定には x:data をサポートするクライアントが必要です"}.
 {"You need an x:data capable client to configure room","チャットルームを設定するには x:data をサポートするクライアントが必要です"}.
 {"You need an x:data capable client to search","検索を行うためには x:data をサポートするクライアントが必要です"}.
+{"Your active privacy list has denied the routing of this stanza.","あなたのプライバシーリストはこのスタンザのルーティングを拒否しました。"}.
+{"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"}.
-{"anyone","誰にでも"}.
-{"ejabberd IRC module","ejabberd IRC module"}.
-{"ejabberd MUC module","ejabberd MUCモジュール"}.
-{"ejabberd Publish-Subscribe module","ejabberd Publish-Subscribe モジュール"}.
-{"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 Bytestreams モジュール"}.
-{"ejabberd Web Admin","ejabberd ウェブ管理"}.
-{"ejabberd vCard module","ejabberd vCard モジュール"}.
-{"has been banned","はバンされました"}.
-{"has been kicked because of a system shutdown","はシステムシャットダウンのためキックされました"}.
-{"has been kicked because of an affiliation change","は分掌が変更されたためキックされました"}.
-{"has been kicked because the room has been changed to members-only","はチャットルームがメンバー制に変更されたためキックされました"}.
-{"has been kicked","はキックされました"}.
-{"is now known as","は名前を変更しました: "}.
-{"joins the room","がチャットルームに参加しました"}.
-{"leaves the room","がチャットルームから退出しました"}.
-{"moderators only","モデレーターにのみ"}.
-{"nobody","誰にも許可しない"}.
-{"private, ","プライベート、"}.
-{"the password is","パスワードは"}.
-{"vCard User Search","vCard検索"}.
-{"~s access rule configuration","~s アクセスルール設定"}.
-{"~s invites you to the room ~s","~s はあなたをチャットルーム ~s に招待しています"}.
-{"~s's Offline Messages Queue","~s' のオフラインメッセージキュー"}.