Set version to 21.04

fix gen_pubsub_node:get_state return value

.devcontainer/Dockerfile

@@ -0,0 +1,42 @@
+# Update the VARIANT arg in docker-compose.yml to pick an Elixir version: 1.9, 1.10, 1.10.4
+ARG VARIANT=latest
+FROM elixir:${VARIANT}
+
+# This Dockerfile adds a non-root user with sudo access. Update the “remoteUser” property in
+# devcontainer.json to use it. More info: https://aka.ms/vscode-remote/containers/non-root-user.
+ARG USERNAME=vscode
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+
+# Options for common package install script
+ARG INSTALL_ZSH="true"
+ARG UPGRADE_PACKAGES="true"
+ARG COMMON_SCRIPT_SOURCE="https://raw.githubusercontent.com/microsoft/vscode-dev-containers/master/script-library/common-debian.sh"
+ARG COMMON_SCRIPT_SHA="dev-mode"
+
+# Install needed packages and setup non-root user. Use a separate RUN statement to add your own dependencies.
+RUN apt-get update \
+  && export DEBIAN_FRONTEND=noninteractive \
+  && apt-get -y install --no-install-recommends curl ca-certificates 2>&1 \
+  && curl -sSL ${COMMON_SCRIPT_SOURCE} -o /tmp/common-setup.sh \
+  && ([ "${COMMON_SCRIPT_SHA}" = "dev-mode" ] || (echo "${COMMON_SCRIPT_SHA} */tmp/common-setup.sh" | sha256sum -c -)) \
+  && /bin/bash /tmp/common-setup.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
+  #
+  # Install dependencies
+  && apt-get install -y build-essential \
+  #
+  # Clean up
+  && apt-get autoremove -y \
+  && apt-get clean -y
+
+#RUN su ${USERNAME} -c "mix local.hex --force \
+#  && mix local.rebar --force \
+#  && mix archive.install --force hex phx_new ${PHOENIX_VERSION}"
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update \
+#     && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+# [Optional] Uncomment this line to install additional package.
+# RUN  mix ...

.devcontainer/devcontainer.json

@@ -0,0 +1,16 @@
+{
+	"name": "ejabberd",
+	"dockerComposeFile": "docker-compose.yml",
+	"workspaceFolder": "/workspace",
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": {
+		"terminal.integrated.shell.linux": "/bin/zsh",
+	},
+
+	// Add the IDs of extensions you want installed when the container is created.
+	// "extensions": [],
+
+	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode"
+}

.github/ISSUE_TEMPLATE

@@ -1,15 +0,0 @@
-> 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/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+assignees: ''
+
+---
+
+## Environment
+
+- ejabberd version: 18.09
+- Erlang version: `erl +V`
+- OS: Linux (Debian)
+- Installed from: source | distro package | official deb/rpm | official binary installer | other
+
+## Configuration (only if needed): grep -Ev '^$|^\s*#' ejabberd.yml
+
+```yaml
+loglevel: 4
+...
+```
+
+## Errors from error.log/crash.log
+
+No errors
+
+## Bug description
+
+Please, give us a precise description (what does not work, what is expected, etc.)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: Kind:Feature
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/lock.yml

@@ -0,0 +1,38 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 365
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels: []
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: >
+  This thread has been automatically locked since there has not been
+  any recent activity after it was closed. Please open a new issue for
+  related bugs.
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: true
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+# issues:
+#   exemptLabels:
+#     - help-wanted
+#   lockLabel: outdated
+
+# pulls:
+#   daysUntilLock: 30
+
+# Repository to extend settings from
+# _extends: repo

.github/workflows/tests.yml

@@ -0,0 +1,83 @@
+name: Tests
+
+on:
+  push:
+    paths-ignore:
+    - 'examples/**'
+    - 'man/**'
+    - 'priv/**'
+    - 'sql/**'
+    - 'test/**'
+  pull_request:
+    paths-ignore:
+    - 'examples/**'
+    - 'man/**'
+    - 'priv/**'
+    - 'sql/**'
+    - 'test/**'
+
+jobs:
+  dialyzer:
+    name: Dialyzer
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: true
+      max-parallel: 1
+      matrix:
+        erlang: ["19.3", "latest"]
+    container:
+      image: erlang:${{ matrix.erlang }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Rebar3 cache
+        uses: actions/cache@v2
+        env:
+            cache-name: cache-rebar3-deps
+        with:
+            path: ~/.cache/rebar3/
+            key: rebar3-${{ runner.os }}-erlang-${{ matrix.erlang }}
+
+      - name: System versions
+        run: |
+            uname -a
+            cat /etc/issue
+            erl -version
+            rebar3 version
+
+      - name: Libraries
+        run: |
+            apt-get -qq update
+            apt-get -qq install libgd-dev libpam-dev
+
+      - name: Compile
+        run: |
+            ./autogen.sh
+            ./configure --with-rebar=`which rebar3` \
+                        --enable-latest-deps \
+                        --enable-all --disable-elixir
+            make
+
+      - name: Hooks
+        run: make hooks
+
+      - name: Options
+        run: make options
+
+      - name: Xref
+        run: |
+            echo "{xref_ignores, [{eldap_filter_yecc, return_error, 2}]}." >>rebar.config
+            echo "{xref_checks, [deprecated_function_calls, deprecated_functions,
+                     locals_not_used, undefined_function_calls, undefined_functions]}.
+                     % Disabled: exports_not_used," >>rebar.config
+            make xref
+
+      - name: Dialyzer
+        run: |
+            echo "{dialyzer, [{get_warnings, true}, {plt_extra_apps, [cache_tab,
+                     eimp, epam, esip, ezlib, fast_tls, fast_xml, fast_yaml,
+                     mqtree, p1_acme, p1_mysql, p1_oauth2, p1_pgsql, p1_utils, pkix,
+                     sqlite3, stringprep, stun, xmpp, yconf]} ]}." >>rebar.config
+            make dialyzer

.gitignore

@@ -11,31 +11,14 @@
 /config.status
 /configure
 /aclocal.m4
-/contrib/extract_translations/extract_translations.beam
 /*.cache
 /deps/
-/doc/*.aux
-/doc/*.haux
-/doc/*.html
-/doc/*.htoc
-/doc/*.idx
-/doc/*.ilg
-/doc/*.ind
-/doc/*.log
-/doc/*.out
-/doc/*.pdf
-/doc/*.toc
-/doc/contributed_modules.tex
-/doc/version.tex
+/.deps-update/
 /ebin/
 /ejabberd.init
 /ejabberd.service
 /ejabberdctl.example
-XmppAddr.hrl
 /rel/ejabberd/
-/src/XmppAddr.asn1db
-/src/XmppAddr.erl
-/src/ejabberd.app.src
 /src/eldap_filter_yecc.erl
 /vars.config
 /dialyzer/
@@ -45,5 +28,7 @@ XmppAddr.hrl
 /priv/sql
 /rel/ejabberd
 /_build
-/mnesiadb
+/database/
 /.rebar
+/rebar.lock
+/log/

.travis.yml

@@ -1,28 +1,20 @@
 language: erlang
 
 otp_release:
-  - 17.5
-  - 18.3
-  - 19.2
+  - 19.3
+  - 23.1.2
+
+os: linux
+
+dist: xenial
 
 services:
-  - redis-server
+  - redis
+  - mysql
+  - postgresql
 
 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
-  - sudo mysql_upgrade
-  # /END MYSQL 5.6
   - pip install --user coveralls-merge
 
 install:
@@ -33,22 +25,33 @@ before_script:
   - mysql -u root -e "CREATE USER 'ejabberd_test'@'localhost' IDENTIFIED BY 'ejabberd_test';"
   - mysql -u root -e "CREATE DATABASE ejabberd_test;"
   - mysql -u root -e "GRANT ALL ON ejabberd_test.* TO 'ejabberd_test'@'localhost';"
+  - mysql -u root ejabberd_test < sql/mysql.sql
   - psql -U postgres -c "CREATE USER ejabberd_test WITH PASSWORD 'ejabberd_test';"
   - psql -U postgres -c "CREATE DATABASE ejabberd_test;"
+  - psql -U postgres ejabberd_test -f sql/pg.sql
   - psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE ejabberd_test TO ejabberd_test;"
+  - psql -U postgres ejabberd_test -c "GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ejabberd_test;"
+  - psql -U postgres ejabberd_test -c "GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ejabberd_test;"
+
+cache:
+  directories:
+  - deps/
 
 script:
   - ./autogen.sh
-  - ./configure --prefix=/tmp/ejabberd --enable-all --disable-odbc --disable-riak
+  - ./configure --prefix=/tmp/ejabberd --enable-all --disable-odbc --disable-elixir
+  - make update
   - make
   - make install -s
   - make xref
+  - ./tools/hook_deps.sh ebin
   - sed -i -e 's/ct:pal/ct:log/' test/suite.erl
   - ln -sf ../sql priv/
   - echo "" >> rebar.config
   - echo '{ct_extra_params, "-verbosity 20"}.' >> rebar.config
   - escript ./rebar skip_deps=true ct -v
   - grep -q 'TEST COMPLETE,.* 0 failed' logs/raw.log
+  - test $(find logs -empty -name error.log)
 
 after_script:
   - find logs -name suite.log -exec cat '{}' ';'
@@ -56,7 +59,7 @@ after_script:
 after_failure:
   - find logs -name exunit.log -exec cat '{}' ';'
   - find logs -name ejabberd.log -exec cat '{}' ';'
-  - find logs -name suite.log -exec cat '{}' ';' | awk 'BEGIN{RS="\n=case";FS="\n"} /=result\s*failed/ {print "=case" $0}
+  - find logs -name suite.log -exec cat '{}' ';' | awk 'BEGIN{RS="\n=case";FS="\n"} /=result\s*failed/ {print "=case" $0}'
 
 after_success:
   - coveralls-merge erlang.json

.travis/mysql_repo_key.asc

@@ -1,432 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-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
-roUTAKClYAhZuX2nUNwH4vlEJQHDqYa5yQ==
-=HfUN
------END PGP PUBLIC KEY BLOCK-----

CHANGELOG.md

@@ -0,0 +1,368 @@
+# Version 20.12
+
+- Add support for `SCRAM-SHA-{256,512}-{PLUS}` authentication
+- Don't use same value in cache for user don't exist and wrong password
+- outgoing_s2s_ipv*_address: New options to set ipv4/ipv6 outbound s2s out interface
+- s2s_send_packet: this hook now filters outgoing s2s stanzas
+- start_room: new hook runs when a room process is started
+- check_decoded_jwt: new hook to check decoded JWT after success authentication
+
+* Admin
+- Docker: Fix DB initialization
+- New sql_odbc_driver option: choose the mssql ODBC driver
+- Rebar3: Fully supported. Enable with ./configure --with-rebar=/path/to/rebar3
+- systemd: start ejabberd in foreground
+
+* Modules:
+- MAM: Make sure that jid used as base in mam xml_compress is bare
+- MAM: Support for MAM Flipped Pages
+- MUC: Always show MucSub subscribers nicks
+- MUC: Don't forget not-persistent rooms in load_permanent_rooms
+- MUC Admin: Better error reporting
+- MUC Admin: Fix commands with hibernated rooms
+- MUC Admin: Many improvements in rooms_unused_list/destroy
+- MUC Admin: create_room_with_opts Store options only if room starts
+- Pubsub: Remove 'dag' node plugin documentation
+- Push: Fix API call return type on error
+- Push: Support cache config changes on reload
+- Register: Allow for account-removal-only setup again
+- Roster: Make roster subscriptions work better with invalid roster state in db
+- Vcard: Fix vCard search by User when using Mnesia
+- WebAdmin: Allow vhost admins to view WebAdmin menus
+- WebAdmin: Don't do double utf-8 conversion on translated strings
+- WebAdmin: Mark dangerous buttons with CSS
+- WebSocket: Make websocket send put back pressure on c2s process
+
+# Version 20.07
+
+* Changes in this version
+- Add support for using unix sockets in listeners.
+- Make this version compatible with erlang R23
+- Make room permissions checks more strict for subscribers
+- Fix problem with muc rooms crashing when using muc logger
+  with some locales
+- Limit stat calls that logger module issues
+- Don't throw errors when using user_regexp acl rule and
+  having non-matching host
+- Fix problem with leaving old data when updating shared rosters
+- Fix edge case that caused failure of resuming old sessions with
+  stream management.
+- Fix crash when room that was started with loging enabled was later
+  changed to logging disabled
+- Increase default shaper limits (this should help with delays for
+  clients that are using jingle)
+- Fix couple compatibility problems which prevented working on 
+  erlang R19
+- Fix sending presence unavailable when session terminates for
+  clients that only send directed presences (helps with sometimes
+  not leaving muc rooms on disconnect).
+- Prevent supervisor errors for sockets that were closed before
+  they were passed to handler modules
+- Make stun module work better with ipv6 addresses
+
+# Version 20.03
+
+* Changes in this version
+- Add support of ssl connection when connection to mysql
+  database (configured with `sql_ssl: true` option)
+- Experimental support for cockroachdb when configured
+  with postgres connector 
+- Add cache and optimize queries issued by `mod_shared_roster`,
+  this should greatly improve performance of this module when
+  used with `sql` backend
+- Fix problem with accessing webadmin
+- Make webadmin work even when url is missing trailing slash
+- When compiling external modules with ext_mod, use flags
+  that were detected during compilation of ejabberd
+- Make config changed to ldap options be updated when issued
+  `reload_config` command
+- Fix `room_empty_destory` command
+- Fix reporting errors in `send_stanza` command when xml
+  passed to it couldn't be passed correctly
+
+# Version 20.02
+
+* Changes in this version
+- Fix problems when trying to use string format with unicode
+  values directly in xmpp nodes
+- Add missing oauth_client table declaration in lite.new.sql
+- Improve compatibility with CocroachDB
+- Fix importing of piefxis files that did use scram passwords
+- Fix importing of piefxis files that had multiple includes
+  in them
+- Update jiffy dependency
+- Allow storage of emojis when using mssql database (Thanks
+  to Christoph Scholz)
+- Make ejabberd_auth_http be able to use auth_opts
+- Make custom_headers options in http modules correctly
+  override built-in values
+- Fix return value of reload_config and dump_config commands
+
+# Version 20.01
+
+* New features
+- Implement OAUTH authentication in mqtt
+- Make logging infrastructure use new logger introduced
+  in Erlang (requires OTP22)
+- New configuration parser/validator
+- Initial work on being able to use CockroachDB as database backend
+- Add gc command
+- Add option to disable using prepared statements on Postgresql
+- Implement routine for converting password to SCRAM format
+  for all backends not only SQL
+- Add infrastructure for having module documentation directly
+  in individual module source code
+- Generate man page automaticaly
+- Implement copy feature in mod_carboncopy
+
+* Fixes
+- Make webadmin work with configurable paths
+- Fix handling of result in xmlrpc module
+- Make webadmin work even when accessed through not declared domain
+- Better error reporting in xmlrpc
+- Limit ammount of results returned by disco queries to pubsub nodes
+- Improve validation of configured JWT keys
+- Fix race condition in Redis/SQL startup
+- Fix loading order of third party modules
+- Fix reloading of ACL rules
+- Make account removal requests properly route response
+- Improve handling of malformed inputs in send_message command
+- Omit push notification if storing message in offline storage
+  failed
+- Fix crash in stream management when timeout was not set
+
+# Version 19.09
+
+* Admin
+- The minimum required Erlang/OTP version is now 19.3
+- Fix API call using OAuth (#2982)
+- Rename MUC command arguments from Host to Service (#2976)
+
+* Webadmin
+- Don't treat 'Host' header as a virtual XMPP host (#2989)
+- Fix some links to Guide in WebAdmin and add new ones (#3003)
+- Use select fields to input host in WebAdmin Backup (#3000)
+- Check account auth provided in WebAdmin is a local host (#3000)
+
+* ACME
+- Improve ACME implementation
+- Fix IDA support in ACME requests
+- Fix unicode formatting in ACME module
+- Log an error message on IDNA failure
+- Support IDN hostnames in ACME requests
+- Don't attempt to create ACME directory on ejabberd startup
+- Don't allow requesting certificates for localhost or IP-like domains
+- Don't auto request certificate for localhost and IP-like domains
+- Add listener for ACME challenge in example config
+
+* Authentication
+- JWT-only authentication for some users (#3012)
+
+* MUC
+- Apply default role after revoking admin affiliation (#3023)
+- Custom exit message is not broadcast (#3004)
+- Revert "Affiliations other than admin and owner cannot invite to members_only rooms" (#2987)
+- When join new room with password, set pass and password_protected (#2668)
+- Improve rooms_* commands to accept 'global' as MUC service argument (#2976)
+- Rename MUC command arguments from Host to Service (#2976)
+
+* SQL
+- Fix transactions for Microsoft SQL Server (#2978)
+- Spawn SQL connections on demand only
+
+* Misc
+- Add support for XEP-0328: JID Prep
+- Added gsfonts for captcha
+- Log Mnesia table type on creation
+- Replicate Mnesia 'bosh' table when nodes are joined
+- Fix certificate selection for s2s (#3015)
+- Provide meaningful error when adding non-local users to shared roster (#3000)
+- Websocket: don't treat 'Host' header as a virtual XMPP host (#2989)
+- Fix sm ack related c2s error (#2984)
+- Don't hide the reason why c2s connection has failed
+- Unicode support
+- Correctly handle unicode in log messages
+- Fix unicode processing in ejabberd.yml
+
+# Version 19.08
+
+* Administration
+- Improve ejabberd halting procedure
+- Process unexpected erlang messages uniformly: logging a warning
+- mod_configure: Remove modules management
+
+* Configuration
+- Use new configuration validator
+- ejabberd_http: Use correct virtual host when consulting trusted_proxies
+- Fix Elixir modules detection in the configuration file
+- Make option 'validate_stream' global
+- Allow multiple definitions of host_config and append_host_config
+- Introduce option 'captcha_url'
+- mod_stream_mgmt: Allow flexible timeout format
+- mod_mqtt: Allow flexible timeout format in session_expiry option
+
+* Misc
+- Fix SQL connections leakage
+- New authentication method using JWT tokens
+- extauth: Add 'certauth' command
+- Improve SQL pool logic
+- Add and improve type specs
+- Improve extraction of translated strings
+- Improve error handling/reporting when loading language translations
+- Improve hooks validator and fix bugs related to hooks registration
+- Gracefully close inbound s2s connections
+- mod_mqtt: Fix usage of TLS
+- mod_offline: Make count_offline_messages cache work when using mam for storage
+- mod_privacy: Don't attempt to query 'undefined' active list
+- mod_privacy: Fix race condition
+
+* MUC
+- Add code for hibernating inactive muc_room processes
+- Improve handling of unexpected iq in mod_muc_room
+- Attach mod_muc_room processes to a supervisor
+- Restore room when receiving message or generic iq for not started room
+- Distribute routing of MUC messages accross all CPU cores
+
+* PubSub
+- Fix pending nodes retrieval for SQL backend
+- Check access_model when publishing PEP
+- Remove deprecated pubsub plugins
+- Expose access_model and publish_model in pubsub#metadata
+
+# Version 19.05
+
+* Admin
+- The minimum required Erlang/OTP version is now 19.1
+- Provide a suggestion when unknown command, module, option or request handler is detected
+- Deprecate some listening options: captcha, register, web_admin, http_bind and xmlrpc
+- Add commands to get Mnesia info: mnesia_info and mnesia_table_info
+- Fix Register command to respect mod_register's Access option
+- Fixes in Prosody import: privacy and rooms
+- Remove TLS options from the example config
+- Improve request_handlers validator
+- Fix syntax in example Elixir config file
+
+* Auth
+- Correctly support cache tags in ejabberd_auth
+- Don't process failed EXTERNAL authentication by mod_fail2ban
+- Don't call to mod_register when it's not loaded
+- Make anonymous auth don't {de}register user when there are other resources
+
+* Developer
+- Rename listening callback from start/2 to start/3
+- New hook called when room gets destroyed: room_destroyed
+- New hooks for tracking mucsub subscriptions changes: muc_subscribed, muc_unsubscribed
+- Make static hooks analyzer working again
+
+* MUC
+- Service admins are allowed to recreate room even if archiv is nonempty
+- New option user_mucsub_from_muc_archive
+- Avoid late arrival of get_disco_item response
+- Handle get_subscribed_rooms call from mod_muc_room pid
+- Fix room state cleanup from db on change of persistent option change
+- Make get_subscribed_rooms work even for non-persistant rooms
+- Allow non-moderator subscribers to get list of room subscribers
+
+* Offline
+- New option bounce_groupchat: make it not bounce mucsub/groupchat messages
+- New option use_mam_for_storage: fetch data from mam instead of spool table
+- When applying limit of max msgs in spool check only spool size
+- Do not store mucsub wrapped messages with no-store hint in offline storage
+- Always store ActivityMarker messages
+- Don't issue count/message fetch queries for offline from mam when not needed
+- Properly handle infinity as max number of message in mam offline storage
+- Sort messages by stanza_id when using mam storage in mod_offline
+- Return correct value from count_offline_messages with mam storage option
+- Make mod_offline put msg ignored by mam in spool when mam storage is on
+
+* SQL:
+- Add SQL schemas for MQTT tables
+- Report better errors on SQL terms decode failure
+- Fix PostgreSQL compatibility in mod_offline_sql:remove_old_messages
+- Fix handling of list arguments on pgsql
+- Preliminary support for SQL in process_rosteritems command
+
+* Tests
+- Add tests for user mucsub mam from muc mam
+- Add tests for offline with mam storage
+- Add tests for offline use_mam_for_storage
+- Initial Docker environment to run ejabberd test suite
+- Test offline:use_mam_for_storage, mam:user_mucsub_from_muc_archive used together
+
+* Websocket
+- Add WebSockets support to mod_mqtt
+- Return "Bad request" error when origin in websocket connection doesn't match
+- Fix RFC6454 violation on websocket connection when validating Origin header
+- Origin header validation on websocket connection
+
+* Other modules
+- mod_adhoc: Use xml:lang from stanza when it's missing in <command/> element
+- mod_announce: Add 'sessionid' attribute when required
+- mod_bosh: Don't put duplicate polling attribute in bosh payload
+- mod_http_api: Improve argument error messages and log messages
+- mod_http_upload: Feed whole image to eimp:identify/1
+- mod_http_upload: Log nicer warning on unknown host
+- mod_http_upload: Case-insensitive host comparison
+- mod_mqtt: Support other socket modules
+- mod_push: Check for payload in encrypted messages
+
+# Version 19.02
+
+* Admin
+- Fix in configure.ac the Erlang/OTP version: from 17.5 to 19.0
+- reload_config command: Fix crash when sql_pool_size option is used
+- reload_config command: Fix crash when SQL is not configured
+- rooms_empty_destroy command: Several fixes to behave more conservative
+- Fix serverhost->host parameter name for muc_(un)register_nick API
+
+* Configuration
+- Allow specifying tag for listener for api_permission purposes
+- Change default ciphers to intermediate
+- Define default ciphers/protocol_option in example config
+- Don't crash on malformed 'modules' section
+- mod_mam: New option clear_archive_on_room_destroy to prevent archive removal on room destroy
+- mod_mam: New option access_preferences to restrict who can modify the MAM preferences
+- mod_muc: New option access_mam to restrict who can modify that room option
+- mod_offline: New option store_groupchat to allow storing group chat messages
+
+* Core
+- Add MQTT protocol support
+- Fix (un)setting of priority
+- Use OTP application startup infrastructure for starting dependencies
+- Improve starting order of several dependencies
+
+* MAM
+- mod_mam_mnesia/sql: Improve check for empty archive
+- disallow room creation if archive not empty and clear_archive_on_room_destroy is false
+- allow check if archive is empty for or user or room
+- Additional checks for database failures
+
+* MUC
+- Make sure that room_destroyed is called even when some code throws in terminate
+- Update muc room state after adding extra access field to it
+- MUC/Sub: Send mucsub subscriber notification events with from set to room jid
+
+* Shared Roster
+- Don't perform roster push for non-local contacts
+- Handle versioning result when shared roster group has remote account
+- Fix SQL queries
+
+* Miscelanea
+- CAPTCHA: Add no-store hint to CAPTCHA challenge stanzas
+- HTTP: Reject http_api request with malformed Authentication header
+- mod_carboncopy: Don't lose carbons on presence change or session resumption
+- mod_mix: Fix submission-id and channel resource
+- mod_ping: Fix ping IQ reply/timeout processing (17.x regression)
+- mod_private: Hardcode item ID for PEP bookmarks
+- mod_push: Improve notification error handling
+- PIEFXIS: Fix user export when password is scrammed
+- Prosody: Improve import of roster items, rooms and attributes
+- Translations: fixed "make translations"
+- WebAdmin: Fix support to restart module with new options
+
+# Version 18.12
+
+* MAM data store compression
+* Proxy protocol support (http://www.haproxy.org/download/1.8/doc/proxy-protocol.txt)
+* MUC Self-Ping optimization (XEP-0410)
+* Bookmarks conversion (XEP-0411)

CONTRIBUTING.md

@@ -0,0 +1,150 @@
+# Contributing to ejabberd
+
+We'd love for you to contribute to our source code and to make ejabberd even better than it is
+today! Here are the guidelines we'd like you to follow:
+
+* [Code of Conduct](#coc)
+* [Questions and Problems](#question)
+* [Issues and Bugs](#issue)
+* [Feature Requests](#feature)
+* [Issue Submission Guidelines](#submit)
+* [Pull Request Submission Guidelines](#submit-pr)
+* [Signing the CLA](#cla)
+
+## <a name="coc"></a> Code of Conduct
+
+Help us keep ejabberd community open-minded and inclusive. Please read and follow our [Code of Conduct][coc].
+
+## <a name="requests"></a> Questions, Bugs, Features
+
+### <a name="question"></a> Got a Question or Problem?
+
+Do not open issues for general support questions as we want to keep GitHub issues for bug reports
+and feature requests. You've got much better chances of getting your question answered on dedicated
+support platforms, the best being [Stack Overflow][stackoverflow].
+
+Stack Overflow is a much better place to ask questions since:
+
+- there are thousands of people willing to help on Stack Overflow
+- questions and answers stay available for public viewing so your question / answer might help
+  someone else
+- Stack Overflow's voting system assures that the best answers are prominently visible.
+
+To save your and our time, we will systematically close all issues that are requests for general
+support and redirect people to the section you are reading right now.
+
+Other channels for support are:
+- [ejabberd Mailing List][list]
+- [ejabberd XMPP room][muc]: ejabberd@conference.process-one.net
+- [ejabberd XMPP room logs][logs]
+
+### <a name="issue"></a> Found an Issue or Bug?
+
+If you find a bug in the source code, you can help us by submitting an issue to our
+[GitHub Repository][github]. Even better, you can submit a Pull Request with a fix.
+
+### <a name="feature"></a> Missing a Feature?
+
+You can request a new feature by submitting an issue to our [GitHub Repository][github-issues].
+
+If you would like to implement a new feature then consider what kind of change it is:
+
+* **Major Changes** that you wish to contribute to the project should be discussed first in an
+  [GitHub issue][github-issues] that clearly outlines the changes and benefits of the feature.
+* **Small Changes** can directly be crafted and submitted to the [GitHub Repository][github]
+  as a Pull Request. See the section about [Pull Request Submission Guidelines](#submit-pr).
+
+## <a name="submit"></a> Issue Submission Guidelines
+
+Before you submit your issue search the archive, maybe your question was already answered.
+
+If your issue appears to be a bug, and hasn't been reported, open a new issue. Help us to maximize
+the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
+
+The "[new issue][github-new-issue]" form contains a number of prompts that you should fill out to
+make it easier to understand and categorize the issue.
+
+## <a name="submit-pr"></a> Pull Request Submission Guidelines
+
+By submitting a pull request for a code or doc contribution, you need to have the right
+to grant your contribution's copyright license to ProcessOne. Please check [ProcessOne CLA][cla]
+for details.
+
+Before you submit your pull request consider the following guidelines:
+
+* Search [GitHub][github-pr] for an open or closed Pull Request
+  that relates to your submission. You don't want to duplicate effort.
+* Create the [development environment][developer-setup]
+* Make your changes in a new git branch:
+
+    ```shell
+    git checkout -b my-fix-branch master
+    ```
+* Test your changes and, if relevant, expand the automated test suite.
+* Create your patch commit, including appropriate test cases.
+* If the changes affect public APIs, change or add relevant [documentation][doc-repo].
+* Commit your changes using a descriptive commit message.
+
+    ```shell
+    git commit -a
+    ```
+  Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
+
+* Push your branch to GitHub:
+
+    ```shell
+    git push origin my-fix-branch
+    ```
+
+* In GitHub, send a pull request to `ejabberd:master`. This will trigger the Travis integration and run the test.
+We will also notify you if you have not yet signed the [contribution agreement][cla].
+
+* If you find that the Travis integration has failed, look into the logs on Travis to find out
+if your changes caused test failures, the commit message was malformed etc. If you find that the
+tests failed or times out for unrelated reasons, you can ping a team member so that the build can be
+restarted.
+
+* If we suggest changes, then:
+
+  * Make the required updates.
+  * Test your changes and test cases.
+  * Commit your changes to your branch (e.g. `my-fix-branch`).
+  * Push the changes to your GitHub repository (this will update your Pull Request).
+
+    You can also amend the initial commits and force push them to the branch.
+
+    ```shell
+    git rebase master -i
+    git push origin my-fix-branch -f
+    ```
+
+    This is generally easier to follow, but separate commits are useful if the Pull Request contains
+    iterations that might be interesting to see side-by-side.
+
+That's it! Thank you for your contribution!
+
+## <a name="cla"></a> Signing the Contributor License Agreement (CLA)
+
+Upon submitting a Pull Request, we will ask you to sign our CLA if you haven't done
+so before. It's a quick process, we promise, and you will be able to do it all online
+
+You can read [ProcessOne Contribution License Agreement][cla] in PDF.
+
+This is part of the legal framework of the open-source ecosystem that adds some red tape,
+but protects both the contributor and the company / foundation behind the project. It also
+gives us the option to relicense the code with a more permissive license in the future.
+
+
+[coc]: https://github.com/processone/ejabberd/blob/master/CODE_OF_CONDUCT.md
+[stackoverflow]: https://stackoverflow.com/questions/tagged/ejabberd?sort=newest
+[list]: https://lists.jabber.ru/mailman/listinfo/ejabberd
+[muc]: xmpp:ejabberd@conference.process-one.net
+[logs]: https://process-one.net/logs/ejabberd@conference.process-one.net/
+[github]: https://github.com/processone/ejabberd
+[github-issues]: https://github.com/processone/ejabberd/issues
+[github-new-issue]: https://github.com/processone/ejabberd/issues/new
+[github-pr]: https://github.com/processone/ejabberd/pulls
+[doc-repo]: https://github.com/processone/docs.ejabberd.im
+[developer-setup]: https://docs.ejabberd.im/developer/
+[cla]: https://www.process-one.net/resources/ejabberd-cla.pdf
+[license]: https://github.com/processone/ejabberd/blob/master/COPYING

CONTRIBUTORS.md

@@ -0,0 +1,37 @@
+# Contributors
+
+We would like to thanks official ejabberd source code contributors:
+
+- Sergey Abramyan
+- Badlop
+- Ludovic Bocquet
+- Emilio Bustos
+- Thiago Camargo
+- Juan Pablo Carlino
+- Paweł Chmielowski
+- Gabriel Gatu
+- Tsukasa Hamano
+- Konstantinos Kallas
+- Evgeny Khramtsov
+- Ben Langfeld
+- Peter Lemenkov
+- Anna Mukharram
+- Johan Oudinet
+- Pablo Polvorin
+- Mickaël Rémond
+- Matthias Rieber
+- Rafael Roemhild
+- Christophe Romain
+- Jérôme Sautret
+- Sonny Scroggin
+- Alexey Shchepin
+- Shelley Shyan
+- Radoslaw Szymczyszyn
+- Stu Tomlinson
+- Christian Ulrich
+- Holger Weiß
+
+Please, if you think we are missing your contribution, do not hesitate to contact us at ProcessOne.
+In case you do not want to appear in this list, please, let us know as well.
+
+Thanks !

Makefile.in

@@ -1,4 +1,4 @@
-REBAR = @ESCRIPT@ rebar
+REBAR = @ESCRIPT@ @rebar@
 INSTALL = @INSTALL@
 SED = @SED@
 ERL = @ERL@
@@ -28,6 +28,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 datarootdir = @datarootdir@
 DOCDIR = $(DESTDIR)@docdir@
 
+# /share/doc/man/man5
+MANDIR = $(DESTDIR)@mandir@/man5
+
 # /usr/lib/ejabberd/ebin/
 BEAMDIR = $(EJABBERDDIR)/ebin
 
@@ -58,6 +61,9 @@ JSDIR = $(PRIVDIR)/js
 # /usr/lib/ejabberd/priv/sql
 SQLDIR = $(PRIVDIR)/sql
 
+# /usr/lib/ejabberd/priv/lua
+LUADIR = $(PRIVDIR)/lua
+
 # /var/lib/ejabberd/
 SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
 
@@ -91,34 +97,59 @@ ifneq ($(INSTALLGROUP),)
   G_USER=-g $(INSTALLGROUP)
 endif
 
+IS_REBAR3:=$(shell expr `$(REBAR) --version | awk -F '[ .]' '/rebar / {print $$2}'` '>=' 3)
+
+ifeq "$(IS_REBAR3)" "1"
+  SKIPDEPS=
+  LISTDEPS=tree
+  UPDATEDEPS=upgrade
+  DEPSPATTERN="s/ (.*//; /^ / s/.* \([a-z0-9_]*\).*/\1/p;"
+  DEPSBASE=_build
+  DEPSDIR=$(DEPSBASE)/default/lib
+  EBINDIR=$(DEPSDIR)/ejabberd/ebin
+else
+  SKIPDEPS=skip_deps=true
+  LISTDEPS=-q list-deps
+  UPDATEDEPS=update-deps
+  DEPSPATTERN="/ TAG / s/ .*// p; / REV / s/ .*// p; / BRANCH / s/ .*// p;"
+  DEPSBASE=deps
+  DEPSDIR=$(DEPSBASE)
+  EBINDIR=ebin
+endif
+
 all: deps src
 
-deps: deps/.got
+deps: $(DEPSDIR)/.got
 
-deps/.got:
-	rm -rf deps/.got
-	rm -rf deps/.built
-	mkdir -p deps
-	$(REBAR) get-deps && :> deps/.got
+$(DEPSDIR)/.got:
+	rm -rf $(DEPSDIR)/.got
+	rm -rf $(DEPSDIR)/.built
+	mkdir -p $(DEPSDIR)
+	$(REBAR) get-deps && :> $(DEPSDIR)/.got
 
-deps/.built: deps/.got
+$(DEPSDIR)/.built: $(DEPSDIR)/.got
 	$(REBAR) configure-deps
-	$(REBAR) compile && :> deps/.built
+	$(REBAR) compile && :> $(DEPSDIR)/.built
 
-src: deps/.built
-	$(REBAR) skip_deps=true compile
+src: $(DEPSDIR)/.built
+	$(REBAR) $(SKIPDEPS) compile
 
 update:
-	rm -rf deps/.got
-	rm -rf deps/.built
-	$(REBAR) update-deps && :> deps/.got
+	rm -rf $(DEPSDIR)/.got
+	rm -rf $(DEPSDIR)/.built
+	$(REBAR) $(UPDATEDEPS) && :> $(DEPSDIR)/.got
 
 xref: all
-	$(REBAR) skip_deps=true xref
+	$(REBAR) $(SKIPDEPS) xref
 
+hooks: all
+	tools/hook_deps.sh $(EBINDIR)
+
+options: all
+	tools/opt_types.sh ejabberd_option $(EBINDIR)
 
 translations:
-	tools/prepare-tr.sh
+	tools/prepare-tr.sh $(DEPSDIR)
 
 edoc:
 	$(ERL) -noinput +B -eval \
@@ -128,10 +159,13 @@ JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),$(firstword $(1))/$(call JOIN_PATHS,$(wo
 
 VERSIONED_DEP=$(if $(DEP_$(1)_VERSION),$(DEP_$(1)_VERSION),$(1))
 
+DEPIX:=$(words $(subst /, ,$(DEPSDIR)))
+LIBIX:=$(shell expr "$(DEPIX)" + 2)
+
 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_SINGLE=$(if $(subst X$(DEPSBASE)X,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word $(LIBIX),$(1))X),$(call DEPS_TO_DEST,$(wordlist $(DEPIX),1000,$(1))),$(call ELIXIR_TO_DEST,$(wordlist $(DEPIX),1000,$(1)))))
 TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
 
 FILTER_DIRS=$(foreach path,$(1),$(if $(wildcard $(path)/*),,$(path)))
@@ -139,17 +173,17 @@ FILES_WILDCARD=$(call FILTER_DIRS,$(foreach w,$(1),$(wildcard $(w))))
 
 ifeq ($(MAKECMDGOALS),copy-files-sub)
 
-DEPS:=$(sort $(shell $(REBAR) -q list-deps|$(SED) -ne '/ TAG / s/ .*// p; / REV / s/ .*// p; / BRANCH / s/ .*// p'))
+DEPS:=$(sort $(shell QUIET=1 $(REBAR) $(LISTDEPS) | $(SED) -ne $(DEPSPATTERN) ))
 
-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)/COPY* deps/$(DEP)/LICENSE* deps/$(DEP)/lib/*/ebin/*.beam deps/$(DEP)/lib/*/ebin/*.app))
+DEPS_FILES=$(call FILES_WILDCARD,$(foreach DEP,$(DEPS),$(DEPSDIR)/$(DEP)/ebin/*.beam $(DEPSDIR)/$(DEP)/ebin/*.app $(DEPSDIR)/$(DEP)/priv/* $(DEPSDIR)/$(DEP)/priv/lib/* $(DEPSDIR)/$(DEP)/priv/bin/* $(DEPSDIR)/$(DEP)/include/*.hrl $(DEPSDIR)/$(DEP)/COPY* $(DEPSDIR)/$(DEP)/LICENSE* $(DEPSDIR)/$(DEP)/lib/*/ebin/*.beam $(DEPSDIR)/$(DEP)/lib/*/ebin/*.app))
 
-BINARIES=deps/epam/priv/bin/epam deps/eimp/priv/bin/eimp deps/fs/priv/mac_listener
+BINARIES=$(DEPSDIR)/epam/priv/bin/epam $(DEPSDIR)/eimp/priv/bin/eimp $(DEPSDIR)/fs/priv/mac_listener
 
-DEPS_FILES_FILTERED=$(filter-out $(BINARIES) deps/elixir/ebin/elixir.app,$(DEPS_FILES))
-DEPS_DIRS=$(sort deps/ $(foreach DEP,$(DEPS),deps/$(DEP)/) $(dir $(DEPS_FILES)))
+DEPS_FILES_FILTERED=$(filter-out $(BINARIES) $(DEPSDIR)/elixir/ebin/elixir.app,$(DEPS_FILES))
+DEPS_DIRS=$(sort $(DEPSDIR)/ $(foreach DEP,$(DEPS),$(DEPSDIR)/$(DEP)/) $(dir $(DEPS_FILES)))
 
-MAIN_FILES=$(filter-out %/configure.beam,$(call FILES_WILDCARD,ebin/*.beam ebin/*.app priv/msgs/*.msg priv/css/*.css priv/img/*.png priv/js/*.js priv/lib/* include/*.hrl COPYING))
-MAIN_DIRS=$(sort $(dir $(MAIN_FILES)) priv/bin priv/sql)
+MAIN_FILES=$(filter-out %/configure.beam,$(call FILES_WILDCARD,$(EBINDIR)/*.beam $(EBINDIR)/*.app priv/msgs/*.msg priv/css/*.css priv/img/*.png priv/js/*.js priv/lib/* include/*.hrl COPYING))
+MAIN_DIRS=$(sort $(dir $(MAIN_FILES)) priv/bin priv/sql priv/lua)
 
 define DEP_VERSION_template
 DEP_$(1)_VERSION:=$(shell $(SED) -e '/vsn/!d;s/.*, *"/$(1)-/;s/".*//' $(2) 2>/dev/null)
@@ -157,8 +191,8 @@ endef
 
 DELETE_TARGET_SO=$(if $(subst X.soX,,X$(suffix $(1))X),,rm -f $(call TO_DEST,$(1));)
 
-$(foreach DEP,$(DEPS),$(eval $(call DEP_VERSION_template,$(DEP),deps/$(DEP)/ebin/$(DEP).app)))
-$(eval $(call DEP_VERSION_template,ejabberd,ebin/ejabberd.app))
+$(foreach DEP,$(DEPS),$(eval $(call DEP_VERSION_template,$(DEP),$(DEPSDIR)/$(DEP)/ebin/$(DEP).app)))
+$(eval $(call DEP_VERSION_template,ejabberd,$(EBINDIR)/ejabberd.app))
 
 define COPY_template
 $(call TO_DEST,$(1)): $(1) $(call TO_DEST,$(dir $(1))) ; $(call DELETE_TARGET_SO, $(1)) $$(INSTALL) -m 644 $(1) $(call TO_DEST,$(1))
@@ -181,7 +215,10 @@ $(call TO_DEST,priv/sql/lite.sql): sql/lite.sql $(call TO_DEST,priv/sql)
 $(call TO_DEST,priv/bin/captcha.sh): tools/captcha.sh $(call TO_DEST,priv/bin)
 	$(INSTALL) -m 755 $(O_USER) $< $@
 
-copy-files-sub2: $(call TO_DEST,$(DEPS_FILES) $(MAIN_FILES) priv/bin/captcha.sh priv/sql/lite.sql)
+$(call TO_DEST,priv/lua/redis_sm.lua): priv/lua/redis_sm.lua $(call TO_DEST,priv/lua)
+	$(INSTALL) -m 644 $< $@
+
+copy-files-sub2: $(call TO_DEST,$(DEPS_FILES) $(MAIN_FILES) priv/bin/captcha.sh priv/sql/lite.sql priv/lua/redis_sm.lua)
 
 .PHONY: $(call TO_DEST,$(DEPS_FILES) $(MAIN_DIRS) $(DEPS_DIRS))
 
@@ -192,7 +229,7 @@ copy-files:
 
 copy-files-sub: copy-files-sub2
 
-install: all copy-files
+install: copy-files
 	#
 	# Configuration files
 	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
@@ -219,9 +256,9 @@ install: all copy-files
 	$(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 || 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
+	[ -f $(DEPSDIR)/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/iex $(BINDIR)/iex || true
+	[ -f $(DEPSDIR)/elixir/bin/elixir ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/elixir $(BINDIR)/elixir || true
+	[ -f $(DEPSDIR)/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/mix $(BINDIR)/mix || true
 	#
 	# Init script
 	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
@@ -251,10 +288,11 @@ install: all copy-files
 	chmod -R 750 $(LOGDIR)
 	#
 	# Documentation
+	$(INSTALL) -d $(MANDIR)
 	$(INSTALL) -d $(DOCDIR)
-	[ -f doc/guide.html ] \
-		&& $(INSTALL) -m 644 doc/guide.html $(DOCDIR) \
-		|| echo "Documentation not included in sources"
+	[ -f man/ejabberd.yml.5 ] \
+		&& $(INSTALL) -m 644 man/ejabberd.yml.5 $(MANDIR) \
+		|| echo "Man page not included in sources"
 	$(INSTALL) -m 644 COPYING $(DOCDIR)
 
 uninstall: uninstall-binary
@@ -283,6 +321,8 @@ uninstall-binary:
 	rm -fr $(JSDIR)
 	rm -f  $(SQLDIR)/*.sql
 	rm -fr $(SQLDIR)
+	rm -fr $(LUADIR)/*.lua
+	rm -fr $(LUADIR)
 	rm -fr $(PRIVDIR)
 	rm -fr $(EJABBERDDIR)
 
@@ -294,8 +334,8 @@ uninstall-all: uninstall-binary
 	rm -rf $(LOGDIR)
 
 clean:
-	rm -rf deps/.got
-	rm -rf deps/.built
+	rm -rf $(DEPSDIR)/.got
+	rm -rf $(DEPSDIR)/.built
 	rm -rf test/*.beam
 	$(REBAR) clean
 
@@ -306,11 +346,12 @@ distclean: clean clean-rel
 	rm -f config.status
 	rm -f config.log
 	rm -rf autom4te.cache
-	rm -rf deps
-	rm -rf ebin
+	rm -rf $(EBINDIR)
+	rm -rf $(DEPSBASE)
 	rm -f Makefile
 	rm -f vars.config
 	rm -f src/ejabberd.app.src
+	rm -f ejabberdctl.example ejabberd.init ejabberd.service
 	[ ! -f ../ChangeLog ] || rm -f ../ChangeLog
 
 rel: all
@@ -321,14 +362,18 @@ TAGS:
 
 Makefile: Makefile.in
 
-deps := $(wildcard deps/*/ebin)
+ifeq "$(IS_REBAR3)" "1"
+dialyzer:
+	$(REBAR) dialyzer
+else
+deps := $(wildcard $(DEPSDIR)/*/ebin)
 
 dialyzer/erlang.plt:
 	@mkdir -p dialyzer
 	@dialyzer --build_plt --output_plt dialyzer/erlang.plt \
 	-o dialyzer/erlang.log --apps kernel stdlib sasl crypto \
-	public_key ssl mnesia inets odbc tools compiler erts \
-	runtime_tools asn1 observer xmerl et gs wx syntax_tools; \
+	public_key ssl mnesia inets odbc compiler erts \
+	os_mon asn1 syntax_tools; \
 	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
 
 dialyzer/deps.plt:
@@ -359,17 +404,15 @@ dialyzer: erlang_plt deps_plt ejabberd_plt
 	@dialyzer --plts dialyzer/*.plt --no_check_plt \
 	--get_warnings -o dialyzer/error.log ebin; \
 	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
+endif
 
 test:
 	@echo "************************** NOTICE ***************************************"
 	@cat test/README
 	@echo "*************************************************************************"
 	@cd priv && ln -sf ../sql
-	$(REBAR) skip_deps=true ct
-
-quicktest:
-	$(REBAR) skip_deps=true ct suites=elixir
+	$(REBAR) $(SKIPDEPS) ct
 
 .PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean rel \
 	install uninstall uninstall-binary uninstall-all translations deps test \
-	quicktest erlang_plt deps_plt ejabberd_plt
+	quicktest erlang_plt deps_plt ejabberd_plt xref hooks options

README

@@ -1,174 +0,0 @@
-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
-thousands of simultaneous users on a single node and has been designed to
-provide exceptional standards of fault tolerance. As an open source
-technology, based on industry-standards, ejabberd can be used to build bespoke
-solutions very cost effectively.
-
-
-Key Features
-------------
-
-- **Cross-platform**  
-  ejabberd runs under Microsoft Windows and Unix-derived systems such as
-  Linux, FreeBSD and NetBSD.
-
-- **Distributed**  
-  You can run ejabberd on a cluster of machines and all of them will serve the
-  same XMPP domain(s). When you need more capacity you can simply add a new
-  cheap node to your cluster. Accordingly, you do not need to buy an expensive
-  high-end machine to support tens of thousands concurrent users.
-
-- **Fault-tolerant**  
-  You can deploy an ejabberd cluster so that all the information required for
-  a properly working service will be replicated permanently on all nodes. This
-  means that if one of the nodes crashes, the others will continue working
-  without disruption. In addition, nodes also can be added or replaced ‘on
-  the fly’.
-
-- **Administrator-friendly**  
-  ejabberd is built on top of the Open Source Erlang. As a result you do not
-  need to install an external database, an external web server, amongst others
-  because everything is already included, and ready to run out of the box.
-  Other administrator benefits include:
-  - Comprehensive documentation.
-  - Straightforward installers for Linux and Mac OS X.
-  - Web administration.
-  - Shared roster groups.
-  - Command line administration tool.
-  - Can integrate with existing authentication mechanisms.
-  - Capability to send announce messages.
-
-- **Internationalized**  
-  ejabberd leads in internationalization. Hence it is very well suited in a
-  globalized world. Related features are:
-  - Translated to 25 languages.
-  - Support for IDNA.
-
-- **Open Standards**  
-  ejabberd is the first Open Source Jabber server claiming to fully comply to
-  the XMPP standard.
-  - Fully XMPP-compliant.
-  - XML-based protocol.
-  - Many protocols supported.
-
-
-Additional Features
--------------------
-
-Moreover, ejabberd comes with a wide range of other state-of-the-art features:
-
-- **Modularity**
-  - Load only the modules you want.
-  - Extend ejabberd with your own custom modules.
-
-- **Security**
-  - SASL and STARTTLS for c2s and s2s connections.
-  - STARTTLS and Dialback s2s connections.
-  - Web Admin accessible via HTTPS secure access.
-
-- **Databases**
-  - Internal database for fast deployment (Mnesia).
-  - Native MySQL support.
-  - Native PostgreSQL support.
-  - ODBC data storage support.
-  - Microsoft SQL Server support.
-
-- **Authentication**
-  - Internal authentication.
-  - PAM, LDAP and ODBC.
-  - External authentication script.
-
-- **Others**
-  - Support for virtual hosting.
-  - Compressing XML streams with Stream Compression (XEP-0138).
-  - Statistics via Statistics Gathering (XEP-0039).
-  - IPv6 support both for c2s and s2s connections.
-  - Multi-User Chat module with support for clustering and HTML logging.
-  - Users Directory based on users vCards.
-  - Publish-Subscribe component with support for Personal Eventing.
-  - Support for web clients: HTTP Polling and HTTP Binding (BOSH).
-  - Component support: interface with networks such as AIM, ICQ and MSN.
-
-
-Quickstart guide
-----------------
-
-### 0. Requirements
-
-To compile ejabberd you need:
-
- - GNU Make.
- - GCC.
- - Libexpat 1.95 or higher.
- - Libyaml 0.1.4 or higher.
- - Erlang/OTP 17.5 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).
- - ImageMagick's Convert program. Optional. For CAPTCHA challenges.
-
-If your system splits packages in libraries and development headers, you must
-install the development packages also.
-
-### 1. Compile and install on *nix systems
-
-To compile ejabberd, execute the following commands.  The first one is only
-necessary if your source tree didn't come with a `configure` script (In this
-case you need autoconf installed).
-
-    ./autogen.sh
-    ./configure
-    make
-
-To install ejabberd, run this command with system administrator rights (root
-user):
-
-    sudo make install
-
-These commands will:
-
-- Install the configuration files in `/etc/ejabberd/`
-- Install ejabberd binary, header and runtime files in `/lib/ejabberd/`
-- Install the administration script: `/sbin/ejabberdctl`
-- Install ejabberd documentation in `/share/doc/ejabberd/`
-- Create a spool directory: `/var/lib/ejabberd/`
-- Create a directory for log files: `/var/log/ejabberd/`
-
-
-### 2. Start ejabberd
-
-You can use the `ejabberdctl` command line administration script to
-start and stop ejabberd. For example:
-
-    ejabberdctl start
-
-
-For detailed information please refer to the ejabberd Installation and
-Operation Guide available online and in the `doc` directory of the source
-tarball.
-
-
-Development
------------
-
-In order to assist in the development of ejabberd, and particularly the
-execution of the test suite, a Vagrant environment is available at
-https://github.com/processone/ejabberd-vagrant-dev.
-
-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
------
-
-- Documentation: http://docs.ejabberd.im
-- Community site: https://www.ejabberd.im
-- ejabberd commercial offering and support: https://www.process-one.net/en/ejabberd

README.md

@@ -1 +0,0 @@
-README

README.md

@@ -0,0 +1,192 @@
+ejabberd Community Edition
+==========================
+
+[![Build Status](https://travis-ci.org/processone/ejabberd.svg?branch=master "Common Tests in Travis")](https://travis-ci.org/processone/ejabberd)
+[![Dialyzer](https://github.com/processone/ejabberd/actions/workflows/tests.yml/badge.svg "Dialyzer tests in Github Actions")](https://github.com/processone/ejabberd/actions/workflows/tests.yml)
+[![Coverage Status](https://coveralls.io/repos/github/processone/ejabberd/badge.svg?branch=master "Coverage in coveralls.io")](https://coveralls.io/github/processone/ejabberd?branch=master)
+[![Translation status](https://hosted.weblate.org/widgets/ejabberd/-/ejabberd-po/svg-badge.svg "Translation status in Weblate")](https://hosted.weblate.org/projects/ejabberd/ejabberd-po/)
+[![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
+thousands of simultaneous users on a single node and has been designed to
+provide exceptional standards of fault tolerance. As an open source
+technology, based on industry-standards, ejabberd can be used to build bespoke
+solutions very cost effectively.
+
+
+Key Features
+------------
+
+- **Cross-platform**  
+  ejabberd runs under Microsoft Windows and Unix-derived systems such as
+  Linux, FreeBSD and NetBSD.
+
+- **Distributed**  
+  You can run ejabberd on a cluster of machines and all of them will serve the
+  same XMPP domain(s). When you need more capacity you can simply add a new
+  cheap node to your cluster. Accordingly, you do not need to buy an expensive
+  high-end machine to support tens of thousands concurrent users.
+
+- **Fault-tolerant**  
+  You can deploy an ejabberd cluster so that all the information required for
+  a properly working service will be replicated permanently on all nodes. This
+  means that if one of the nodes crashes, the others will continue working
+  without disruption. In addition, nodes also can be added or replaced ‘on
+  the fly’.
+
+- **Administrator-friendly**  
+  ejabberd is built on top of the Open Source Erlang. As a result you do not
+  need to install an external database, an external web server, amongst others
+  because everything is already included, and ready to run out of the box.
+  Other administrator benefits include:
+  - Comprehensive documentation.
+  - Straightforward installers for Linux.
+  - Docker packaging to help with deploy / development on Linux, Windows or MacOS.
+  - Deb and RPM packaging to support most Linux distributions.
+  - Web administration.
+  - Shared roster groups.
+  - Command line administration tool.
+  - Can integrate with existing authentication mechanisms.
+  - Capability to send announce messages.
+
+- **Internationalized**  
+  ejabberd leads in internationalization. Hence it is very well suited in a
+  globalized world. Related features are:
+  - Translated to 25 languages.
+  - Support for IDNA.
+
+- **Open Standards**  
+  ejabberd is the first Open Source XMPP server claiming to fully comply to
+  the XMPP standard.
+  - Fully XMPP-compliant.
+  - XML-based protocol.
+  - Many protocols supported.
+
+
+Additional Features
+-------------------
+
+Moreover, ejabberd comes with a wide range of other state-of-the-art features:
+
+- **Modularity**
+  - Load only the modules you want.
+  - Extend ejabberd with your own custom modules.
+
+- **Security**
+  - SASL and STARTTLS for c2s and s2s connections.
+  - STARTTLS and Dialback s2s connections.
+  - Web Admin accessible via HTTPS secure access.
+
+- **Databases**
+  - Internal database for fast deployment (Mnesia).
+  - Native MySQL support.
+  - Native PostgreSQL support.
+  - ODBC data storage support.
+  - Microsoft SQL Server support.
+
+- **Authentication**
+  - Internal authentication.
+  - PAM, LDAP and ODBC.
+  - External authentication script.
+
+- **Others**
+  - Support for virtual hosting.
+  - Compressing XML streams with Stream Compression (XEP-0138).
+  - Statistics via Statistics Gathering (XEP-0039).
+  - IPv6 support both for c2s and s2s connections.
+  - Multi-User Chat module with support for clustering and HTML logging.
+  - Users Directory based on users vCards.
+  - Publish-Subscribe component with support for Personal Eventing.
+  - Support for web clients: HTTP Polling and HTTP Binding (BOSH).
+  - Component support: interface with networks such as AIM, ICQ and MSN.
+
+
+Quickstart guide
+----------------
+
+### 0. Requirements
+
+To compile ejabberd you need:
+
+ - GNU Make.
+ - GCC.
+ - Libexpat ≥ 1.95.
+ - Libyaml ≥ 0.1.4.
+ - Erlang/OTP ≥ 19.3.
+ - OpenSSL ≥ 1.0.0.
+ - Zlib ≥ 1.2.3, for Stream Compression support (XEP-0138). Optional.
+ - PAM library. Optional. For Pluggable Authentication Modules (PAM).
+ - ImageMagick's Convert program and Ghostscript fonts. Optional. For CAPTCHA
+   challenges.
+
+If your system splits packages in libraries and development headers, you must
+install the development packages also.
+
+### 1. Compile and install on *nix systems
+
+To compile ejabberd, execute the following commands.  The first one is only
+necessary if your source tree didn't come with a `configure` script (In this
+case you need autoconf installed).
+
+    ./autogen.sh
+    ./configure
+    make
+
+To install ejabberd, run this command with system administrator rights (root
+user):
+
+    sudo make install
+
+These commands will:
+
+- Install the configuration files in `/etc/ejabberd/`
+- Install ejabberd binary, header and runtime files in `/lib/ejabberd/`
+- Install the administration script: `/sbin/ejabberdctl`
+- Install ejabberd documentation in `/share/doc/ejabberd/`
+- Create a spool directory: `/var/lib/ejabberd/`
+- Create a directory for log files: `/var/log/ejabberd/`
+
+
+### 2. Start ejabberd
+
+You can use the `ejabberdctl` command line administration script to
+start and stop ejabberd. For example:
+
+    ejabberdctl start
+
+
+For detailed information please refer to the ejabberd Installation and
+Operation Guide available online and in the `doc` directory of the source
+tarball.
+
+
+Development
+-----------
+
+In order to assist in the development of ejabberd, and particularly the
+execution of the test suite, a Vagrant environment is available at
+https://github.com/processone/ejabberd-vagrant-dev.
+
+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
+
+
+Translation
+-----------
+
+Using any gettext editor, you can improve the translation files found in
+`priv/msgs/*.po`, and then submit your changes.
+
+Alternatively, a simple way to improve translations is using our Weblate project:
+https://hosted.weblate.org/projects/ejabberd/ejabberd-po/
+
+
+Links
+-----
+
+- Documentation: https://docs.ejabberd.im
+- Community site: https://www.ejabberd.im
+- ejabberd commercial offering and support: https://www.process-one.net/en/ejabberd

_checkouts/configure_deps/rebar.config

@@ -0,0 +1,2 @@
+{erl_opts, [debug_info]}.
+{deps, []}.

_checkouts/configure_deps/src/configure_deps.app.src

@@ -0,0 +1,9 @@
+{application, configure_deps,
+ [{description, "A rebar3 plugin to explicitly run configure on dependencies"},
+  {vsn, "0.0.1"},
+  {registered, []},
+  {applications, [kernel, stdlib]},
+  {env,[]},
+  {modules, []},
+  {links, []}
+ ]}.

_checkouts/configure_deps/src/configure_deps.erl

@@ -0,0 +1,8 @@
+-module(configure_deps).
+
+-export([init/1]).
+
+-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
+init(State) ->
+    {ok, State1} = configure_deps_prv:init(State),
+    {ok, State1}.

_checkouts/configure_deps/src/configure_deps_prv.erl

@@ -0,0 +1,54 @@
+-module(configure_deps_prv).
+
+-export([init/1, do/1, format_error/1]).
+
+-define(PROVIDER, 'configure-deps').
+-define(DEPS, [install_deps]).
+
+%% ===================================================================
+%% Public API
+%% ===================================================================
+-spec init(rebar_state:t()) -> {ok, rebar_state:t()}.
+init(State) ->
+    Provider = providers:create([
+	        {namespace, default},
+            {name, ?PROVIDER},            % The 'user friendly' name of the task
+            {module, ?MODULE},            % The module implementation of the task
+            {bare, true},                 % The task can be run by the user, always true
+            {deps, ?DEPS},                % The list of dependencies
+            {example, "rebar3 configure-deps"}, % How to use the plugin
+            {opts, []},                   % list of options understood by the plugin
+            {short_desc, "Explicitly run ./configure for dependencies"},
+            {desc, "A rebar plugin to allow explicitly running ./configure on depdendencies. Useful if dependencies might change prior to compilation when configure is run."}
+    ]),
+    {ok, rebar_state:add_provider(State, Provider)}.
+
+
+-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
+do(State) ->
+    Apps = rebar_state:project_apps(State) ++ lists:usort(rebar_state:all_deps(State)),
+    lists:foreach(fun do_app/1, Apps),
+    {ok, State}.
+
+exec_configure({'configure-deps', Cmd}, Dir) ->
+	rebar_utils:sh(Cmd, [{cd, Dir}, {use_stdout, true}]);
+exec_configure(_, Acc) -> Acc.
+
+parse_pre_hooks({pre_hooks, PreHooks}, Acc) ->
+    lists:foldl(fun exec_configure/2, Acc, PreHooks);
+parse_pre_hooks(_, Acc) -> Acc.
+
+parse_additions({add, App, Additions}, {MyApp, Dir}) when App == MyApp ->
+    lists:foldl(fun parse_pre_hooks/2, Dir, Additions),
+	{MyApp, Dir};
+parse_additions(_, Acc) -> Acc.
+
+do_app(App) ->
+    Dir = rebar_app_info:dir(App),
+	Opts = rebar_app_info:opts(App),
+	Overrides = rebar_opts:get(Opts, overrides),
+    lists:foldl(fun parse_additions/2, {binary_to_atom(rebar_app_info:name(App), utf8), Dir}, Overrides).
+
+-spec format_error(any()) ->  iolist().
+format_error(Reason) ->
+    io_lib:format("~p", [Reason]).

asn1/XmppAddr.asn1

@@ -1,14 +0,0 @@
-XmppAddr { iso(1) identified-organization(3)	
-           dod(6) internet(1) security(5) mechanisms(5) pkix(7)
-	   id-on(8) id-on-xmppAddr(5) }
-
-DEFINITIONS EXPLICIT TAGS ::=
-BEGIN
-
-id-on-xmppAddr  OBJECT IDENTIFIER ::= { iso(1) identified-organization(3)
-                dod(6) internet(1) security(5) mechanisms(5) pkix(7)
-                id-on(8) 5 }
-
-XmppAddr ::= UTF8String
-
-END

config/ejabberd.exs

@@ -4,17 +4,15 @@ defmodule Ejabberd.ConfigFile do
   def start do
     [loglevel: 4,
      log_rotate_size: 10485760,
-     log_rotate_date: "",
      log_rotate_count: 1,
-     log_rate_limit: 100,
      auth_method: :internal,
      max_fsm_queue: 1000,
      language: "en",
      allow_contrib_modules: true,
      hosts: ["localhost"],
-     shaper: shaper,
-     acl: acl,
-     access: access]
+     shaper: shaper(),
+     acl: acl(),
+     access: access()]
   end
 
   defp shaper do
@@ -61,7 +59,6 @@ defmodule Ejabberd.ConfigFile do
     @opts [
       port: 5280,
       web_admin: true,
-      http_poll: true,
       http_bind: true,
       captcha: true]
   end
@@ -132,9 +129,10 @@ defmodule Ejabberd.ConfigFile do
   module :mod_register do
     @opts [welcome_message: [
       subject: "Welcome!",
-      body: "Hi.\nWelcome to this XMPP Server",
+      body: "Hi.\nWelcome to this XMPP server"
+      ],
       ip_access: :trusted_network,
-      access: :register]]
+      access: :register] 
   end
 
   module :mod_roster do

config/ejabberd.yml

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

configure.ac

@@ -3,7 +3,7 @@
 
 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="6.4 (Erlang/OTP 17.5)"
+REQUIRE_ERLANG_MIN="8.3 (Erlang/OTP 19.3)"
 REQUIRE_ERLANG_MAX="100.0.0 (No Max)"
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -28,6 +28,16 @@ else
 fi
 ])
 
+AC_ARG_WITH(rebar,
+	AC_HELP_STRING([--with-rebar=bin],
+		[use rebar specified]),
+[if test "$withval" = "yes" -o "$withval" = "no" -o "X$with_rebar" = "X"; then
+    rebar="rebar"
+else
+    rebar="$with_rebar"
+fi
+], [rebar="rebar"])
+
 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])
@@ -35,18 +45,6 @@ AC_PATH_TOOL(EPMD, epmd, , [${extra_erl_path}$PATH])
 AC_ERLANG_NEED_ERL
 AC_ERLANG_NEED_ERLC
 
-AC_ARG_ENABLE(erlang-version-check,
-[AC_HELP_STRING([--enable-erlang-version-check],
-	[Check Erlang/OTP version @<:@default=yes@:>@])])
-case "$enable_erlang_version_check" in
-	yes|'')
-		ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX])
-		;;
-	no)
-		ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX],[warn])
-		;;
-esac
-
 # Checks and sets ERLANG_ROOT_DIR and ERLANG_LIB_DIR variable
 AC_ERLANG_SUBST_ROOT_DIR
 # AC_ERLANG_SUBST_LIB_DIR
@@ -68,142 +66,17 @@ fi
 # Change default prefix
 AC_PREFIX_DEFAULT(/usr/local)
 
-AC_ARG_ENABLE(hipe,
-[AC_HELP_STRING([--enable-hipe], [compile natively with HiPE, not recommended (default: no)])],
-[case "${enableval}" in
-  yes) hipe=true ;;
-  no)  hipe=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-hipe) ;;
-esac],[hipe=false])
-
-AC_ARG_ENABLE(roster_gateway_workaround,
-[AC_HELP_STRING([--enable-roster-gateway-workaround], [turn on workaround for processing gateway subscriptions (default: no)])],
-[case "${enableval}" in
-  yes) roster_gateway_workaround=true ;;
-  no)  roster_gateway_workaround=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-roster-gateway-workaround) ;;
-esac],[roster_gateway_workaround=false])
-
-AC_ARG_ENABLE(new_sql_schema,
-[AC_HELP_STRING([--enable-new-sql-schema], [use new SQL schema (default: no)])],
-[case "${enableval}" in
-  yes) new_sql_schema=true ;;
-  no)  new_sql_schema=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-new-sql-schema) ;;
-esac],[new_sql_schema=false])
-
-AC_ARG_ENABLE(full_xml,
-[AC_HELP_STRING([--enable-full-xml], [use XML features in XMPP stream (ex: CDATA) (default: no, requires XML compliant clients)])],
-[case "${enableval}" in
-  yes) full_xml=true ;;
-  no)  full_xml=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-full-xml) ;;
-esac],[full_xml=false])
-
-AC_ARG_ENABLE(mssql,
-[AC_HELP_STRING([--enable-mssql], [use Microsoft SQL Server database (default: no, requires --enable-odbc)])],
-[case "${enableval}" in
-  yes) db_type=mssql ;;
-  no)  db_type=generic ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-mssql) ;;
-esac],[db_type=generic])
+AC_CONFIG_FILES([Makefile
+		 vars.config])
 
 AC_ARG_ENABLE(all,
-[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-stun --enable-sip --enable-debug --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-redis --enable-elixir --enable-stun --enable-sip --enable-debug --enable-lua --enable-tools (useful for Dialyzer checks, default: no)])],
 [case "${enableval}" in
-  yes) odbc=true mysql=true pgsql=true sqlite=true pam=true zlib=true riak=true redis=true elixir=true iconv=true stun=true sip=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 stun=false sip=false debug=false tools=false ;;
+  yes) odbc=true mysql=true pgsql=true sqlite=true pam=true zlib=true redis=true elixir=true stun=true sip=true debug=true lua=true tools=true ;;
+  no) odbc=false mysql=false pgsql=false sqlite=false pam=false zlib=false redis=false elixir=false stun=false sip=false debug=false lua=false tools=false ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
 esac],[])
 
-AC_ARG_ENABLE(tools,
-[AC_HELP_STRING([--enable-tools], [build development tools (default: no)])],
-[case "${enableval}" in
-  yes) tools=true ;;
-  no)  tools=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-tools) ;;
-esac],[if test "x$tools" = "x"; then tools=false; fi])
-
-AC_ARG_ENABLE(odbc,
-[AC_HELP_STRING([--enable-odbc], [enable pure ODBC support (default: no)])],
-[case "${enableval}" in
-  yes) odbc=true ;;
-  no)  odbc=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-odbc) ;;
-esac],[if test "x$odbc" = "x"; then odbc=false; fi])
-
-AC_ARG_ENABLE(mysql,
-[AC_HELP_STRING([--enable-mysql], [enable MySQL support (default: no)])],
-[case "${enableval}" in
-  yes) mysql=true ;;
-  no)  mysql=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-mysql) ;;
-esac],[if test "x$mysql" = "x"; then mysql=false; fi])
-
-AC_ARG_ENABLE(pgsql,
-[AC_HELP_STRING([--enable-pgsql], [enable PostgreSQL support (default: no)])],
-[case "${enableval}" in
-  yes) pgsql=true ;;
-  no)  pgsql=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-pgsql) ;;
-esac],[if test "x$pgsql" = "x"; then pgsql=false; fi])
-
-AC_ARG_ENABLE(sqlite,
-[AC_HELP_STRING([--enable-sqlite], [enable SQLite support (default: no)])],
-[case "${enableval}" in
-  yes) sqlite=true ;;
-  no)  sqlite=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-sqlite) ;;
-esac],[if test "x$sqlite" = "x"; then sqlite=false; fi])
-
-AC_ARG_ENABLE(pam,
-[AC_HELP_STRING([--enable-pam], [enable PAM support (default: no)])],
-[case "${enableval}" in
-  yes) pam=true ;;
-  no)  pam=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-pam) ;;
-esac],[if test "x$pam" = "x"; then pam=false; fi])
-
-AC_ARG_ENABLE(zlib,
-[AC_HELP_STRING([--enable-zlib], [enable Stream Compression (XEP-0138) using zlib (default: yes)])],
-[case "${enableval}" in
-  yes) zlib=true ;;
-  no)  zlib=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-zlib) ;;
-esac],[if test "x$zlib" = "x"; then zlib=true; fi])
-
-AC_ARG_ENABLE(riak,
-[AC_HELP_STRING([--enable-riak], [enable Riak support (default: no)])],
-[case "${enableval}" in
-  yes) riak=true ;;
-  no)  riak=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-riak) ;;
-esac],[if test "x$riak" = "x"; then riak=false; fi])
-
-AC_ARG_ENABLE(redis,
-[AC_HELP_STRING([--enable-redis], [enable Redis support (default: no)])],
-[case "${enableval}" in
-  yes) redis=true ;;
-  no)  redis=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-redis) ;;
-esac],[if test "x$redis" = "x"; then redis=false; fi])
-
-AC_ARG_ENABLE(elixir,
-[AC_HELP_STRING([--enable-elixir], [enable Elixir support (default: no)])],
-[case "${enableval}" in
-  yes) elixir=true ;;
-  no)  elixir=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-elixir) ;;
-esac],[if test "x$elixir" = "x"; then elixir=false; fi])
-
-AC_ARG_ENABLE(iconv,
-[AC_HELP_STRING([--enable-iconv], [enable iconv support (default: no)])],
-[case "${enableval}" in
-  yes) iconv=true ;;
-  no)  iconv=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-iconv) ;;
-esac],[if test "x$iconv" = "x"; then iconv=false; fi])
-
 AC_ARG_ENABLE(debug,
 [AC_HELP_STRING([--enable-debug], [enable debug information (default: yes)])],
 [case "${enableval}" in
@@ -212,55 +85,34 @@ 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(latest_deps,
-[AC_HELP_STRING([--enable-latest-deps], [makes rebar use latest commits for dependences instead of tagged versions (default: no)])],
+AC_ARG_ENABLE(elixir,
+[AC_HELP_STRING([--enable-elixir], [enable Elixir support (default: no)])],
 [case "${enableval}" in
-  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])
+  yes) elixir=true ;;
+  no)  elixir=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-elixir) ;;
+esac],[if test "x$elixir" = "x"; then elixir=false; fi])
 
-AC_ARG_ENABLE(system_deps,
-[AC_HELP_STRING([--enable-system-deps], [makes rebar use localy installed dependences instead of downloading them (default: no)])],
+AC_ARG_ENABLE(erlang-version-check,
+[AC_HELP_STRING([--enable-erlang-version-check],
+	[Check Erlang/OTP version (default: yes)])])
+case "$enable_erlang_version_check" in
+	yes|'')
+		ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX])
+		;;
+	no)
+		ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX],[warn])
+		;;
+esac
+
+AC_ARG_ENABLE(full_xml,
+[AC_HELP_STRING([--enable-full-xml], [use XML features in XMPP stream (ex: CDATA) (default: no, requires XML compliant clients)])],
 [case "${enableval}" in
-  yes) system_deps=true ;;
-  no)  system_deps=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-deps) ;;
-esac],[if test "x$system_deps" = "x"; then system_deps=false; fi])
+  yes) full_xml=true ;;
+  no)  full_xml=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-full-xml) ;;
+esac],[full_xml=false])
 
-AC_ARG_ENABLE(stun,
-[AC_HELP_STRING([--enable-stun], [enable STUN/TURN support (default: no)])],
-[case "${enableval}" in
-  yes) stun=true ;;
-  no)  stun=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-stun) ;;
-esac],[if test "x$stun" = "x"; then stun=false; fi])
-
-AC_ARG_ENABLE(sip,
-[AC_HELP_STRING([--enable-sip], [enable SIP support (default: no)])],
-[case "${enableval}" in
-  yes) sip=true ;;
-  no)  sip=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-sip) ;;
-esac],[if test "x$sip" = "x"; then sip=false; fi])
-
-AC_CONFIG_FILES([Makefile
-		 vars.config
-		 src/ejabberd.app.src])
-
-ENABLEUSER=""
-AC_ARG_ENABLE(user,
-  [AS_HELP_STRING([--enable-user[[[[=USER]]]]], [allow this system user to start ejabberd (default: no)])],
-  [case "${enableval}" in
-     yes) ENABLEUSER=`whoami` ;;
-     no) ENABLEUSER="" ;;
-     *) ENABLEUSER=$enableval
-   esac],
-  [])
-if test "$ENABLEUSER" != ""; then
-  echo "allow this system user to start ejabberd: $ENABLEUSER"
-  AC_SUBST([INSTALLUSER], [$ENABLEUSER])
-fi
 ENABLEGROUP=""
 AC_ARG_ENABLE(group,
   [AS_HELP_STRING([--enable-group[[[[=GROUP]]]]], [allow this system group to start ejabberd (default: no)])],
@@ -275,25 +127,162 @@ if test "$ENABLEGROUP" != ""; then
   AC_SUBST([INSTALLGROUP], [$ENABLEGROUP])
 fi
 
-if test "$sqlite" = "true"; then
-   AX_LIB_SQLITE3([3.6.19])
-   if test "x$SQLITE3_VERSION" = "x"; then
-      AC_MSG_ERROR(SQLite3 library >= 3.6.19 was not found)
-   fi
+AC_ARG_ENABLE(latest_deps,
+[AC_HELP_STRING([--enable-latest-deps], [makes rebar use latest commits for dependencies instead of tagged versions (default: no)])],
+[case "${enableval}" in
+  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_ARG_ENABLE(lua,
+[AC_HELP_STRING([--enable-lua], [enable Lua support, to import from Prosody (default: no)])],
+[case "${enableval}" in
+  yes) lua=true ;;
+  no)  lua=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-lua) ;;
+esac],[if test "x$lua" = "x"; then lua=false; fi])
+
+AC_ARG_ENABLE(mssql,
+[AC_HELP_STRING([--enable-mssql], [use Microsoft SQL Server database (default: no, requires --enable-odbc)])],
+[case "${enableval}" in
+  yes) db_type=mssql; mssql=true ;;
+  no)  db_type=generic; mssql=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-mssql) ;;
+esac],[db_type=generic])
+
+AC_ARG_ENABLE(mysql,
+[AC_HELP_STRING([--enable-mysql], [enable MySQL support (default: no)])],
+[case "${enableval}" in
+  yes) mysql=true ;;
+  no)  mysql=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-mysql) ;;
+esac],[if test "x$mysql" = "x"; then mysql=false; fi])
+
+AC_ARG_ENABLE(new_sql_schema,
+[AC_HELP_STRING([--enable-new-sql-schema], [use new SQL schema (default: no)])],
+[case "${enableval}" in
+  yes) new_sql_schema=true ;;
+  no)  new_sql_schema=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-new-sql-schema) ;;
+esac],[new_sql_schema=false])
+
+AC_ARG_ENABLE(odbc,
+[AC_HELP_STRING([--enable-odbc], [enable pure ODBC support (default: no)])],
+[case "${enableval}" in
+  yes) odbc=true ;;
+  no)  odbc=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-odbc) ;;
+esac],[if test "x$odbc" = "x"; then odbc=false; fi])
+
+AC_ARG_ENABLE(pam,
+[AC_HELP_STRING([--enable-pam], [enable PAM support (default: no)])],
+[case "${enableval}" in
+  yes) pam=true ;;
+  no)  pam=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-pam) ;;
+esac],[if test "x$pam" = "x"; then pam=false; fi])
+
+AC_ARG_ENABLE(pgsql,
+[AC_HELP_STRING([--enable-pgsql], [enable PostgreSQL support (default: no)])],
+[case "${enableval}" in
+  yes) pgsql=true ;;
+  no)  pgsql=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-pgsql) ;;
+esac],[if test "x$pgsql" = "x"; then pgsql=false; fi])
+
+AC_ARG_ENABLE(redis,
+[AC_HELP_STRING([--enable-redis], [enable Redis support (default: no)])],
+[case "${enableval}" in
+  yes) redis=true ;;
+  no)  redis=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-redis) ;;
+esac],[if test "x$redis" = "x"; then redis=false; fi])
+
+AC_ARG_ENABLE(roster_gateway_workaround,
+[AC_HELP_STRING([--enable-roster-gateway-workaround], [turn on workaround for processing gateway subscriptions (default: no)])],
+[case "${enableval}" in
+  yes) roster_gateway_workaround=true ;;
+  no)  roster_gateway_workaround=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-roster-gateway-workaround) ;;
+esac],[roster_gateway_workaround=false])
+
+AC_ARG_ENABLE(sip,
+[AC_HELP_STRING([--enable-sip], [enable SIP support (default: no)])],
+[case "${enableval}" in
+  yes) sip=true ;;
+  no)  sip=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-sip) ;;
+esac],[if test "x$sip" = "x"; then sip=false; fi])
+
+AC_ARG_ENABLE(sqlite,
+[AC_HELP_STRING([--enable-sqlite], [enable SQLite support (default: no)])],
+[case "${enableval}" in
+  yes) sqlite=true ;;
+  no)  sqlite=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-sqlite) ;;
+esac],[if test "x$sqlite" = "x"; then sqlite=false; fi])
+
+AC_ARG_ENABLE(stun,
+[AC_HELP_STRING([--enable-stun], [enable STUN/TURN support (default: yes)])],
+[case "${enableval}" in
+  yes) stun=true ;;
+  no)  stun=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-stun) ;;
+esac],[if test "x$stun" = "x"; then stun=true; fi])
+
+AC_ARG_ENABLE(system_deps,
+[AC_HELP_STRING([--enable-system-deps], [makes rebar use locally installed dependencies instead of downloading them (default: no)])],
+[case "${enableval}" in
+  yes) system_deps=true ;;
+  no)  system_deps=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-deps) ;;
+esac],[if test "x$system_deps" = "x"; then system_deps=false; fi])
+
+AC_ARG_ENABLE(tools,
+[AC_HELP_STRING([--enable-tools], [build development tools (default: no)])],
+[case "${enableval}" in
+  yes) tools=true ;;
+  no)  tools=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-tools) ;;
+esac],[if test "x$tools" = "x"; then tools=false; fi])
+
+ENABLEUSER=""
+AC_ARG_ENABLE(user,
+  [AS_HELP_STRING([--enable-user[[[[=USER]]]]], [allow this system user to start ejabberd (default: no)])],
+  [case "${enableval}" in
+     yes) ENABLEUSER=`whoami` ;;
+     no) ENABLEUSER="" ;;
+     *) ENABLEUSER=$enableval
+   esac],
+  [])
+if test "$ENABLEUSER" != ""; then
+  echo "allow this system user to start ejabberd: $ENABLEUSER"
+  AC_SUBST([INSTALLUSER], [$ENABLEUSER])
 fi
 
-enabled_backends=""
-for backend in odbc mysql pgsql sqlite riak redis; do
-    if eval test x\${$backend} = xtrue; then
-       if test "x$enabled_backends" = "x"; then
-          enabled_backends=$backend
-       else
-          enabled_backends="$enabled_backends, $backend"
-       fi
-    fi
-done
+AC_ARG_ENABLE(zlib,
+[AC_HELP_STRING([--enable-zlib], [enable Stream Compression (XEP-0138) using zlib (default: yes)])],
+[case "${enableval}" in
+  yes) zlib=true ;;
+  no)  zlib=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-zlib) ;;
+esac],[if test "x$zlib" = "x"; then zlib=true; fi])
+
+case "`uname`" in
+  "Darwin")
+    # Darwin (macos) erlang-sqlite is built using amalgamated lib, so no external dependency
+    ;;
+  *)
+    if test "$sqlite" = "true"; then
+      AX_LIB_SQLITE3([3.6.19])
+      if test "x$SQLITE3_VERSION" = "x"; then
+        AC_MSG_ERROR(SQLite3 library >= 3.6.19 was not found)
+      fi
+    fi
+  ;;
+esac
 
-AC_SUBST(hipe)
 AC_SUBST(roster_gateway_workaround)
 AC_SUBST(new_sql_schema)
 AC_SUBST(full_xml)
@@ -304,19 +293,18 @@ AC_SUBST(pgsql)
 AC_SUBST(sqlite)
 AC_SUBST(pam)
 AC_SUBST(zlib)
-AC_SUBST(riak)
+AC_SUBST(rebar)
 AC_SUBST(redis)
 AC_SUBST(elixir)
-AC_SUBST(iconv)
 AC_SUBST(stun)
 AC_SUBST(sip)
 AC_SUBST(debug)
+AC_SUBST(lua)
 AC_SUBST(tools)
 AC_SUBST(latest_deps)
 AC_SUBST(system_deps)
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
-AC_SUBST(enabled_backends)
 
 AC_OUTPUT

ejabberd.init.template

@@ -6,8 +6,8 @@
 # Required-Stop:     $remote_fs $network $named $time
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: Starts ejabberd jabber server
-# Description:       Starts ejabberd jabber server, an XMPP
+# Short-Description: Starts ejabberd XMPP server
+# Description:       Starts ejabberd XMPP server, an XMPP
 #                    compliant server written in Erlang.
 ### END INIT INFO
 

ejabberd.service.template

@@ -3,16 +3,19 @@ Description=XMPP Server
 After=network.target
 
 [Service]
-Type=forking
+Type=notify
 User=ejabberd
 Group=ejabberd
 LimitNOFILE=65536
 Restart=on-failure
 RestartSec=5
-ExecStart=/bin/sh -c '@ctlscriptpath@/ejabberdctl start && @ctlscriptpath@/ejabberdctl started'
+WatchdogSec=30
+ExecStart=@ctlscriptpath@/ejabberdctl foreground
 ExecStop=/bin/sh -c '@ctlscriptpath@/ejabberdctl stop && @ctlscriptpath@/ejabberdctl stopped'
 ExecReload=@ctlscriptpath@/ejabberdctl reload_config
+NotifyAccess=all
 PrivateDevices=true
+AmbientCapabilities=CAP_NET_BIND_SERVICE
 TimeoutSec=300
 
 [Install]

ejabberdctl.cfg.example

@@ -30,7 +30,7 @@
 #' ERL_MAX_PORTS: Maximum number of simultaneously open Erlang ports
 #
 # ejabberd consumes two or three ports for every connection, either
-# from a client or from another Jabber server. So take this into
+# from a client or from another XMPP server. So take this into
 # account when setting this limit.
 #
 # Default: 65536 (or 8196 on Windows)
@@ -41,7 +41,7 @@
 #.
 #' FIREWALL_WINDOW: Range of allowed ports to pass through a firewall
 #
-# If Ejabberd is configured to run in cluster, and a firewall is blocking ports,
+# If ejabberd is configured to run in cluster, and a firewall is blocking ports,
 # it's possible to make Erlang use a defined range of port (instead of dynamic
 # ports) for node communication.
 #
@@ -63,8 +63,6 @@
 #.
 #' ERL_EPMD_ADDRESS: IP addresses where epmd listens for connections
 #
-# IMPORTANT: This option works only in Erlang/OTP R14B03 and newer.
-#
 # This environment variable may be set to a comma-separated
 # list of IP addresses, in which case the epmd daemon
 # will listen only on the specified address(es) and on the

ejabberdctl.template

@@ -60,6 +60,8 @@ done
 : "${SPOOL_DIR:="{{localstatedir}}/lib/ejabberd"}"
 : "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}"
 : "${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR/ejabberdctl.cfg"}"
+# Allows passing extra Erlang command-line arguments in vm.args file
+: "${VMARGS:="$ETC_DIR/vm.args"}"
 [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
 [ -n "$ERLANG_NODE_ARG" ] && ERLANG_NODE="$ERLANG_NODE_ARG"
 [ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && S="-s"
@@ -77,16 +79,16 @@ if [ -n "$INET_DIST_INTERFACE" ] ; then
         ERLANG_OPTS="$ERLANG_OPTS -kernel inet_dist_use_interface $INET_DIST_INTERFACE2"
     fi
 fi
+# if vm.args file exists in config directory, pass it to Erlang VM
+[ -f "$VMARGS" ] && ERLANG_OPTS="$ERLANG_OPTS -args_file $VMARGS"
 ERL_LIBS={{libdir}}
 ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump
 ERL_INETRC="$ETC_DIR"/inetrc
 
 # define ejabberd parameters
 EJABBERD_OPTS="$EJABBERD_OPTS\
-$(sed '/^log_rate_limit/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\
-$(sed '/^log_rotate_size/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\
-$(sed '/^log_rotate_count/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\
-$(sed '/^log_rotate_date/!d;s/:[ \t]*\(.[^ ]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")"
+$(sed '/^log_rotate_size/!d;s/:[ \t]*\([0-9]\{1,\}\).*/ \1/;s/:[ \t]*\(infinity\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$(sed '/^log_rotate_count/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")"
 [ -n "$EJABBERD_OPTS" ] && EJABBERD_OPTS="-ejabberd $EJABBERD_OPTS"
 EJABBERD_OPTS="-mnesia dir \"$SPOOL_DIR\" $MNESIA_OPTIONS $EJABBERD_OPTS -s ejabberd"
 
@@ -126,6 +128,14 @@ exec_iex()
 # usage
 debugwarning()
 {
+    if [ "$OSTYPE" != "cygwin" ] && [ "$OSTYPE" != "win32" ] ; then
+        if [ "a$TERM" = "a" ] || [ "$TERM" = "dumb" ] ; then
+            echo "Terminal type not supported."
+            echo "You may have to set the TERM environment variable to fix this."
+            exit 8
+        fi
+    fi
+
     if [ "$EJABBERD_BYPASS_WARNINGS" != "true" ] ; then
         echo "--------------------------------------------------------------------"
         echo ""
@@ -198,7 +208,7 @@ uid()
     uuid=$(uuidgen 2>/dev/null)
     [ -z "$uuid" ] && [ -f /proc/sys/kernel/random/uuid ] && uuid=$(cat /proc/sys/kernel/random/uuid)
     [ -z "$uuid" ] && uuid=$(printf "%X" "${RANDOM:-$$}$(date +%M%S)")
-    uuid=${uuid%%-*}
+    uuid=$(printf '%s' $uuid | sed 's/^\(...\).*$/\1/')
     [ $# -eq 0 ] && echo "${uuid}-${ERLANG_NODE}"
     [ $# -eq 1 ] && echo "${uuid}-${1}-${ERLANG_NODE}"
     [ $# -eq 2 ] && echo "${uuid}-${1}@${2}"
@@ -267,6 +277,10 @@ case $1 in
         check_start
         exec_erl "$ERLANG_NODE" $EJABBERD_OPTS -noinput
         ;;
+    foreground-quiet)
+        check_start
+        exec_erl "$ERLANG_NODE" $EJABBERD_OPTS -noinput -ejabberd quiet true
+        ;;
     live)
         livewarning
         check_start

examples/transport-configs/configs/aim-transport.xml

@@ -1,77 +0,0 @@
-<!-- aim-transport.xml -->
-
-<jabber>
-
-  <!--
-     You need to add elogger and rlogger entries when using ejabberd.
-     In this case the transport will do the logging.
-  -->
-
-  <log id='elogger'>
-    <host/>
-    <logtype/>
-    <format>%d: [%t] (%h): %s</format>
-    <file>/var/log/jabber/aim-transport-error.log</file>
-  </log>
-
-  <log id='rlogger'>
-    <host/>
-    <logtype>record</logtype>
-    <format>%d %h %s</format>
-    <file>/var/log/jabber/aim-transport-record.log</file>
-  </log>
-
-  <!--
-     ejabberd do not provide XDB services.
-     xdb_file.so is loaded in to handle all XDB requests.
-  -->
-
-  <xdb id="xdb">
-    <host/>
-    <load>
-      <xdb_file>/usr/local/lib/jabber/libjabberdxdbfile.so</xdb_file> <!-- This file is part of jabberd-1.4.x. -->
-      </load>
-    <xdb_file xmlns="jabber:config:xdb_file">
-      <spool><jabberd:cmdline flag='s'>/var/spool/jabber</jabberd:cmdline></spool>
-    </xdb_file>
-  </xdb>
-
-  <!--
-     Make sure that all host names here are resolveable via DNS if you
-     want the transport to be available to the public.
-  -->
-
-  <service id='aim.SERVER.COM'>
-    <!-- aim-transport configuration. -->
-    <aimtrans xmlns='jabber:config:aimtrans'>
-      <vCard>
-        <FN>AIM/ICQ Transport</FN>
-        <DESC>This is the AIM/ICQ Transport.</DESC>
-        <MAIL>EMAIL@ADDRESS.COM</MAIL>
-        <URL>http://aim-transport.jabberstudio.org/</URL>
-      </vCard>
-      <charset>cp1252</charset>
-    </aimtrans>
-    <!-- aim-transport module. -->
-    <load>
-      <aim_transport>/usr/local/lib/jabber/aim-transport.so</aim_transport>
-    </load>
-  </service>
-
-  <!--
-     The settings below have to match the settings you made
-     in your ejabberd.cfg configuration file.
-  -->
-
-  <service id="icq-linker">
-    <uplink/>
-    <connect>
-      <ip>127.0.0.1</ip>
-      <port>5233</port>
-      <secret>SECRET</secret>
-    </connect>
-  </service>
-
-  <pidfile>/var/run/jabber/aim-transport.pid</pidfile>
-
-</jabber>

examples/transport-configs/configs/ile.xml

@@ -1,136 +0,0 @@
-<!-- ile.xml -->
-
-<config>
-  <jabber>
-    <server>127.0.0.1</server>
-    <port>5238</port>
-    <secret>SECRET</secret>
-    <service>ile.SERVER.COM</service>
-    <connectsleep>7</connectsleep> <!-- seconds to wait if we get disconnected -->
-    <language>en</language>
-    <vCard>
-      <FN>I Love Email</FN>
-      <DESC>With this service you can receive email notifications.
-
-Security warning: Be careful when using this. Your password will travel in clear from your client to your jabber server if you don't use SSL and it will probably travel in clear from the jabber server to your email server. Use with care. This shouldn't be an issue in your Intranet, but it is if you use an ILE installed in a foreign jabber server.</DESC>
-      <MAIL>EMAIL@ADDRESS.COM</MAIL>
-      <URL>http://ile.jabberstudio.org/</URL>
-    </vCard>
-  </jabber>
-
-  <debug>
-    <file>/var/log/jabber/ile.log</file>
-    <level>1</level> <!-- man Net::Jabber::Debug -->
-  </debug>
-
-  <mail>
-    <checkinterval>10</checkinterval> <!-- in minutes --> 
-    <timeout>20</timeout> <!-- timeout for IMAP/POP connection, in seconds -->
-  </mail>
-
-  <files>
-    <users>/var/spool/jabber/ile.SERVER.COM/users.db</users>
-    <passwords>/var/spool/jabber/ile.SERVER.COM/passwords.db</passwords>
-    <hosts>/var/spool/jabber/ile.SERVER.COM/hosts.db</hosts>
-    <types>/var/spool/jabber/ile.SERVER.COM/types.db</types>
-    <notifyxa>/var/spool/jabber/ile.SERVER.COM/notifyxa.db</notifyxa>
-    <notifydnd>/var/spool/jabber/ile.SERVER.COM/notifydnd.db</notifydnd>
-    <urls>/var/spool/jabber/ile.SERVER.COM/urls.db</urls>
-  </files>
-
-  <form>
-    <en>
-      <instructions>Please fill in the fields,according to your email account settings and notification preferences</instructions>
-      <title>ILE: Email notification service</title>
-      <email_options>Email account settings</email_options>
-      <user>Username</user>
-      <pass>Password</pass>
-      <host>Hostname</host>
-      <type>Type</type>
-      <newmail>You have received NUM email messages since last time I checked, which was CHECKINTERVAL minutes ago.</newmail>
-      <errorcheck>There was an error while trying to check mail for ACCOUNT.</errorcheck>
-      <notify_options>Notification Options</notify_options>
-      <notifyxa>Notify even when Xtended Away (XA)</notifyxa>
-      <notifydnd>Notify even when Do Not Disturb (DND)</notifydnd>
-      <webmail_url>Webmail URL</webmail_url>
-      <webmail_login>Login to ACCOUNT</webmail_login>
-      <iledesc>ILE: an email notifier component: http://ile.jabberstudio.org</iledesc>
-    </en>
-
-    <es>
-      <instructions>Por favor, rellene los campos del formulario.</instructions>
-      <title>ILE: Servicio de notificación de correo</title>
-      <email_options>Configuración de la cuenta de correo</email_options>
-      <user>Usuario</user>
-      <pass>Clave</pass>
-      <host>Host</host>
-      <type>Tipo</type>
-      <newmail>Ha recibido NUM email(s) desde la última comprobación que fue hace CHECKINTERVAL minutos</newmail>
-      <errorcheck>Ha habido un error en la comprobación del correo para la cuenta ACCOUNT.</errorcheck>
-      <notify_options>Opciones de notificación</notify_options>
-      <notifyxa>Notificar incluso si muy ausente (XA)</notifyxa>
-      <notifydnd>Notificar incluso si no molestar (DND)</notifydnd>
-      <webmail_url>Webmail URL</webmail_url>
-      <webmail_login>Leer correo de ACCOUNT</webmail_login>
-      <iledesc>ILE: un notificador de nuevo email - http://ile.jabberstudio.org</iledesc>
-    </es>
-
-    <ca>
-      <instructions>Ompli els camps del formulari.</instructions>
-      <title>ILE: Servei de notificació de nou email</title>
-      <email_options>Dades del compte de mail</email_options>
-      <user>Usuari</user>
-      <pass>Clau</pass>
-      <host>Host</host>
-      <type>Tipus</type>
-      <newmail>Ha rebut NUM email(s) des de la última comprobació que va ser fa CHECKINTERVAL minuts.</newmail>
-      <errorcheck>S'ha produit un error en la comprobació del correu per al compte ACCOUNT.</errorcheck>
-      <notify_options>Opcions de notificació</notify_options>
-      <notifyxa>Notificar si molt absent (XA)</notifyxa>
-      <notifydnd>Notificar si no molestar (DND)</notifydnd>
-      <webmail_url>Webmail URL</webmail_url>
-      <webmail_login>Llegir correu de ACCOUNT</webmail_login>
-      <iledesc>ILE: un notificador de nou email - http://ile.jabberstudio.org</iledesc>
-    </ca>
-
-    <ro>
-      <!-- Contributed by Adrian Rappa -->
-      <instructions>Va rog completati urmatoarele campuri</instructions>
-      <title>I Love Email: new email notification service</title>
-      <email_options>Email account settings</email_options>
-      <user>Nume utilizator</user>
-      <pass>Parola</pass>
-      <host>Nume gazda</host>
-      <type>Tip</type>
-      <newmail>Ati primit NUM mesaj(e) de la ultima verificare, care a fost acum CHECKINTERVAL minute.</newmail>
-      <errorcheck>A fost eroare in timp ce incercam sa verific posta pentru ACCOUNT.</errorcheck>
-      <notify_options>Notification Options</notify_options>
-      <notifyxa>Notify even when Xtended Away (XA)</notifyxa>
-      <notifydnd>Notify even when Do Not Disturb (DND)</notifydnd>
-      <webmail_url>Webmail URL</webmail_url>
-      <webmail_login>Login to ACCOUNT</webmail_login>
-      <iledesc>ILE: an email notifier component: http://ile.jabberstudio.org</iledesc>
-    </ro>
-
-    <nl>
-      <!-- Contributed by Sander Devrieze -->
-      <instructions>Vul volgende velden in.</instructions>
-      <title>ILE: Dienst voor e-mailnotificaties</title>
-      <email_options>Instellingen van e-mailaccount</email_options>
-      <user>Gebruikersnaam</user>
-      <pass>Wachtwoord</pass>
-      <host>Inkomende mailserver</host>
-      <type>Type verbinding</type>
-      <newmail>U hebt NUM berichten ontvangen sinds CHECKINTERVAL minuten geleden.</newmail>
-      <errorcheck>Fout tijdens controle op nieuwe e-mails bij ACCOUNT. ILE zal deze account niet meer opnieuw controleren tot u uw registratiegegevens wijzigt of opnieuw aanmeldt.</errorcheck>
-      <notify_options>Notificatie-instellingen</notify_options>
-      <notifyxa>Notificeer ook in de status Niet Beschikbaar (XA)</notifyxa>
-      <notifydnd>Notificeer ook in de status Niet Storen (DND)</notifydnd>
-      <webmail_url>URL van webmail</webmail_url>
-      <webmail_login>Aanmelden op ACCOUNT</webmail_login>
-      <iledesc>ILE: een dienst om e-mailnotificaties te ontvangen: http://ile.jabberstudio.org</iledesc>
-    </nl>
-
-  </form>
-
-</config>

examples/transport-configs/configs/jabber-gg-transport.xml

@@ -1,149 +0,0 @@
-<jggtrans>
-
-  <service jid="gg.SERVER.COM"/>
-
-  <!-- This connects the jabber-gg-transport process to ejabberd. -->
-  <connect id="gglinker">
-    <ip>127.0.0.1</ip>
-    <port>5237</port>
-    <secret>SECRET</secret>
-  </connect>
-
-  <register>
-    <!-- This tag contains the message displayed to users at registration time.
-         You can use <p/> and/or <br/> to break lines. Multiple spaces and newlines
-         are converted to just one, so formatting of config file doesn't really matter. -->
-    <instructions>
-            Fill in your GG number (after "username")
-            and password to register on the transport.
-            <p/>To change your information in the GaduGadu directory you need to fill in the other fields.
-            <p/>To remove registration you need to leave the form blank.
-    </instructions>
-  </register>
-
-  <search>
-    <!-- This tag contains the message displayed to users at search time. -->
-    <instructions>
-            To search people:<br/>
-            First fill in surname or family name, nickname, city, birthyear or range of birthyears (eg. 1950-1960)
-            and gender (you may fill in more fields at once).<br/>
-            or<br/>
-            Fill in phone number<br/>
-            or<br/>
-            Fill in the GG number of the person you are searching.
-    </instructions>
-  </search>
-
-  <gateway>
-    <!-- This is message, that may be displayed to user when adding gg contact. -->
-    <desc>Please fill in the GaduGadu number of the person you want to add.</desc>
-    <!-- And this is the prompt for GG number. -->
-    <prompt>GG Nummer</prompt>
-  </gateway>
-
-  <vCard>
-    <FN>Gadu-Gadu Transport</FN>
-    <DESC>This is the Gadu-Gadu Transport.</DESC>
-    <EMAIL>EMAIL@ADDRESS.COM</EMAIL>
-    <URL>http://www.jabberstudio.org/projects/jabber-gg-transport/</URL>
-  </vCard>
-
- <!-- Default user locale (language).
-      Empty means system locale setting,
-      no (or commented-out) <default_locale> tag means no translations. -->
- <!-- <default_locale>pl_PL</default_locale> -->
-
- <!-- Logger configuration.
-      You may configure one logger of type "syslog" and/or one of type "file".
-      You may also not configure logging at all. -->
- <log type="syslog" facility="local0"/>
- <log type="file">/var/log/jabber/jabber-gg-transport.log</log>
-
- <!-- Uncomment this, if you want proxy to be used for Gadu-Gadu connection. -->
- <!--
- <proxy>
-        <ip>127.0.0.1</ip>
-        <port>8080</port>
- </proxy>
- -->
-
- <!-- You can change these values according to your needs. -->
- <conn_timeout>60</conn_timeout>
- <ping_interval>10</ping_interval>
-
- <!-- Gadu-Gadu server doesn't seem to answer pings anymore :-(
-      So let's give it 10 year :-) -->
- <pong_timeout>315360000</pong_timeout>
-
- <!-- This time after disconnection from Gadu-Gadu server the transport
-      will try to connect again. -->
- <reconnect>300</reconnect>
-
- <!-- How long to wait before restart, after jabber server connection is broken
-      negative value means, that jggtrans should terminate. -->
-      <restart_timeout>60</restart_timeout>
-
- <!-- Delay between the unavailable presence is received from user and loggin out 
-      from Gadu-Gadu - for nice <presence type="invisible"/> support. -->
-      <disconnect_delay>5</disconnect_delay>
-
- <!-- list of Gadu-Gadu servers to use.
- 	<hub/> means "use GG hub to find server"
-      	<server/> tag should contain server address and may contain "port"
-	attribute with port number. When TLS is available (supported by libgadu)
-	it will be used unless "tls" attribute is set to "no". Please notice,
-	that not all servers will accept TLS connections.
-	Servers (including hub) are tried in order as they appear in <servers/>
-	element.
-	A reasonable default server list is hardcoded in jggtrans.
-      -->
- <!--
- <servers>
-	<hub/>
-	<server port="443">217.17.41.90</server>
-	<server tls="no">217.17.41.85</server>
-	<server tls="no">217.17.41.88</server>
- </servers>
- -->
-
- <!-- Spool directory. This is the place, where user info will be stored. -->
- <!-- Be careful about permissions - users' Gadu-Gadu passwords are stored there. -->
- <spool>/var/spool/jabber/gg.SERVER.COM/</spool>
-
- <!-- Where to store pid file. This tag is optional. -->
- <pidfile>/var/run/jabber/jabber-gg-transport.pid</pidfile>
-
- <!-- jid allowed to do some administrative task (eg. discovering online users).
-      May be used multiple times. -->
- <admin>GG_TRANSPORT_ADMIN@SERVER.COM</admin>
-
- <!-- ACL gives detailed access control to the transport. -->
- <acl>
-	<!-- Example entries: -->
-
-	<allow who="admin@SERVER.COM" what="iq/query?xmlns=http://jabber.org/protocol/stats"/>
-		<!-- will allow statistics gathering to admin@SERVER.COM -->
-
-	<deny who="*" what="iq/query?xmlns=http://jabber.org/protocol/stats"/>
-		<!-- will deny statistics gathering for anybody else -->
-
-	<!-- <allow who="*@SERVER.COM"/> -->
-		<!-- will allow anything else to users from "SERVER.COM" -->
-
-	<!-- <deny what="iq/query?xmlns=jabber:x:register"/> --> 
-		<!-- will deny registration for all other users -->
-
-	<!-- <allow what="presence"/> --> 
-		<!-- allow presence from anybody -->
-
-	<!-- <allow what="iq"/> --> 
-		<!-- allow iq from anybody -->
-
-	<!-- <allow what="message"/> --> 
-		<!-- allow message from anybody -->
-
-	<!-- <deny/> --> 
-		<!-- will deny anything else -->
- </acl>
-
-</jggtrans>

examples/transport-configs/configs/jit.xml

@@ -1,128 +0,0 @@
-<!-- jit.xml -->
-
-<jabber>
-
-  <!--
-     You need to add elogger and rlogger entries here when using ejabberd.
-     In this case the transport will do the logging.
-  -->
-
-  <log id='elogger'>
-    <host/>
-    <logtype/>
-    <file>/var/log/jabber/jit-error</file> <!-- WPJabber logs with date. -->
-  </log>
-
-  <log id='rlogger'>
-    <host/>
-    <logtype>record</logtype>
-    <file>/var/log/jabber/jit-record</file> <!-- WPJabber logs with date. -->
-  </log>
-
-  <!--
-     ejabberd do not provide XDB services.
-     xdb_file-jit.so (the renamed xdb_file.so from WPJabber) is
-     loaded in to handle all XDB requests.
-     Read also the documentation in xdb_file/README from the JIT package.
-  -->
-
-  <xdb id="xdb">
-    <host/>
-    <load>
-      <xdb_file>/usr/local/lib/jabber/xdb_file.so</xdb_file> <!-- The xdb_file.so from WPJabber/JIT. -->
-      </load>
-    <xdb_file xmlns="jabber:config:xdb_file">
-     <spool><jabberd:cmdline flag='s'>/var/spool/jabber</jabberd:cmdline></spool>
-    </xdb_file>
-  </xdb>
-
-  <!--
-     Make sure that all host names here are resolveable via DNS if you
-     want the transport to be available to the public.
-  -->
-
-  <service id="icq.SERVER.COM">
-    <!--
-       Replace SERVER.COM with the same as above to enable sms.
-    -->
-    <host>sms.icq.SERVER.COM</host>
-    <!-- JIT configuration. -->
-    <icqtrans xmlns="jabber:config:icqtrans">
-      <sms>
-        <host>sms.icq.SERVER.COM</host>
-        <!-- Status of virtual "sms-contacts". -->
-        <show>away</show>
-        <status/>
-      </sms>
-      <instructions>Fill in your UIN and password.</instructions>
-      <search>Search ICQ users.</search>
-      <vCard>
-        <FN>ICQ Transport (JIT)</FN>
-        <DESC>This is the Jabber ICQ Transport.</DESC>
-        <MAIL>EMAIL@ADDRESS.COM</MAIL>
-        <URL>http://jit.jabberstudio.org/</URL>
-      </vCard>
-      <!-- Hashtable for users. -->
-      <prime>3907</prime>
-      <!-- Send messages from ICQ as chat to Jabber clients. -->
-      <chat/>
-      <!-- Enable this for ICQ web presence. -->
-      <web/>
-      <!--
-         If you don't want jabber:x:data forms
-         in reg and search uncomment this tag
-         (Not recomended).
-      -->
-      <no_xdata/>
-      <!--
-         This tag is necessary when using ejabberd.
-         In this way JIT will have its own contact list.
-      -->
-      <own_roster/>
-      <!--
-         When present, this tag will tell JIT not to try to
-         get the user's roster (which will take a bit of time
-         to fail in scenarios described above).
-      -->
-      <no_jabber_roster/>
-      <!-- File with stats. -->
-      <user_count_file>/var/spool/jabber/jit-count</user_count_file>
-      <!--
-         Interval beetween checking sessions: ping, messages, acks.
-      -->
-      <session_check>5</session_check>
-      <!-- Reconnect retries. -->
-      <reconnects>5</reconnects>
-      <!--
-         Time in sec when session can be inactive, 0=disabled.
-      -->
-      <session_timeout>18000</session_timeout>
-      <charset>windows-1252</charset>
-      <server>
-        <host port="5190">login.icq.com</host>
-      </server>
-    </icqtrans>
-    <!-- JIT module. -->
-    <load>
-      <icqtrans>/usr/local/lib/jabber/jit.so</icqtrans>
-    </load>
-  </service>
-
-  <!--
-     The settings below have to match the settings you made
-     in your ejabberd.cfg configuration file.
-  -->
-
-  <service id="icq-linker">
-    <host>SERVER.COM</host>
-    <uplink/>
-    <connect>
-      <ip>127.0.0.1</ip>
-      <port>5234</port>
-      <secret>SECRET</secret>
-    </connect>
-  </service>
-
-  <pidfile>/var/run/jabber/jit.pid</pidfile>
-
-</jabber>

examples/transport-configs/configs/msn-transport.xml

@@ -1,118 +0,0 @@
-<!-- msn-transport.xml -->
-
-<jabber>
-
-  <!--
-     You need to add elogger and rlogger entries here when using ejabberd.
-     In this case the transport will do the logging.
-  -->
-
-  <log id='elogger'>
-    <host/>
-    <logtype/>
-    <format>%d: [%t] (%h): %s</format>
-    <file>/var/log/jabber/msn-transport-error.log</file>
-  </log>
-
-  <log id='rlogger'>
-    <host/>
-    <logtype>record</logtype>
-    <format>%d %h %s</format>
-    <file>/var/log/jabber/msn-transport-record.log</file>
-  </log>
-
-  <!--
-     ejabberd do not provide XDB services.
-     xdb_file.so is loaded in to handle all XDB requests.
-  -->
-
-  <xdb id="xdb">
-    <host/>
-    <load>
-      <xdb_file>/usr/local/lib/jabber/libjabberdxdbfile.so</xdb_file>
-      </load>
-    <xdb_file xmlns="jabber:config:xdb_file">
-      <spool><jabberd:cmdline flag='s'>/var/spool/jabber</jabberd:cmdline></spool>
-    </xdb_file>
-  </xdb>
-
-  <!--
-     Make sure that all host names here are resolveable via DNS if you
-     want the transport to be available to the public.
-  -->
-
-  <service id="msn.SERVER.COM">
-    <!-- msn-transport configuration. -->
-    <msntrans xmlns="jabber:config:msntrans">
-      <instructions>Fill in your MSN account and password (eg: user1@hotmail.com).  A nickname is optional.</instructions>
-      <vCard>
-        <FN>MSN Transport</FN>
-        <DESC>This is the MSN Transport.</DESC>
-        <EMAIL>EMAIL@ADDRESS.COM</EMAIL>
-        <URL>http://msn-transport.jabberstudio.org/</URL>
-      </vCard>
-      <!--
-         Conference support allows you to create groupchat rooms on the
-         msn-transport and invite MSN users to join. 
-      -->
-      <conference id="conference.msn.SERVER.COM">
-        <!--
-           This will make MSN transport invite you to a special groupchat
-           room when more then one user joins a normal one-on-one session.
-           Joining this room will make MSN transport "switch" the session
-           into groupchat mode.  If you ignore it, MSN transport will
-           continue to send the messages as one-on-one chats. 
-        -->
-        <invite>More than one user entered this chat session. Enter this room to switch to groupchat modus.</invite>
-        <notice>
-          <join> is available</join>
-          <leave> has leaved the room</leave>
-        </notice>
-      </conference>
-      <!-- Enable Hotmail inbox notification. -->
-      <headlines/>
-      <!--
-         Enable fancy friendly names
-         If the user enters a nickname upon registration, and the user has
-         a status message, their MSN friendly name will be "nickname - status message".
-
-         If the user does not enter a nickname on registration, but they do have
-         a status message, their friendly name will just be their status message.
-
-         If the user did enter a nickname on registration, but they have a blank status message,
-         then their friendly name will just be the registered nickname.
-
-         If the user did not enter a nickname on registration, and they have a blank status message,
-         their nickname will just be the username portion of their JID.
-
-         If the above chosen friendly name is too long, then it will be truncated and "..." placed
-         at the end. MSN only supports friendly names of 128 characters, so this is unavoidable.
-
-         If this is disabled, then the registered nick is always sent as the MSN friendly name,
-         or if that is blank, the username portion of their JID is sent instead.
-      -->
-      <fancy_friendly/>
-    </msntrans>
-    <!-- msn-transport module. -->
-    <load>
-      <msntrans>/usr/local/lib/jabber/msn-transport.so</msntrans>
-    </load>
-  </service>
-
-  <!--
-     The settings below have to match the settings you made
-     in your ejabberd.cfg configuration file.
-  -->
-
-  <service id="msn-linker">
-    <uplink/>
-    <connect>
-      <ip>127.0.0.1</ip>
-      <port>5235</port>
-      <secret>SECRET</secret>
-    </connect>
-  </service>
-
-  <pidfile>/var/run/jabber/msn-transport.pid</pidfile>
-
-</jabber>

examples/transport-configs/configs/yahoo-transport-2.xml

@@ -1,86 +0,0 @@
-<!-- yahoo-transport-2.xml -->
-
-<jabber>
-
-  <!--
-  You need to add the elogger entry here when using ejabberd.
-  In this case the transport will do the logging.
-  -->
-
-  <log id='elogger'>
-    <host/>
-    <logtype/>
-    <format>%d: [%t] (%h): %s</format>
-    <file>/var/log/jabber/yahoo-transport-2-error.log</file>
-    <stderr/>
-  </log>
-
-  <!--
-     ejabberd do not provide XDB services.
-     xdb_file.so is loaded in to handle all XDB requests.
-  -->
-
-  <xdb id="xdb">
-    <host/>
-    <load>
-      <xdb_file>/usr/local/lib/jabber/libjabberdxdbfile.so</xdb_file>
-      </load>
-    <xdb_file xmlns="jabber:config:xdb_file">
-      <spool><jabberd:cmdline flag='s'>/var/spool/jabber</jabberd:cmdline></spool>
-    </xdb_file>
-  </xdb>
-
-  <!--
-     Make sure that all host names here are resolveable via DNS if you
-     want the transport to be available to the public.
-  -->
-
-  <service id="yahoo.SERVER.COM">
-    <!-- yahoo-transport-2 configuration. -->
-    <config xmlns="jabber:config:yahoo">
-      <vCard>
-        <NAME>Yahoo! Transport</NAME>
-        <FN>vCard not implemented in current version</FN>
-        <DESC>This is the Yahoo! transport.</DESC>
-        <MAIL>EMAIL@ADDRESS.COM</MAIL>
-        <URL>http://yahoo-transport-2.jabberstudio.org/</URL>
-      </vCard>
-      <instructions>Fill in your YAHOO! Messenger username and password to register on this transport.</instructions>
-      <server>scs.msg.yahoo.com</server>
-      <port>5050</port>
-      <!--
-         The character map. This provides character set translation from UTF-8
-         to the indicated character map. See the man page for 'iconv' for available
-         character maps on your platform. CP1252 is the standard Windows character
-         set.
-      -->
-      <charmap>CP1252</charmap>
-      <!--
-         When this element exists, the transport will send new mail notifications as
-         well as a count of unread messages when the user initially logs in.
-      -->
-      <newmail/>
-    </config>
-    <!-- yahoo-transport-2 module. -->
-    <load>
-      <yahoo_transport>/usr/local/lib/jabber/yahoo-transport-2.so</yahoo_transport>
-    </load>
-  </service>
-
-  <!--
-     The settings below have to match the settings you made
-     in your ejabberd.cfg configuration file.
-  -->
-
-  <service id="yahoo-linker">
-    <uplink/>
-    <connect>
-      <ip>127.0.0.1</ip>
-      <port>5236</port>
-      <secret>SECRET</secret>
-    </connect>
-  </service>
-
-  <pidfile>/var/run/jabber/yahoo-transport-2.pid</pidfile>
-
-</jabber>

examples/transport-configs/init-scripts/aim-transport

@@ -1,45 +0,0 @@
-#!/bin/sh
-#########################################################
-#
-#     aim-transport -- script to start aim-transport.
-#
-#########################################################
-
-DAEMON=/usr/local/sbin/jabberd-aim-transport
-CONF=/etc/jabber/aim-transport.xml
-NAME=jabberd-aim-transport
-HOME=/etc/jabber/
-USER=ejabberd
-
-#########################################################
-
-if [ "`/usr/bin/whoami`" != "$USER" ]; then
-
-       echo "You need to be" $USER "user to run this script."
-       exit 1
-fi
-
-case "$1" in
-  debug)
-        test -f $DAEMON -a -f $CONF || exit 0
-        echo "Starting $NAME in debugging mode."
-        $DAEMON -D -H $HOME -c $CONF &
-        ;;
-  start)
-	test -f $DAEMON -a -f $CONF || exit 0
-	echo "Starting $NAME."
-	$DAEMON -H $HOME -c $CONF &
-	;;
-  stop)
-	echo "Stopping $NAME."
-	killall $NAME &
-  	;;
-  restart|reload)
-	$0 stop
-	sleep 3
-	$0 start
-	;;
-  *)
-	echo "Usage: $0 {debug|start|stop|restart}"
-	exit 1
-esac

examples/transport-configs/init-scripts/ile

@@ -1,43 +0,0 @@
-#!/bin/sh
-#########################################################
-#
-#     ile -- script to start ILE.
-#
-#########################################################
-
-DAEMON=/usr/local/sbin/ile.pl
-NAME=ile.pl
-CONF=/etc/jabber/ile.xml
-USER=ejabberd
-
-#########################################################
-
-if [ "`/usr/bin/whoami`" != "$USER" ]; then
-
-       echo "You need to be" $USER "user to run this script."
-       exit 1
-fi
-
-case "$1" in
-  debug)
-	echo "Not implemented yet. Starting in normal mode"
-	$0 start
-	;;
-  start)
-	test -f $DAEMON || exit 0
-	echo "Starting $NAME."
-	$DAEMON $CONF &
-	;;
-  stop)
-	echo "Stopping $NAME."
-	killall $NAME &
-  	;;
-  restart|reload)
-	$0 stop
-	sleep 3
-	$0 start
-	;;
-  *)
-	echo "Usage: $0 {debug|start|stop|status|restart}"
-	exit 1
-esac

examples/transport-configs/init-scripts/jabber-gg-transport

@@ -1,47 +0,0 @@
-#!/bin/sh
-#########################################################
-#
-#     jabber-gg-transport -- script to start jabber-gg-transport.
-#
-#########################################################
-
-DAEMON=/usr/local/sbin/jggtrans
-CONF=/etc/jabber/jabber-gg-transport.xml
-NAME=jggtrans
-HOME=/etc/jabber/
-USER=ejabberd
-
-#########################################################
-
-if [ "`/usr/bin/whoami`" != "$USER" ]; then
-
-       echo "You need to be" $USER "user to run this script."
-       exit 1
-fi
-
-case "$1" in
-  debug)
-        test -f $DAEMON -a -f $CONF || exit 0
-        echo "Starting $NAME in debugging mode."
-        $DAEMON -D -H $HOME -c $CONF &
-        ;;
-  start)
-	test -f $DAEMON -a -f $CONF || exit 0
-	echo "Starting $NAME."
-	$DAEMON $CONF &
-	;;
-  stop)
-	echo "Stopping $NAME."
-	killall $NAME &
-	rm /var/run/jabber/jabber-gg-transport.pid
-        ;;
-
-  restart|reload)
-	$0 stop
-	sleep 3
-	$0 start
-	;;
-  *)
-	echo "Usage: $0 {debug|start|stop|restart}"
-	exit 1
-esac

examples/transport-configs/init-scripts/jit

@@ -1,45 +0,0 @@
-#!/bin/sh
-#########################################################
-#
-#     jit -- script to start JIT.
-#
-#########################################################
-
-DAEMON=/usr/local/sbin/wpjabber-jit
-CONF=/etc/jabber/jit.xml
-NAME=wpjabber-jit
-HOME=/etc/jabber/
-USER=ejabberd
-
-#########################################################
-
-if [ "`/usr/bin/whoami`" != "$USER" ]; then
-
-       echo "You need to be" $USER "user to run this script."
-       exit 1
-fi
-
-case "$1" in
-  debug)
-        test -f $DAEMON -a -f $CONF || exit 0
-        echo "Starting $NAME in debugging mode."
-        $DAEMON -D -H $HOME -c $CONF &
-        ;;
-  start)
-	test -f $DAEMON -a -f $CONF || exit 0
-	echo "Starting $NAME."
-	$DAEMON -H $HOME -c $CONF &
-	;;
-  stop)
-	echo "Stopping $NAME."
-	killall $NAME &
-  	;;
-  restart|reload)
-	$0 stop
-        sleep 3
-	$0 start
-	;;
-  *)
-	echo "Usage: $0 {debug|start|stop|restart}"
-	exit 1
-esac

examples/transport-configs/init-scripts/msn-transport

@@ -1,50 +0,0 @@
-#!/bin/sh
-#########################################################
-#
-#     msn-transport -- script to start MSN Transport.
-#
-#########################################################
-
-DAEMON=/usr/local/sbin/jabberd-msn-transport
-CONF=/etc/jabber/msn-transport.xml
-NAME=jabberd-msn-transport
-HOME=/etc/jabber/
-USER=ejabberd
-
-#########################################################
-
-if [ "`/usr/bin/whoami`" != "$USER" ]; then
-
-       echo "You need to be" $USER "user to run this script."
-       exit 1
-fi
-
-case "$1" in
-  strace)
-	test -f $DAEMON -a -f $CONF || exit 0
-        echo "Starting $NAME in strace mode."
-        strace -o /opt/ejabberd/var/log/jabber/strace.log $DAEMON -H $HOME -c $CONF &
-        ;;
-  debug)
-        test -f $DAEMON -a -f $CONF || exit 0
-        echo "Starting $NAME in debugging mode."
-        $DAEMON -D -H $HOME -c $CONF &
-        ;;
-  start)
-	test -f $DAEMON -a -f $CONF || exit 0
-	echo "Starting $NAME."
-	$DAEMON -H $HOME -c $CONF &
-	;;
-  stop)
-	echo "Stopping $NAME."
-	killall $NAME &
-  	;;
-  restart|reload)
-	$0 stop
-        sleep 3
-	$0 start
-	;;
-  *)
-	echo "Usage: $0 {debug|start|stop|restart}"
-	exit 1
-esac

examples/transport-configs/init-scripts/yahoo-transport-2

@@ -1,45 +0,0 @@
-#!/bin/sh
-##############################################################
-#
-#     yahoo-transport-2 -- script to start Yahoo-transport-2.
-#
-#############################################################
-
-DAEMON=/usr/local/sbin/jabberd-yahoo-transport-2
-CONF=/etc/jabber/yahoo-transport-2.xml
-NAME=jabberd-yahoo-transport-2
-HOME=/etc/jabber/
-USER=ejabberd
-
-#############################################################
-
-if [ "`/usr/bin/whoami`" != "$USER" ]; then
-
-       echo "You need to be" $USER "user to run this script."
-       exit 1
-fi
-
-case "$1" in
-  debug)
-        test -f $DAEMON -a -f $CONF || exit 0
-        echo "Starting $NAME in debugging mode."
-        $DAEMON -D -H $HOME -c $CONF &
-        ;;
-  start)
-	test -f $DAEMON -a -f $CONF || exit 0
-	echo "Starting $NAME."
-	$DAEMON -H $HOME -c $CONF &
-	;;
-  stop)
-	echo "Stopping $NAME."
-	killall $NAME &
-  	;;
-  restart|reload)
-	$0 stop
-        sleep 3
-	$0 start
-	;;
-  *)
-	echo "Usage: $0 {debug|start|stop|restart}"
-	exit 1
-esac

include/adhoc.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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/bosh.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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_acme.hrl

@@ -1,53 +0,0 @@
-
--record(challenge, {
-	  type  = <<"http-01">> :: bitstring(),
-	  status = pending :: pending | valid | invalid,
-	  uri = "" :: url(),
-	  token = <<"">> :: bitstring()
-	 }).
-
--record(data_acc, {
-	  id     :: list(),
-	  ca_url :: url(),
-	  key    :: jose_jwk:key()
-	 }).
--type data_acc() :: #data_acc{}.
-
--record(data_cert, {
-	  domain  :: bitstring(),
-	  pem     :: pem(),
-	  path    :: string()
-	 }).
--type data_cert() :: #data_cert{}.
-
-%%
-%% Types
-%%
-
-%% Acme configuration
--type acme_config() :: [{ca_url, url()} | {contact, bitstring()}].
-
-%% The main data type that ejabberd_acme keeps
--type acme_data() :: proplist().
-
-%% The list of certificates kept in data
--type data_certs() :: proplist(bitstring(), data_cert()).
-
-%% The certificate saved in pem format
--type pem() :: bitstring().
-
--type nonce() :: string().
--type url() :: string().
--type proplist() :: [{_, _}].
--type proplist(X,Y) :: [{X,Y}].
--type dirs() :: #{string() => url()}.
--type jws() :: map().
--type handle_resp_fun() :: fun(({ok, proplist(), proplist()}) -> {ok, _, nonce()}).
-
--type acme_challenge() :: #challenge{}.
-
-%% Options
--type account_opt() :: string().
--type verbose_opt() :: string().
--type domains_opt() :: string().
-

include/ejabberd_auth.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -59,6 +59,7 @@
         %% access is: [accessRuleName] or [{Module, AccessOption, DefaultAccessRuleName}]
          access = []             :: [{atom(),atom(),atom()}|atom()],
          result = {res, rescode} :: rterm() | '_' | '$2',
+         args_rename = []        :: [{atom(),atom()}],
          args_desc = none        :: none | [string()] | '_',
          result_desc = none      :: none | string() | '_',
          args_example = none     :: none | [any()] | '_',

include/ejabberd_config.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -21,9 +21,10 @@
 -record(request,
 	{method            :: method(),
 	 path = []         :: [binary()],
+	 raw_path          :: binary(),
 	 q = []            :: [{binary() | nokey, binary()}],
 	 us = {<<>>, <<>>} :: {binary(), binary()},
-	 auth              :: {binary(), binary()} | {oauth, binary(), []} | undefined,
+	 auth              :: {binary(), binary()} | {oauth, binary(), []} | undefined | invalid,
 	 lang = <<"">>     :: binary(),
 	 data = <<"">>     :: binary(),
 	 ip                :: {inet:ip_address(), inet:port_number()},

include/ejabberd_oauth.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -24,3 +24,10 @@
           scope = []               :: [binary()] | '_',
           expire                   :: integer() | '$1' | '_'
          }).
+
+-record(oauth_client, {
+          client_id = <<"">>       :: binary() | '_',
+          client_name = <<"">>     :: binary() | '_',
+          grant_type               :: password | implicit | '_',
+          options                  :: [any()] | '_'
+         }).

include/ejabberd_router.hrl

@@ -2,7 +2,7 @@
 
 -type local_hint() :: integer() | {apply, atom(), atom()}.
 
--record(route, {domain :: binary() | '_',
-		server_host :: binary() | '_',
+-record(route, {domain :: binary(),
+		server_host :: binary(),
 		pid :: undefined | pid(),
-		local_hint :: local_hint() | undefined | '_'}).
+		local_hint :: local_hint() | undefined}).

include/ejabberd_sm.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -30,7 +30,7 @@
 -type info() :: [{conn, atom()} | {ip, ip()} | {node, atom()}
                  | {oor, boolean()} | {auth_module, atom()}
                  | {num_stanzas_in, non_neg_integer()}
-		 | offline].
+		 | {atom(), term()}].
 -type prio() :: undefined | integer().
 
 -endif.

include/ejabberd_sql.hrl

@@ -0,0 +1,50 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2021   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))).
+
+-define(SQL_INSERT_MARK, sql_insert__mark_).
+-define(SQL_INSERT(Table, Fields), ?SQL_INSERT_MARK(Table, Fields)).
+
+-ifdef(COMPILER_REPORTS_ONLY_LINES).
+-record(sql_query, {hash :: binary(),
+		    format_query :: fun(),
+		    format_res :: fun(),
+		    args :: fun(),
+		    loc :: {module(), pos_integer()}}).
+-else.
+-record(sql_query, {hash :: binary(),
+		    format_query :: fun(),
+		    format_res :: fun(),
+		    args :: fun(),
+		    loc :: {module(), {pos_integer(), pos_integer()}}}).
+-endif.
+
+-record(sql_escape, {string :: fun((binary()) -> binary()),
+		     integer :: fun((integer()) -> binary()),
+		     boolean :: fun((boolean()) -> binary()),
+		     in_array_string :: fun((binary()) -> binary()),
+		     like_escape :: fun(() -> binary())}).

include/ejabberd_sql_pt.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -17,20 +17,5 @@
 %%% 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))).
-
--define(SQL_INSERT_MARK, sql_insert__mark_).
--define(SQL_INSERT(Table, Fields), ?SQL_INSERT_MARK(Table, Fields)).
-
--record(sql_query, {hash, format_query, format_res, args, loc}).
-
--record(sql_escape, {string, integer, boolean}).
-
+-compile([{parse_transform, ejabberd_sql_pt}]).
+-include("ejabberd_sql.hrl").

include/ejabberd_stacktrace.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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,11 +18,10 @@
 %%%
 %%%----------------------------------------------------------------------
 
--record(scram, {storedkey = <<"">> :: binary(),
-		serverkey = <<"">> :: binary(),
-		salt = <<"">>      :: binary(),
-		iterationcount = 0 :: integer()}).
-
--type scram() :: #scram{}.
-
--define(SCRAM_DEFAULT_ITERATION_COUNT, 4096).
+-ifdef(DEPRECATED_GET_STACKTRACE).
+-define(EX_RULE(Class, Reason, Stack), Class:Reason:Stack).
+-define(EX_STACK(Stack), Stack).
+-else.
+-define(EX_RULE(Class, Reason, _), Class:Reason).
+-define(EX_STACK(_), erlang:get_stacktrace()).
+-endif.

include/ejabberd_web_admin.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -37,14 +37,12 @@
 -define(XAC(Name, Attrs, Text),
 	?XAE(Name, Attrs, [?C(Text)])).
 
--define(T(Text), translate:translate(Lang, Text)).
+-define(CT(Text), ?C((translate:translate(Lang, Text)))).
 
--define(CT(Text), ?C((?T(Text)))).
-
--define(XCT(Name, Text), ?XC(Name, (?T(Text)))).
+-define(XCT(Name, Text), ?XC(Name, (translate:translate(Lang, Text)))).
 
 -define(XACT(Name, Attrs, Text),
-	?XAC(Name, Attrs, (?T(Text)))).
+	?XAC(Name, Attrs, (translate:translate(Lang, Text)))).
 
 -define(LI(Els), ?XE(<<"li">>, Els)).
 
@@ -53,7 +51,7 @@
 
 -define(AC(URL, Text), ?A(URL, [?C(Text)])).
 
--define(ACT(URL, Text), ?AC(URL, (?T(Text)))).
+-define(ACT(URL, Text), ?AC(URL, (translate:translate(Lang, Text)))).
 
 -define(P, ?X(<<"p">>)).
 
@@ -65,7 +63,15 @@
 	     {<<"value">>, Value}])).
 
 -define(INPUTT(Type, Name, Value),
-	?INPUT(Type, Name, (?T(Value)))).
+	?INPUT(Type, Name, (translate:translate(Lang, Value)))).
+
+-define(INPUTD(Type, Name, Value),
+	?XA(<<"input">>,
+	    [{<<"type">>, Type}, {<<"name">>, Name},
+             {<<"class">>, <<"btn-danger">>}, {<<"value">>, Value}])).
+
+-define(INPUTTD(Type, Name, Value),
+	?INPUTD(Type, Name, (translate:translate(Lang, Value)))).
 
 -define(INPUTS(Type, Name, Value, Size),
 	?XA(<<"input">>,
@@ -73,7 +79,7 @@
 	     {<<"value">>, Value}, {<<"size">>, Size}])).
 
 -define(INPUTST(Type, Name, Value, Size),
-	?INPUT(Type, Name, (?T(Value)), Size)).
+	?INPUT(Type, Name, (translate:translate(Lang, Value)), Size)).
 
 -define(ACLINPUT(Text),
 	?XE(<<"td">>,
@@ -90,14 +96,14 @@
 	?XAC(<<"p">>, [{<<"class">>, <<"result">>}], Text)).
 
 %% Guide Link
--define(XREST(Text), ?XRES((?T(Text)))).
+-define(XREST(Text), ?XRES((translate:translate(Lang, Text)))).
 
 -define(GL(Ref, Title),
 	?XAE(<<"div">>, [{<<"class">>, <<"guidelink">>}],
 	     [?XAE(<<"a">>,
-		   [{<<"href">>, <<"/admin/doc/guide.html#", Ref/binary>>},
+		   [{<<"href">>, <<"https://docs.ejabberd.im/admin/configuration/", Ref/binary>>},
 		    {<<"target">>, <<"_blank">>}],
-		   [?C(<<"[Guide: ", Title/binary, "]">>)])])).
+		   [?C(<<"docs: ", Title/binary>>)])])).
 
 %% h1 with a Guide Link
 -define(H1GL(Name, Ref, Title),

include/eldap.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -44,6 +44,7 @@
                       attributes = []    :: [{binary(), [binary()]}]}).
 
 -type tlsopts() :: [{encrypt, tls | starttls | none} |
+		    {tls_certfile, binary() | undefined} |
                     {tls_cacertfile, binary() | undefined} |
                     {tls_depth, non_neg_integer() | undefined} |
                     {tls_verify, hard | soft | false}].
@@ -61,3 +62,18 @@
 -type eldap_config() :: #eldap_config{}.
 -type eldap_search() :: #eldap_search{}.
 -type eldap_entry() :: #eldap_entry{}.
+
+-define(eldap_config(M, H),
+	#eldap_config{
+	   servers = M:ldap_servers(H),
+	   backups = M:ldap_backups(H),
+	   tls_options = [{encrypt, M:ldap_encrypt(H)},
+			  {tls_verify, M:ldap_tls_verify(H)},
+			  {tls_certfile, M:ldap_tls_certfile(H)},
+			  {tls_cacertfile, M:ldap_tls_cacertfile(H)},
+			  {tls_depth, M:ldap_tls_depth(H)}],
+	   port = M:ldap_port(H),
+	   dn = M:ldap_rootdn(H),
+	   password = M:ldap_password(H),
+	   base = M:ldap_base(H),
+	   deref_aliases = M:ldap_deref_aliases(H)}).

include/http_bind.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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/logger.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -17,24 +17,43 @@
 %%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 %%%
 %%%----------------------------------------------------------------------
-
 -define(PRINT(Format, Args), io:format(Format, Args)).
+
+-ifdef(LAGER).
 -compile([{parse_transform, lager_transform}]).
 
 -define(DEBUG(Format, Args),
-	lager:debug(Format, Args)).
+	begin lager:debug(Format, Args), ok end).
 
 -define(INFO_MSG(Format, Args),
-	lager:info(Format, Args)).
+	begin lager:info(Format, Args), ok end).
 
 -define(WARNING_MSG(Format, Args),
-	lager:warning(Format, Args)).
+	begin lager:warning(Format, Args), ok end).
 
 -define(ERROR_MSG(Format, Args),
-	lager:error(Format, Args)).
+	begin lager:error(Format, Args), ok end).
 
 -define(CRITICAL_MSG(Format, Args),
-	lager:critical(Format, Args)).
+	begin lager:critical(Format, Args), ok end).
+-else.
+-include_lib("kernel/include/logger.hrl").
+
+-define(DEBUG(Format, Args),
+	begin ?LOG_DEBUG(Format, Args), ok end).
+
+-define(INFO_MSG(Format, Args),
+	begin ?LOG_INFO(Format, Args), ok end).
+
+-define(WARNING_MSG(Format, Args),
+	begin ?LOG_WARNING(Format, Args), ok end).
+
+-define(ERROR_MSG(Format, Args),
+	begin ?LOG_ERROR(Format, Args), ok end).
+
+-define(CRITICAL_MSG(Format, Args),
+	begin ?LOG_CRITICAL(Format, Args), ok end).
+-endif.
 
 %% Use only when trying to troubleshoot test problem with ExUnit
 -define(EXUNIT_LOG(Format, Args),

include/mod_announce.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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_caps.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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_last.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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_mam.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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,12 +19,12 @@
 %%%----------------------------------------------------------------------
 
 -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() | message() | '_',
+	{us = {<<"">>, <<"">>}                :: {binary(), binary()},
+	 id = <<>>                            :: binary(),
+	 timestamp = erlang:timestamp()       :: erlang:timestamp(),
+	 peer = {<<"">>, <<"">>, <<"">>}      :: ljid() | undefined,
+	 bare_peer = {<<"">>, <<"">>, <<"">>} :: ljid(),
+	 packet = #xmlel{}                    :: xmlel() | message(),
 	 nick = <<"">>                        :: binary(),
 	 type = chat                          :: chat | groupchat}).
 

include/mod_muc.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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_muc_room.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -22,15 +22,15 @@
 
 -define(SETS, gb_sets).
 
--define(DICT, dict).
-
 -record(lqueue,
 {
-    queue   :: p1_queue:queue(),
-    max = 0 :: integer()
+    queue = p1_queue:new()  :: p1_queue:queue(lqueue_elem()),
+    max   = 0               :: integer()
 }).
 
 -type lqueue() :: #lqueue{}.
+-type lqueue_elem() :: {binary(), message(), boolean(),
+			erlang:timestamp(), non_neg_integer()}.
 
 -record(config,
 {
@@ -65,7 +65,7 @@
     captcha_whitelist                    = (?SETS):empty() :: gb_sets:set(),
     mam                                  = false :: boolean(),
     pubsub                               = <<"">> :: binary(),
-    lang                                 = ejabberd_config:get_mylang() :: binary()
+    lang                                 = ejabberd_option:language() :: binary()
 }).
 
 -type config() :: #config{}.
@@ -91,8 +91,8 @@
 {
     message_time    = 0 :: integer(),
     presence_time   = 0 :: integer(),
-    message_shaper  = none :: shaper:shaper(),
-    presence_shaper = none :: shaper:shaper(),
+    message_shaper  = none :: ejabberd_shaper:shaper(),
+    presence_shaper = none :: ejabberd_shaper:shaper(),
     message :: message() | undefined,
     presence :: {binary(), presence()} | undefined
 }).
@@ -102,21 +102,29 @@
     room                    = <<"">> :: binary(),
     host                    = <<"">> :: binary(),
     server_host             = <<"">> :: binary(),
-    access                  = {none,none,none,none} :: {atom(), atom(), atom(), atom()},
+    access                  = {none,none,none,none,none} :: {atom(), atom(), atom(), atom(), atom()},
     jid                     = #jid{} :: jid(),
     config                  = #config{} :: config(),
-    users                   = (?DICT):new() :: dict:dict(),
-    subscribers             = (?DICT):new() :: dict:dict(),
-    subscriber_nicks        = (?DICT):new() :: dict:dict(),
+    users                   = #{} :: users(),
+    subscribers             = #{} :: subscribers(),
+    subscriber_nicks        = #{} :: subscriber_nicks(),
     last_voice_request_time = treap:empty() :: treap:treap(),
-    robots                  = (?DICT):new() :: dict:dict(),
-    nicks                   = (?DICT):new() :: dict:dict(),
-    affiliations            = (?DICT):new() :: dict:dict(),
-    history                 :: lqueue(),
+    robots                  = #{} :: robots(),
+    nicks                   = #{} :: nicks(),
+    affiliations            = #{} :: affiliations(),
+    history                 = #lqueue{} :: lqueue(),
     subject                 = [] :: [text()],
     subject_author          = <<"">> :: binary(),
-    just_created            = false :: boolean(),
+    just_created            = erlang:system_time(microsecond) :: true | integer(),
     activity                = treap:empty() :: treap:treap(),
-    room_shaper             = none :: shaper:shaper(),
-    room_queue              :: p1_queue:queue() | undefined
+    room_shaper             = none :: ejabberd_shaper:shaper(),
+    room_queue              :: p1_queue:queue({message | presence, jid()}) | undefined,
+    hibernate_timer         = none :: reference() | none | hibernating
 }).
+
+-type users() :: #{ljid() => #user{}}.
+-type robots() :: #{jid() => {binary(), stanza()}}.
+-type nicks() :: #{binary() => [ljid()]}.
+-type affiliations() :: #{ljid() => affiliation() | {affiliation(), binary()}}.
+-type subscribers() :: #{ljid() => #subscriber{}}.
+-type subscriber_nicks() :: #{binary() => [ljid()]}.

include/mod_offline.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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_privacy.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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_proxy65.hrl

@@ -2,7 +2,7 @@
 %%% RFC 1928 constants.
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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_push.hrl

@@ -1,5 +1,5 @@
 %%%----------------------------------------------------------------------
-%%% ejabberd, Copyright (C) 2017-2018 ProcessOne
+%%% ejabberd, Copyright (C) 2017-2021 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,7 +18,7 @@
 %%%----------------------------------------------------------------------
 -record(push_session,
         {us = {<<"">>, <<"">>}                  :: {binary(), binary()},
-         timestamp = p1_time_compat:timestamp() :: erlang:timestamp(),
+         timestamp = erlang:timestamp()         :: erlang:timestamp(),
          service = {<<"">>, <<"">>, <<"">>}     :: ljid(),
          node = <<"">>                          :: binary(),
          xml                                    :: undefined | xmlel()}).

include/mod_roster.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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_vcard.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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_vcard_xupdate.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   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/mqtt.hrl

@@ -0,0 +1,209 @@
+%%%-------------------------------------------------------------------
+%%% @author Evgeny Khramtsov <ekhramtsov@process-one.net>
+%%% @copyright (C) 2002-2021 ProcessOne, SARL. All Rights Reserved.
+%%%
+%%% Licensed under the Apache License, Version 2.0 (the "License");
+%%% you may not use this file except in compliance with the License.
+%%% You may obtain a copy of the License at
+%%%
+%%%     http://www.apache.org/licenses/LICENSE-2.0
+%%%
+%%% Unless required by applicable law or agreed to in writing, software
+%%% distributed under the License is distributed on an "AS IS" BASIS,
+%%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%%% See the License for the specific language governing permissions and
+%%% limitations under the License.
+%%%
+%%%-------------------------------------------------------------------
+-define(MQTT_VERSION_4, 4).
+-define(MQTT_VERSION_5, 5).
+
+-record(connect, {proto_level             = 4     :: non_neg_integer(),
+		  will                            :: undefined | publish(),
+		  clean_start             = true  :: boolean(),
+		  keep_alive              = 0     :: non_neg_integer(),
+		  client_id               = <<>>  :: binary(),
+		  username                = <<>>  :: binary(),
+		  password                = <<>>  :: binary(),
+                  will_properties         = #{}   :: properties(),
+                  properties              = #{}   :: properties()}).
+-record(connack, {session_present = false    :: boolean(),
+		  code            = success  :: reason_code(),
+                  properties      = #{}      :: properties()}).
+
+-record(publish, {id :: undefined | non_neg_integer(),
+		  dup = false :: boolean(),
+		  qos = 0 :: qos(),
+		  retain = false :: boolean(),
+		  topic :: binary(),
+		  payload :: binary(),
+                  properties = #{} :: properties(),
+		  meta = #{} :: map()}).
+-record(puback, {id :: non_neg_integer(),
+                 code = success :: reason_code(),
+                 properties = #{} :: properties()}).
+-record(pubrec, {id :: non_neg_integer(),
+                 code = success :: reason_code(),
+                 properties = #{} :: properties()}).
+-record(pubrel, {id :: non_neg_integer(),
+                 code = success :: reason_code(),
+                 properties = #{} :: properties(),
+                 meta = #{} :: map()}).
+-record(pubcomp, {id :: non_neg_integer(),
+                  code = success :: reason_code(),
+                  properties = #{} :: properties()}).
+
+-record(subscribe, {id :: non_neg_integer(),
+		    filters :: [{binary(), sub_opts()}],
+                    properties = #{} :: properties(),
+                    meta = #{} :: map()}).
+-record(suback, {id :: non_neg_integer(),
+		 codes = [] :: [char() | reason_code()],
+                 properties = #{} :: properties()}).
+
+-record(unsubscribe, {id :: non_neg_integer(),
+		      filters :: [binary()],
+                      properties = #{} :: properties(),
+                      meta = #{} :: map()}).
+-record(unsuback, {id :: non_neg_integer(),
+                   codes = [] :: [reason_code()],
+                   properties = #{} :: properties()}).
+
+-record(pingreq, {meta = #{} :: map()}).
+-record(pingresp, {}).
+
+-record(disconnect, {code = 'normal-disconnection' :: reason_code(),
+                     properties = #{} :: properties()}).
+
+-record(auth, {code = success :: reason_code(),
+               properties = #{} :: properties()}).
+
+-record(sub_opts, {qos = 0 :: qos(),
+                   no_local = false :: boolean(),
+                   retain_as_published = false :: boolean(),
+                   retain_handling = 0 :: 0..2}).
+
+-type qos() :: 0|1|2.
+-type sub_opts() :: #sub_opts{}.
+-type utf8_pair() :: {binary(), binary()}.
+-type properties() :: #{assigned_client_identifier => binary(),
+			authentication_data => binary(),
+			authentication_method => binary(),
+			content_type => binary(),
+			correlation_data => binary(),
+			maximum_packet_size => pos_integer(),
+			maximum_qos => 0|1,
+			message_expiry_interval => non_neg_integer(),
+			payload_format_indicator => binary | utf8,
+			reason_string => binary(),
+			receive_maximum => pos_integer(),
+			request_problem_information => boolean(),
+			request_response_information => boolean(),
+			response_information => binary(),
+			response_topic => binary(),
+			retain_available => boolean(),
+			server_keep_alive => non_neg_integer(),
+			server_reference => binary(),
+			session_expiry_interval => non_neg_integer(),
+			shared_subscription_available => boolean(),
+			subscription_identifier => [non_neg_integer()] | non_neg_integer(),
+			subscription_identifiers_available => boolean(),
+			topic_alias => pos_integer(),
+			topic_alias_maximum => non_neg_integer(),
+			user_property => [utf8_pair()],
+			wildcard_subscription_available => boolean(),
+			will_delay_interval => non_neg_integer()}.
+-type property() :: assigned_client_identifier |
+                    authentication_data |
+                    authentication_method |
+                    content_type |
+                    correlation_data |
+                    maximum_packet_size |
+                    maximum_qos |
+                    message_expiry_interval |
+                    payload_format_indicator |
+                    reason_string |
+                    receive_maximum |
+                    request_problem_information |
+                    request_response_information |
+                    response_information |
+                    response_topic |
+                    retain_available |
+                    server_keep_alive |
+                    server_reference |
+                    session_expiry_interval |
+                    shared_subscription_available |
+                    subscription_identifier |
+                    subscription_identifiers_available |
+                    topic_alias |
+                    topic_alias_maximum |
+                    user_property |
+                    wildcard_subscription_available |
+                    will_delay_interval.
+-type reason_code() :: 'success' |
+                       'normal-disconnection' |
+                       'granted-qos-0' |
+                       'granted-qos-1' |
+                       'granted-qos-2' |
+                       'disconnect-with-will-message' |
+                       'no-matching-subscribers' |
+                       'no-subscription-existed' |
+                       'continue-authentication' |
+                       're-authenticate' |
+                       'unspecified-error' |
+                       'malformed-packet' |
+                       'protocol-error' |
+                       'implementation-specific-error' |
+                       'unsupported-protocol-version' |
+                       'client-identifier-not-valid' |
+                       'bad-user-name-or-password' |
+                       'not-authorized' |
+                       'server-unavailable' |
+                       'server-busy' |
+                       'banned' |
+                       'server-shutting-down' |
+                       'bad-authentication-method' |
+                       'keep-alive-timeout' |
+                       'session-taken-over' |
+                       'topic-filter-invalid' |
+                       'topic-name-invalid' |
+                       'packet-identifier-in-use' |
+                       'packet-identifier-not-found' |
+                       'receive-maximum-exceeded' |
+                       'topic-alias-invalid' |
+                       'packet-too-large' |
+                       'message-rate-too-high' |
+                       'quota-exceeded' |
+                       'administrative-action' |
+                       'payload-format-invalid' |
+                       'retain-not-supported' |
+                       'qos-not-supported' |
+                       'use-another-server' |
+                       'server-moved' |
+                       'shared-subscriptions-not-supported' |
+                       'connection-rate-exceeded' |
+                       'maximum-connect-time' |
+                       'subscription-identifiers-not-supported' |
+                       'wildcard-subscriptions-not-supported'.
+
+-type connect() :: #connect{}.
+-type connack() :: #connack{}.
+-type publish() :: #publish{}.
+-type puback() :: #puback{}.
+-type pubrel() :: #pubrel{}.
+-type pubrec() :: #pubrec{}.
+-type pubcomp() :: #pubcomp{}.
+-type subscribe() :: #subscribe{}.
+-type suback() :: #suback{}.
+-type unsubscribe() :: #unsubscribe{}.
+-type unsuback() :: #unsuback{}.
+-type pingreq() :: #pingreq{}.
+-type pingresp() :: #pingresp{}.
+-type disconnect() :: #disconnect{}.
+-type auth() :: #auth{}.
+
+-type mqtt_packet() :: connect() | connack() | publish() | puback() |
+		       pubrel() | pubrec() | pubcomp() | subscribe() |
+		       suback() | unsubscribe() | unsuback() | pingreq() |
+		       pingresp() | disconnect() | auth().
+-type mqtt_version() :: ?MQTT_VERSION_4 | ?MQTT_VERSION_5.

include/pubsub.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2021   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -26,8 +26,8 @@
 -define(MAXITEMS, 10).
 
 %% this is currently a hard limit.
-%% Would be nice to have it configurable. 
--define(MAX_PAYLOAD_SIZE, 60000).
+%% Would be nice to have it configurable.
+-define(MAX_PAYLOAD_SIZE, 250000).
 
 %% -------------------------------
 %% Pubsub types
@@ -58,7 +58,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 sql.
+%% indexing nodes, as this can be useful with external backends such as sql.
 
 -type(itemId() :: binary()).
 %% @type itemId() = string().
@@ -84,7 +84,7 @@
      Value::binary() | [binary()] | boolean()
 }).
 
--type(subOptions() :: [mod_pubsub:subOption(),...]).
+-type(subOptions() :: [mod_pubsub:subOption()]).
 
 -type(pubOption() ::
     {Option::binary(),
@@ -129,13 +129,13 @@
     id                  ,% :: mod_pubsub:nodeIdx(),
     parents = []        ,% :: [mod_pubsub:nodeId(),...],
     type    = <<"flat">>,% :: binary(),
-    owners  = []        ,% :: [jlib:ljid(),...],
+    owners  = []        ,% :: [jid:ljid(),...],
     options = []        % :: mod_pubsub:nodeOptions()
 }).
 
 -record(pubsub_state,
 {
-    stateid               ,% :: {jlib:ljid(), mod_pubsub:nodeIdx()},
+    stateid               ,% :: {jid:ljid(), mod_pubsub:nodeIdx()},
     nodeidx               ,% :: mod_pubsub:nodeIdx(),
     items         = []    ,% :: [mod_pubsub:itemId(),...],
     affiliation   = 'none',% :: mod_pubsub:affiliation(),
@@ -146,8 +146,8 @@
 {
     itemid                           ,% :: {mod_pubsub:itemId(), mod_pubsub:nodeIdx()},
     nodeidx                          ,% :: mod_pubsub:nodeIdx(),
-    creation     = {unknown, unknown},% :: {erlang:timestamp(), jlib:ljid()},
-    modification = {unknown, unknown},% :: {erlang:timestamp(), jlib:ljid()},
+    creation     = {unknown, unknown},% :: {erlang:timestamp(), jid:ljid()},
+    modification = {unknown, unknown},% :: {erlang:timestamp(), jid:ljid()},
     payload      = []                % :: mod_pubsub:payload()
 }).
 
@@ -161,7 +161,7 @@
 {
     nodeid   ,% :: {binary(), mod_pubsub:nodeIdx()},
     itemid   ,% :: mod_pubsub:itemId(),
-    creation ,% :: {erlang:timestamp(), jlib:ljid()},
+    creation ,% :: {erlang:timestamp(), jid:ljid()},
     payload  % :: mod_pubsub:payload()
 }).
 

lib/ct_formatter.ex

@@ -1,130 +0,0 @@
-defmodule ExUnit.CTFormatter do
-  @moduledoc false
-
-  use GenEvent
-
-  import ExUnit.Formatter, only: [format_time: 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/config/config.ex

@@ -23,7 +23,7 @@ defmodule Ejabberd.Config do
   # Could be also possible to interrupt the compilation&execution by throwing
   # an exception if necessary.
   def __before_compile__(_env) do
-    get_modules_parsed_in_order
+    get_modules_parsed_in_order()
     |> EjabberdModule.validate
     |> EjabberdLogger.log_errors
   end
@@ -48,9 +48,9 @@ defmodule Ejabberd.Config do
   Returns a list with all the opts, formatted for ejabberd.
   """
   def get_ejabberd_opts do
-    get_general_opts
-    |> Dict.put(:modules, get_modules_parsed_in_order())
-    |> Dict.put(:listeners, get_listeners_parsed_in_order())
+    get_general_opts()
+    |> Map.put(:modules, get_modules_parsed_in_order())
+    |> Map.put(:listeners, get_listeners_parsed_in_order())
     |> Ejabberd.Config.OptsFormatter.format_opts_for_ejabberd
   end
 

lib/ejabberd/config/ejabberd_module.ex

@@ -12,7 +12,6 @@ defmodule Ejabberd.Config.EjabberdModule do
   defstruct [:module, :attrs]
 
   alias Ejabberd.Config.EjabberdModule
-  alias Ejabberd.Config.Attr
   alias Ejabberd.Config.Validation
 
   @doc """

lib/ejabberd/config/logger/ejabberd_logger.ex

@@ -21,7 +21,7 @@ defmodule Ejabberd.Config.EjabberdLogger do
   defp do_log_errors({:attribute, errors}), do: Enum.each errors, &log_attribute_error/1
   defp do_log_errors({:dependency, errors}), do: Enum.each errors, &log_dependency_error/1
 
-  defp log_attribute_error({{attr_name, val}, :attr_not_supported}), do:
+  defp log_attribute_error({{attr_name, _val}, :attr_not_supported}), do:
     IO.puts "[ WARN ] Annotation @#{attr_name} is not supported."
 
   defp log_attribute_error({{attr_name, val}, :type_not_supported}), do:

lib/ejabberd/config/validator/validation.ex

@@ -7,9 +7,7 @@ defmodule Ejabberd.Config.Validation do
   @type mod_validation_result :: {:ok, EjabberdModule.t} | {:error, EjabberdModule.t, map}
 
   alias Ejabberd.Config.EjabberdModule
-  alias Ejabberd.Config.Attr
   alias Ejabberd.Config.Validator
-  alias Ejabberd.Config.ValidatorUtility
 
   @doc """
   Given a module or a list of modules it runs validators on them

lib/ejabberd/config/validator/validator_attrs.ex

@@ -18,7 +18,7 @@ defmodule Ejabberd.Config.Validator.Attrs do
   def validate({modules, mod, errors}) do
     errors = Enum.reduce mod.attrs, errors, fn(attr, err) ->
       case Attr.validate(attr) do
-        {:ok, attr} -> err
+        {:ok, _attr} -> err
         {:error, attr, cause} -> put_error(err, :attribute, {attr, cause})
       end
     end

lib/ejabberd/logger.ex

@@ -1,9 +1,9 @@
 defmodule Ejabberd.Logger do
 
-  def critical(message, args \\ []), do: :lager.log(:critical, [], message, args)
-  def error(message, args \\ []),    do: :lager.log(:error, [], message, args)
-  def warning(message, args \\ []),  do: :lager.log(:warning, [], message, args)
-  def info(message, args \\ []),     do: :lager.log(:info, [], message, args)
-  def debug(message, args \\ []),    do: :lager.log(:debug, [], message, args)
+  def critical(message, args \\ []), do: :logger.critical(message, args)
+  def error(message, args \\ []),    do: :logger.error(message, args)
+  def warning(message, args \\ []),  do: :logger.warning(message, args)
+  def info(message, args \\ []),     do: :logger.info(message, args)
+  def debug(message, args \\ []),    do: :logger.debug( message, args)
 
 end

lib/mix/tasks/deps.tree.ex

@@ -15,7 +15,7 @@ defmodule Mix.Tasks.Ejabberd.Deps.Tree do
     # First we need to start manually the store to be available
     # during the compilation of the config file.
     Ejabberd.Config.Store.start_link
-    Ejabberd.Config.init(:ejabberd_config.get_ejabberd_config_path())
+    Ejabberd.Config.init(:ejabberd_config.path())
 
     Mix.shell.info "ejabberd modules"
 
@@ -40,7 +40,7 @@ defmodule Mix.Tasks.Ejabberd.Deps.Tree do
     end
   end
 
-  defp build_dependency_tree(mods, mod, []), do: %{module: mod, dependency: []}
+  defp build_dependency_tree(_mods, mod, []), do: %{module: mod, dependency: []}
   defp build_dependency_tree(mods, mod, deps) when is_list(deps) do
     dependencies = Enum.map deps, fn dep ->
       dep_deps = get_dependencies_of_mod(mods, dep)
@@ -65,7 +65,7 @@ defmodule Mix.Tasks.Ejabberd.Deps.Tree do
 
   defp keep_only_mods_not_used_as_dep(mods, mods_used_as_dep) do
     Enum.filter mods, fn %{module: mod} ->
-      not mod in mods_used_as_dep
+      not (mod in mods_used_as_dep)
     end
   end
 

lib/mod_presence_demo.ex

@@ -17,4 +17,17 @@ defmodule ModPresenceDemo do
     info('Receive presence for #{user}')
     :none
   end
+
+  def depends(_host, _opts) do
+    []
+  end
+
+  def mod_options(_host) do
+    []
+  end
+
+  def mod_doc() do
+    %{:desc => 'This is just a demonstration.'}
+  end
+
 end

mix.exs

@@ -3,7 +3,7 @@ defmodule Ejabberd.Mixfile do
 
   def project do
     [app: :ejabberd,
-     version: "18.6.0",
+     version: "21.4.0",
      description: description(),
      elixir: "~> 1.4",
      elixirc_paths: ["lib"],
@@ -19,18 +19,19 @@ defmodule Ejabberd.Mixfile do
 
   def description do
     """
-    Robust, ubiquitous and massively scalable Jabber / XMPP Instant Messaging platform.
+    Robust, Ubiquitous and Massively Scalable Messaging Platform (XMPP, MQTT, SIP Server)
     """
   end
 
   def application do
     [mod: {:ejabberd_app, []},
-     applications: [:ssl, :os_mon],
+     applications: [:kernel, :stdlib, :sasl, :ssl],
      included_applications: [:lager, :mnesia, :inets, :p1_utils, :cache_tab,
-                             :fast_tls, :stringprep, :fast_xml, :xmpp,
+                             :fast_tls, :stringprep, :fast_xml, :xmpp, :mqtree,
                              :stun, :fast_yaml, :esip, :jiffy, :p1_oauth2,
-                             :eimp, :base64url, :jose]
-                         ++ cond_apps()]
+                             :eimp, :base64url, :jose, :pkix, :os_mon, :yconf,
+                             :p1_acme, :idna]
+     ++ cond_apps()]
   end
 
   defp if_function_exported(mod, fun, arity, okResult) do
@@ -42,78 +43,110 @@ defmodule Ejabberd.Mixfile do
     end
   end
 
+  defp if_version_above(ver, okResult) do
+    if :erlang.system_info(:otp_release) > ver do
+      okResult
+    else
+      []
+    end
+  end
+
+  defp if_version_below(ver, okResult) do
+    if :erlang.system_info(:otp_release) < ver do
+      okResult
+    else
+      []
+    end
+  end
+
   defp erlc_options do
     # Use our own includes + includes from all dependencies
     includes = ["include"] ++ deps_include(["fast_xml", "xmpp", "p1_utils"])
-    [:debug_info, {:d, :ELIXIR_ENABLED}] ++ cond_options() ++ Enum.map(includes, fn(path) -> {:i, path} end) ++
-    if_function_exported(:crypto, :strong_rand_bytes, 1, [{:d, :STRONG_RAND_BYTES}]) ++
-    if_function_exported(:rand, :uniform, 1, [{:d, :RAND_UNIFORM}]) ++
-    if_function_exported(:gb_sets, :iterator_from, 2, [{:d, :GB_SETS_ITERATOR_FROM}]) ++
-    if_function_exported(:public_key, :short_name_hash, 1, [{:d, :SHORT_NAME_HASH}])
+    result = [:debug_info, {:d, :ELIXIR_ENABLED}] ++
+             cond_options() ++
+             Enum.map(includes, fn (path) -> {:i, path} end) ++
+             if_version_above('20', [{:d, :DEPRECATED_GET_STACKTRACE}]) ++
+             if_version_below('21', [{:d, :USE_OLD_HTTP_URI}]) ++
+             if_version_below('22', [{:d, :LAGER}]) ++
+             if_version_below('23', [{:d, :USE_OLD_CRYPTO_HMAC}]) ++
+             if_version_below('23', [{:d, :USE_OLD_PG2}]) ++
+             if_version_below('24', [{:d, :COMPILER_REPORTS_ONLY_LINES}]) ++
+             if_function_exported(:erl_error, :format_exception, 6, [{:d, :HAVE_ERL_ERROR}])
+    defines = for {:d, value} <- result, do: {:d, value}
+    result ++ [{:d, :ALL_DEFS, defines}]
   end
 
   defp cond_options do
-    for {:true, option} <- [{config(:graphics), {:d, :GRAPHICS}}], do:
+    for {:true, option} <- [{config(:sip), {:d, :SIP}},
+                            {config(:stun), {:d, :STUN}},
+                            {config(:roster_gateway_workaround), {:d, :ROSTER_GATWAY_WORKAROUND}},
+                            {config(:new_sql_schema), {:d, :NEW_SQL_SCHEMA}}
+                           ], do:
     option
   end
 
   defp deps do
-    [{:lager, "~> 3.4.0"},
-     {:p1_utils, "~> 1.0"},
-     {:fast_xml, "~> 1.1"},
-     {:xmpp, "~> 1.2"},
+    [{:base64url, "~> 0.0.1"},
      {:cache_tab, "~> 1.0"},
-     {:stringprep, "~> 1.0"},
-     {:fast_yaml, "~> 1.0"},
-     {:fast_tls, "~> 1.0"},
-     {:stun, "~> 1.0"},
-     {:esip, "~> 1.0"},
-     {:p1_mysql, "~> 1.0"},
-     {:p1_pgsql, "~> 1.1"},
-     {:jiffy, "~> 0.14.7"},
-     {:p1_oauth2, "~> 0.6.1"},
-     {:distillery, "~> 1.0"},
-     {:ex_doc, ">= 0.0.0", only: :dev},
+     {:distillery, "~> 2.0"},
      {:eimp, "~> 1.0"},
-     {:base64url, "~> 0.0.1"},
-     {:jose, "~> 1.8"}]
+     {:esip, "~> 1.0"},
+     {:ex_doc, ">= 0.0.0", only: :dev},
+     {:fast_tls, "~> 1.1"},
+     {:fast_xml, "~> 1.1"},
+     {:fast_yaml, "~> 1.0"},
+     {:idna, "~> 6.0"},
+     {:jiffy, "~> 1.0.5"},
+     {:jose, "~> 1.8"},
+     {:lager, "~> 3.6.0"},
+     {:mqtree, "~> 1.0"},
+     {:p1_acme, "~> 1.0"},
+     {:p1_mysql, "~> 1.0"},
+     {:p1_oauth2, "~> 0.6"},
+     {:p1_pgsql, "~> 1.1"},
+     {:p1_utils, "~> 1.0"},
+     {:pkix, "~> 1.0"},
+     {:stringprep, "~> 1.0"},
+     {:stun, "~> 1.0"},
+     {:xmpp, "~> 1.5"},
+     {:yconf, "~> 1.0"}]
     ++ cond_deps()
   end
 
   defp deps_include(deps) do
-    base = case Mix.Project.deps_paths()[:ejabberd] do
-      nil -> "deps"
-      _ -> ".."
+    base = if Mix.Project.umbrella?() do
+      "../../deps"
+    else
+      case Mix.Project.deps_paths()[:ejabberd] do
+        nil -> "deps"
+        _ -> ".."
+      end
     end
     Enum.map(deps, fn dep -> base<>"/#{dep}/include" end)
   end
 
   defp cond_deps do
-    for {:true, dep} <- [{config(:sqlite), {:sqlite3, "~> 1.1"}},
-                         {config(:riak), {:riakc, "~> 2.4"}},
+    for {:true, dep} <- [{config(:pam), {:epam, "~> 1.0"}},
                          {config(:redis), {:eredis, "~> 1.0"}},
                          {config(:zlib), {:ezlib, "~> 1.0"}},
-                         {config(:iconv), {:iconv, "~> 1.0"}},
-                         {config(:pam), {:epam, "~> 1.0"}},
-                         {config(:tools), {:luerl, "~> 0.3.1"}},
-                         {config(:tools), {:meck, "~> 0.8.4"}},
-                         {config(:tools), {:moka, github: "processone/moka", tag: "1.0.5c"}}], do:
+                         {config(:lua), {:luerl, "~> 0.3.1"}},
+                         {config(:sqlite), {:sqlite3, "~> 1.1"}}], do:
       dep
   end
 
   defp cond_apps do
     for {:true, app} <- [{config(:redis), :eredis},
                          {config(:mysql), :p1_mysql},
+                         {config(:odbc), :odbc},
                          {config(:pgsql), :p1_pgsql},
                          {config(:sqlite), :sqlite3},
-                         {config(:zlib), :ezlib},
-                         {config(:iconv), :iconv}], do:
+                         {config(:zlib), :ezlib}], do:
       app
   end
 
   defp package do
     [# These are the default files included in the package
-      files: ["lib", "src", "priv", "mix.exs", "include", "README.md", "COPYING"],
+      files: ["lib", "src", "priv", "mix.exs", "include", "README.md", "COPYING", "rebar.config", "rebar.config.script"],
       maintainers: ["ProcessOne"],
       licenses: ["GPLv2"],
       links: %{"Site" => "https://www.ejabberd.im",
@@ -125,7 +158,7 @@ defmodule Ejabberd.Mixfile do
   defp vars do
     case :file.consult("vars.config") do
       {:ok,config} -> config
-      _ -> [zlib: true, iconv: false]
+      _ -> [zlib: true]
     end
   end
 

mix.lock

@@ -1,35 +1,40 @@
 %{
-  "base64url": {:hex, :base64url, "0.0.1", "36a90125f5948e3afd7be97662a1504b934dd5dac78451ca6e9abf85a10286be", [:rebar], [], "hexpm"},
-  "cache_tab": {:hex, :cache_tab, "1.0.14", "e68d24789ff596a7cb4f08780f72a725f3f18e93dee486559b261df904234871", [:rebar3], [{:p1_utils, "1.0.12", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
-  "distillery": {:hex, :distillery, "1.5.3", "b2f4fc34ec71ab4f1202a796f9290e068883b042319aa8c9aa45377ecac8597a", [:mix], [], "hexpm"},
-  "earmark": {:hex, :earmark, "1.2.5", "4d21980d5d2862a2e13ec3c49ad9ad783ffc7ca5769cf6ff891a4553fbaae761", [:mix], [], "hexpm"},
-  "eimp": {:hex, :eimp, "1.0.6", "087fc92daf7b03bac4aada8ea6063d9034d4b9088be24e050ff73323c8444a04", [:rebar3], [{:p1_utils, "1.0.12", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
-  "epam": {:hex, :epam, "1.0.4", "2a5e40cbf9b2cf41df515782894c3b33c81b8ad32fff2fc847c3f725071dfaed", [:rebar3], [], "hexpm"},
-  "eredis": {:hex, :eredis, "1.1.0", "8d8d74496f35216679b97726b75fb1c8715e99dd7f3ef9f9824a2264c3e0aac0", [:rebar3], [], "hexpm"},
-  "esip": {:hex, :esip, "1.0.24", "c14efd0817012721dad3d1c36816e4d113adc86d185503f8c08f7faa11082018", [:rebar3], [{:fast_tls, "1.0.23", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.12", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stun, "1.0.23", [hex: :stun, repo: "hexpm", optional: false]}], "hexpm"},
-  "ex_doc": {:hex, :ex_doc, "0.18.3", "f4b0e4a2ec6f333dccf761838a4b253d75e11f714b85ae271c9ae361367897b7", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"},
-  "ezlib": {:hex, :ezlib, "1.0.4", "2434e4bb549cb060d5ac02261ba48fbe1a69b2ae4e1bf7485a3b27b3f3ec618d", [:rebar3], [], "hexpm"},
-  "fast_tls": {:hex, :fast_tls, "1.0.23", "5fd44b84b60f1caeb82270aae842599997e2ef70a628c954e494a6613cc6f026", [:rebar3], [{:p1_utils, "1.0.12", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
-  "fast_xml": {:hex, :fast_xml, "1.1.31", "7d85dd50533737adbaa95472c962ff8ad3d434ced1dbd04b83465edc2a4363b6", [:rebar3], [{:p1_utils, "1.0.12", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
-  "fast_yaml": {:hex, :fast_yaml, "1.0.15", "55a8ff117e2bb44fda5ca96c53473799f864c865dc63a3b598cb626001207cab", [:rebar3], [{:p1_utils, "1.0.12", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
-  "goldrush": {:hex, :goldrush, "0.1.9", "f06e5d5f1277da5c413e84d5a2924174182fb108dabb39d5ec548b27424cd106", [:rebar3], [], "hexpm"},
-  "hamcrest": {:hex, :basho_hamcrest, "0.4.1", "fb7b2c92d252a1e9db936750b86089addaebeb8f87967fb4bbdda61e8863338e", [:make, :mix, :rebar3], [], "hexpm"},
-  "iconv": {:hex, :iconv, "1.0.8", "772a19153e9546b9f17206931ece321220feccfd0b3f5a5509dc92108326c2f9", [:rebar3], [{:p1_utils, "1.0.12", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
-  "jiffy": {:hex, :jiffy, "0.14.13", "225a9a35e26417832c611526567194b4d3adc4f0dfa5f2f7008f4684076f2a01", [:rebar3], [], "hexpm"},
-  "jose": {:hex, :jose, "1.8.4", "7946d1e5c03a76ac9ef42a6e6a20001d35987afd68c2107bcd8f01a84e75aa73", [:mix, :rebar3], [{:base64url, "~> 0.0.1", [hex: :base64url, repo: "hexpm", optional: false]}], "hexpm"},
-  "lager": {:hex, :lager, "3.4.2", "150b9a17b23ae6d3265cc10dc360747621cf217b7a22b8cddf03b2909dbf7aa5", [:rebar3], [{:goldrush, "0.1.9", [hex: :goldrush, repo: "hexpm", optional: false]}], "hexpm"},
-  "luerl": {:hex, :luerl, "0.3.1", "5412807630aac1aaf59ffe5a1bc09259c447b4faeb1d3fe2d4ef41b87676cb04", [:rebar3], [], "hexpm"},
-  "meck": {:hex, :meck, "0.8.10", "455aaef8403be46752272206613e7a15467c014d40994b22fb54cde4d1ff7075", [:rebar3], [], "hexpm"},
-  "moka": {:git, "https://github.com/processone/moka.git", "3eed3a6dd7dedb70a6cd18f86c7561a18626eb3b", [tag: "1.0.5c"]},
-  "p1_mysql": {:hex, :p1_mysql, "1.0.6", "1fb48a907a7fe214a78be15a08f8ebfae2db424c4d9886891a298a395cc3afce", [:rebar3], [], "hexpm"},
-  "p1_oauth2": {:hex, :p1_oauth2, "0.6.3", "fbd91ba86bd7f03d2a4f6e62affa86bab9930abfd6b473d61eefb148f246cd46", [:rebar3], [], "hexpm"},
-  "p1_pgsql": {:hex, :p1_pgsql, "1.1.6", "631004602b06ca6f55d759001f180185685c7097e583f3b0f7dd9b8e05ba5db1", [:rebar3], [], "hexpm"},
-  "p1_utils": {:hex, :p1_utils, "1.0.12", "4304223a2b78d8031e980ae18d6b6d83f764cf2a91c779b2df7cbdfde73acbf8", [:rebar3], [], "hexpm"},
-  "riak_pb": {:hex, :riak_pb, "2.3.2", "48ffbf66dbb3f136ab9a7134bac4e496754baa5ef58c4f50a61326736d996390", [:make, :mix, :rebar3], [{:hamcrest, "~> 0.4.1", [hex: :basho_hamcrest, repo: "hexpm", optional: false]}], "hexpm"},
-  "riakc": {:hex, :riakc, "2.5.3", "6132d9e687a0dfd314b2b24c4594302ca8b55568a5d733c491d8fb6cd4004763", [:make, :mix, :rebar3], [{:riak_pb, "~> 2.3", [hex: :riak_pb, repo: "hexpm", optional: false]}], "hexpm"},
-  "samerlib": {:git, "https://github.com/processone/samerlib", "fbbba035b1548ac4e681df00d61bf609645333a0", [tag: "0.8.0c"]},
-  "sqlite3": {:hex, :sqlite3, "1.1.6", "4ea71af0b45908b5f02c9b09e4c87177039ef404f20accb35049cd8924cc417c", [:rebar3], [], "hexpm"},
-  "stringprep": {:hex, :stringprep, "1.0.12", "3364897b9a376b2fb5e429944fd34ca0b562b44c9e5acf4e0299564371a6fbef", [:rebar3], [{:p1_utils, "1.0.12", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
-  "stun": {:hex, :stun, "1.0.23", "79982f6a26dc65b58bb24082e8bbfba83a5228ddd6407753e9c3092fb45ba916", [:rebar3], [{:fast_tls, "1.0.23", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.12", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
-  "xmpp": {:hex, :xmpp, "1.2.1", "9c94ab556559dc6c3bf4963f756a02e9771dd220f5891d57fc30b76c3d71cb06", [:rebar3], [{:fast_xml, "1.1.31", [hex: :fast_xml, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.12", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stringprep, "1.0.12", [hex: :stringprep, repo: "hexpm", optional: false]}], "hexpm"},
+  "artificery": {:hex, :artificery, "0.4.3", "0bc4260f988dcb9dda4b23f9fc3c6c8b99a6220a331534fdf5bf2fd0d4333b02", [:mix], [], "hexpm", "12e95333a30e20884e937abdbefa3e7f5e05609c2ba8cf37b33f000b9ffc0504"},
+  "base64url": {:hex, :base64url, "0.0.1", "36a90125f5948e3afd7be97662a1504b934dd5dac78451ca6e9abf85a10286be", [:rebar], [], "hexpm", "fab09b20e3f5db886725544cbcf875b8e73ec93363954eb8a1a9ed834aa8c1f9"},
+  "cache_tab": {:hex, :cache_tab, "1.0.28", "551beb14325c34aa7e1e5d65e5fdaa1a87b0325393cfaf8641c0068364d84f69", [:rebar3], [{:p1_utils, "1.0.22", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "17451084f2cc0a4a6304e12ae5c9ceef13d70ad070c9c406317e80abb7677889"},
+  "distillery": {:hex, :distillery, "2.1.1", "f9332afc2eec8a1a2b86f22429e068ef35f84a93ea1718265e740d90dd367814", [:mix], [{:artificery, "~> 0.2", [hex: :artificery, repo: "hexpm", optional: false]}], "hexpm", "bbc7008b0161a6f130d8d903b5b3232351fccc9c31a991f8fcbf2a12ace22995"},
+  "earmark": {:hex, :earmark, "1.4.3", "364ca2e9710f6bff494117dbbd53880d84bebb692dafc3a78eb50aa3183f2bfd", [:mix], [], "hexpm", "8cf8a291ebf1c7b9539e3cddb19e9cef066c2441b1640f13c34c1d3cfc825fec"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.12", "b245e875ec0a311a342320da0551da407d9d2b65d98f7a9597ae078615af3449", [:mix], [], "hexpm", "711e2cc4d64abb7d566d43f54b78f7dc129308a63bc103fbd88550d2174b3160"},
+  "eimp": {:hex, :eimp, "1.0.20", "4b46fa8623690ba602fc1c509dd5d38bdf7c2188b694064bf144f36be600cf02", [:rebar3], [{:p1_utils, "1.0.22", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "531a1d07e5df83f6adf29f9bae93faa227ebfdcd92d2408a28630709eac3e979"},
+  "epam": {:hex, :epam, "1.0.10", "feb9cf1169c8e30609b13bc5f77a0d8213b425997bec1d05dfbccab024fde856", [:rebar3], [], "hexpm", "429a43b876fbef5d1accaadf8177a74933b37e069d6bcc08d74745b8c8f76f71"},
+  "eredis": {:hex, :eredis, "1.2.0", "0b8e9cfc2c00fa1374cd107ea63b49be08d933df2cf175e6a89b73dd9c380de4", [:rebar3], [], "hexpm", "d9b5abef2c2c8aba8f32aa018203e0b3dc8b1157773b254ab1d4c2002317f1e1"},
+  "esip": {:hex, :esip, "1.0.42", "ccd1f3aa1e8d7b5ffe51fc5df238b0d36b5f6cde67cef1dab24931ff03a0a836", [:rebar3], [{:fast_tls, "1.1.12", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.22", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stun, "1.0.43", [hex: :stun, repo: "hexpm", optional: false]}], "hexpm", "87e28b1344543ef9c1b24a60097ae3ceeedba0ff6487f20cdc7be53f087b9a4e"},
+  "ex_doc": {:hex, :ex_doc, "0.24.2", "e4c26603830c1a2286dae45f4412a4d1980e1e89dc779fcd0181ed1d5a05c8d9", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "e134e1d9e821b8d9e4244687fb2ace58d479b67b282de5158333b0d57c6fb7da"},
+  "ezlib": {:hex, :ezlib, "1.0.9", "b17136b48bcf73962446b06d4427b0b6f2be4550bb5190a18a2979640271e244", [:rebar3], [], "hexpm", "fafc60a0de6e982be38f793da7b220b87a0da2969eba8a878351442b35cc2fde"},
+  "fast_tls": {:hex, :fast_tls, "1.1.12", "b11997d96d4306abcd4cdb9ffa77ccfc0f826f64bed77ecaceb48b2dc46b9202", [:rebar3], [{:p1_utils, "1.0.22", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "c3d80828f5d985cba4c93660ffbf2c9b9cd831303382b97832dd66429fb16f8a"},
+  "fast_xml": {:hex, :fast_xml, "1.1.46", "bd563e1cdd8a397ed31a6e11f832ea9e4e90f84695104aa92b46224a887fc6ae", [:rebar3], [{:p1_utils, "1.0.22", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "2992a0b2fb649879936fd72498e8bf4202e4cc8356295e14ddf17d4220ac8c51"},
+  "fast_yaml": {:hex, :fast_yaml, "1.0.31", "a66d0e678341dc20680aece8e6fd566205a229981b5b3cfa698c66323b728da2", [:rebar3], [{:p1_utils, "1.0.22", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "8aa129e3384c5aa9f5f1597a1e3321a63a44860f3951f23eeed950bf0ee59643"},
+  "goldrush": {:hex, :goldrush, "0.1.9", "f06e5d5f1277da5c413e84d5a2924174182fb108dabb39d5ec548b27424cd106", [:rebar3], [], "hexpm", "99cb4128cffcb3227581e5d4d803d5413fa643f4eb96523f77d9e6937d994ceb"},
+  "idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "4bdd305eb64e18b0273864920695cb18d7a2021f31a11b9c5fbcd9a253f936e2"},
+  "jiffy": {:hex, :jiffy, "1.0.5", "a69b58faf7123534c20e1b0b7ae97ac52079ca02ed4b6989b4b380179cd63a54", [:rebar3], [], "hexpm", "b617a53f46ae84f20d0c38951367dc947a2cf8cff922aa5c6ac6b64b8b052289"},
+  "jose": {:hex, :jose, "1.9.0", "4167c5f6d06ffaebffd15cdb8da61a108445ef5e85ab8f5a7ad926fdf3ada154", [:mix, :rebar3], [{:base64url, "~> 0.0.1", [hex: :base64url, repo: "hexpm", optional: false]}], "hexpm", "6429c4fee52b2dda7861ee19a4f09c8c1ffa213bee3a1ec187828fde95d447ed"},
+  "lager": {:hex, :lager, "3.6.10", "6172b43ab720ac33914ccd0aeb21fdbdf88213847707d4b91e6af57b2ae5c4d2", [:rebar3], [{:goldrush, "0.1.9", [hex: :goldrush, repo: "hexpm", optional: false]}], "hexpm", "5d10499461826b79c5abee18bb594b3949cbdf76d9d9fd7e66d0a558137c21c9"},
+  "luerl": {:hex, :luerl, "0.3.1", "5412807630aac1aaf59ffe5a1bc09259c447b4faeb1d3fe2d4ef41b87676cb04", [:rebar3], [], "hexpm", "1bc011c7297e43aec762e53b17ecb15b0ff29f9546cd153110b343cf5b043f5f"},
+  "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"},
+  "makeup_elixir": {:hex, :makeup_elixir, "0.15.1", "b5888c880d17d1cc3e598f05cdb5b5a91b7b17ac4eaf5f297cb697663a1094dd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "db68c173234b07ab2a07f645a5acdc117b9f99d69ebf521821d89690ae6c6ec8"},
+  "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
+  "mqtree": {:hex, :mqtree, "1.0.13", "28c9eaa3a63624829c75f606588d584c3434aec3b615df452f5a539a97467f50", [:rebar3], [{:p1_utils, "1.0.22", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "2369ecb99b2ae3908e8c5c604ed4b96aab8f930ac1f1225e1c42ec25d6a65cc8"},
+  "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"},
+  "p1_acme": {:hex, :p1_acme, "1.0.12", "e51a9e178441669ac06fc5f335ed8ef3343fda67ec83bbbf9551c49967d5f401", [:rebar3], [{:idna, "~>6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:jiffy, "~>1.0.5", [hex: :jiffy, repo: "hexpm", optional: false]}, {:jose, "~>1.9.0", [hex: :jose, repo: "hexpm", optional: false]}, {:yconf, "~>1.0.11", [hex: :yconf, repo: "hexpm", optional: false]}], "hexpm", "9a98f523c656b159be3222c9834a07a83cd5f9dc83f8dec9233a457fceef99a6"},
+  "p1_mysql": {:hex, :p1_mysql, "1.0.18", "c636842cc7b56785de383e4ffacc5b74318dae09d9d1447f6eac8b4aac8bd8f4", [:rebar3], [], "hexpm", "4b5e001c554b9a2b9e32885ad43c7cc97d53ef8412d9bbe9491c01997935fbb8"},
+  "p1_oauth2": {:hex, :p1_oauth2, "0.6.9", "07c4527e0af10aa93e4df033f971c64aec01aa0806d6467bb0632f944b3a2309", [:rebar3], [], "hexpm", "924360cd9883cb773ae8166773241e1a9b3a70cad3034e038ab493b40b56d987"},
+  "p1_pgsql": {:hex, :p1_pgsql, "1.1.11", "8769ec7a2c4f480d443b90fdaa02519fbb459aa06c5fa6a99a0fbee683be9f7a", [:rebar3], [], "hexpm", "e4ef71713293717e8ace5fe717ddd63c618179597a6af79156af9be8c3ea851d"},
+  "p1_utils": {:hex, :p1_utils, "1.0.22", "10a70faa665d1f8f6995fa100d068b4d910ee2a0111fa3567e9d6232cbb86f21", [:rebar3], [], "hexpm", "0e49ff5586515e3c44901d6fb06b1473bda492d749f0b1705cbf9d96d4cd5a38"},
+  "pkix": {:hex, :pkix, "1.0.7", "a0b8c9011edeba702d7cb73fecef1eabe3ae89b3dcf4b8f33775e4f17a7a1304", [:rebar3], [], "hexpm", "104a9e0ecd9cc0e579d148a028189a6efe6420b241f3d319d8a65d898a078295"},
+  "sqlite3": {:hex, :sqlite3, "1.1.9", "10090161893843c9839d884855cafbb33c8ee3a2d6597443d66e6f94144dfd79", [:rebar3], [], "hexpm", "148ef74ee796efc13ffc6bb0e7f5feeb050f425e7335ff02c7415ca86819c0d0"},
+  "stringprep": {:hex, :stringprep, "1.0.25", "15062f6020777a51a96488f29ce9a2d83e3195f92fdf27f25acc462dff7d8d82", [:rebar3], [{:p1_utils, "1.0.22", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "8e0807d94a6927d1c3f8e76d584a2e3cdd9b4bcb02823eaf96629edf2a65b104"},
+  "stun": {:hex, :stun, "1.0.43", "5c58af3b87fde5e85552dfc085d565a8d899ef7bc0c3e97dea0ea45e3daf0a30", [:rebar3], [{:fast_tls, "1.1.12", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.22", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "6db03005a5f9931dc5c331d923cbe1c06b04f92921b47093dff8e3f0a18d7b36"},
+  "unicode_util_compat": {:hex, :unicode_util_compat, "0.4.1", "d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd", [:rebar3], [], "hexpm", "1d1848c40487cdb0b30e8ed975e34e025860c02e419cb615d255849f3427439d"},
+  "xmpp": {:hex, :xmpp, "1.5.3", "d61d8c90ffacd99bea4915c55dcee1829a053d43e0dc33b8ea66bab845cca8ed", [:rebar3], [{:ezlib, "1.0.9", [hex: :ezlib, repo: "hexpm", optional: false]}, {:fast_tls, "1.1.12", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:fast_xml, "1.1.46", [hex: :fast_xml, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.22", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stringprep, "1.0.25", [hex: :stringprep, repo: "hexpm", optional: false]}], "hexpm", "dca72f926769ed512e524b4369c7812095205f39e00b7e8b11530174a10a9d35"},
+  "yconf": {:hex, :yconf, "1.0.11", "081fe70e5d73a74d0bbad91c3876a1be0e84bd8539bba4cefef2d61cd3c92f9e", [:rebar3], [{:fast_yaml, "1.0.31", [hex: :fast_yaml, repo: "hexpm", optional: false]}], "hexpm", "6df4253e2d55592ad56b5cc29edb0981778ddb6656034a8625f70ffe24290a98"},
 }

plugins/override_deps_versions2.erl

@@ -1,4 +1,4 @@
--module(override_deps_versions).
+-module(override_deps_versions2).
 -export([preprocess/2, 'pre_update-deps'/2, new_replace/1, new_replace/0]).
 
 preprocess(Config, _Dirs) ->
@@ -55,7 +55,7 @@ replace_mod(Beam) ->
 		      Call = case Name of
 				 new ->
 				     [erl_syntax:application(
-					erl_syntax:abstract(override_deps_versions),
+					erl_syntax:abstract(override_deps_versions2),
 					erl_syntax:abstract(new_replace),
 					Args)];
 				 _ ->

plugins/override_opts.erl

@@ -9,6 +9,11 @@ override_opts(add, Config, Opts) ->
     lists:foldl(fun({Opt, Value}, Conf) ->
 			V = rebar_config:get_local(Conf, Opt, []),
 			rebar_config:set(Conf, Opt, V ++ Value)
+		end, Config, Opts);
+override_opts(del, Config, Opts) ->
+    lists:foldl(fun({Opt, Value}, Conf) ->
+			V = rebar_config:get_local(Conf, Opt, []),
+			rebar_config:set(Conf, Opt, V -- Value)
 		end, Config, Opts).
 
 preprocess(Config, _Dirs) ->
@@ -24,6 +29,8 @@ preprocess(Config, _Dirs) ->
 		      lists:foldl(fun({Type, AppName2, Opts}, Conf1) when
 					    AppName2 == AppName ->
 					  override_opts(Type, Conf1, Opts);
+				     ({Type, Opts}, Conf1a) ->
+					  override_opts(Type, Conf1a, Opts);
 				     (_, Conf2) ->
 					  Conf2
 				  end, C, TopOverrides);

priv/css/admin.css

@@ -243,7 +243,6 @@ p[dir=ltr] a {
 
   background: #3eaffa;
 
-  text-transform: uppercase;
   font-size: 0.75em;
   color: #fff;
 }
@@ -277,3 +276,11 @@ p.result {
 *.alignright {
   text-align: right;
 }
+.btn-danger:hover {
+	color: #fff;
+	background-color: #cb2431;
+}
+.btn-danger {
+	color: #cb2431;
+	transition: none;
+}

priv/lua/redis_sm.lua

@@ -0,0 +1,16 @@
+redis.replicate_commands()
+local cursor = redis.call('GET', KEYS[3]) or 0
+local scan_result = redis.call('HSCAN', KEYS[1], cursor, 'COUNT', ARGV[1])
+local newcursor = scan_result[1]
+local cursor = redis.call('SET', KEYS[3], newcursor)
+redis.call('EXPIRE', KEYS[3], 30)
+for key,value in ipairs(scan_result[2]) do
+   local uskey, sidkey = string.match(value, '(.*)||(.*)')
+   if uskey and sidkey then
+      redis.call('HDEL', uskey, sidkey)
+      redis.call('HDEL', KEYS[1], value)
+   else
+      redis.call('HDEL', KEYS[2], value)
+   end
+end
+return newcursor

priv/msgs/ca.msg

@@ -1,41 +1,84 @@
-%% -*- coding: latin-1 -*-
+%% Generated automatically
+%% DO NOT EDIT: run `make translations` instead
+%% To improve translations please read:
+%%   https://docs.ejabberd.im/developer/extending-ejabberd/localization/
+
+{" (Add * to the end of field to match substring)"," (Afegix * al final d'un camp per a buscar subcadenes)"}.
+{" has set the subject to: "," ha posat el tema: "}.
+{"# participants","# participants"}.
+{"A description of the node","Una descripció del node"}.
+{"A friendly name for the node","Un nom per al node"}.
+{"A password is required to enter this room","Es necessita contrasenya per a entrar en aquesta sala"}.
+{"A Web Page","Una Pàgina Web"}.
 {"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"}.
+{"Access model of authorize","Model d'Accés de autoritzar"}.
+{"Access model of open","Model d'Accés de obert"}.
+{"Access model of presence","Model d'Accés de presència"}.
+{"Access model of roster","Model d'Accés de contactes"}.
+{"Access model of whitelist","Model d'Accés de llista blanca"}.
+{"Access model","Model d'Accés"}.
+{"Account doesn't exist","El compte no existeix"}.
 {"Action on user","Acció en l'usuari"}.
 {"Add Jabber ID","Afegir Jabber ID"}.
 {"Add New","Afegir nou"}.
 {"Add User","Afegir usuari"}.
-{"Administration","Administració"}.
 {"Administration of ","Administració de "}.
+{"Administration","Administració"}.
 {"Administrator privileges required","Es necessita tenir privilegis d'administrador"}.
 {"All activity","Tota l'activitat"}.
-{"Allow users to change the subject","Permetre que els usuaris canviin el tema"}.
+{"All Users","Tots els usuaris"}.
+{"Allow subscription","Permetre subscripcions"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Permetre que aquesta Jabber ID es puga subscriure a aquest node pubsub?"}.
+{"Allow this person to register with the room?","Permetre a esta persona registrar-se a la sala?"}.
+{"Allow users to change the subject","Permetre que els usuaris canviïn el tema"}.
 {"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 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"}.
-{"All Users","Tots els usuaris"}.
+{"Allow visitors to send voice requests","Permetre als visitants enviar peticions de veu"}.
+{"An associated LDAP group that defines room membership; this should be an LDAP Distinguished Name according to an implementation-specific or deployment-specific definition of a group.","Un grup LDAP associat que defineix membresía a la sala; esto deuria ser un Nombre Distinguible de LDAP, d'acord amb una definició de grup específica d'implementació o de instal·lació."}.
 {"Announcements","Anuncis"}.
-{"A password is required to enter this room","Es necessita contrasenya per a entrar en aquesta sala"}.
+{"Answer associated with a picture","Resposta associada amb una imatge"}.
+{"Answer associated with a video","Resposta associada amb un vídeo"}.
+{"Answer associated with speech","Resposta associada amb un parlament"}.
+{"Answer to a question","Resposta a una pregunta"}.
+{"Anyone in the specified roster group(s) may subscribe and retrieve items","Qualsevol en el grup de contactes especificat pot subscriure's i recuperar elements"}.
+{"Anyone may associate leaf nodes with the collection","Qualsevol pot associar nodes fulla amb la col·lecció"}.
+{"Anyone may publish","Qualsevol pot publicar"}.
+{"Anyone may subscribe and retrieve items","Qualsevol pot publicar i recuperar elements"}.
+{"Anyone with a presence subscription of both or from may subscribe and retrieve items","Qualsevol amb una subscripció de presencia de 'both' o 'from' pot subscriure's i publicar elements"}.
+{"Anyone with Voice","Qualsevol amb Veu"}.
+{"Anyone","Qualsevol"}.
 {"April","Abril"}.
+{"Attribute 'channel' is required for this request","L'atribut 'channel' és necessari per a aquesta petició"}.
+{"Attribute 'id' is mandatory for MIX messages","L'atribut 'id' es necessari per a missatges MIX"}.
+{"Attribute 'jid' is not allowed here","L'atribut 'jid' no està permès ací"}.
+{"Attribute 'node' is not allowed here","L'atribut 'node' no està permès ací"}.
+{"Attribute 'to' of stanza that triggered challenge","L'atribut 'to' del paquet que va disparar la comprovació"}.
 {"August","Agost"}.
-{"Backup","Guardar còpia de seguretat"}.
+{"Automatic node creation is not enabled","La creació automàtica de nodes no està activada"}.
 {"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 "}.
+{"Backup","Guardar còpia de seguretat"}.
 {"Bad format","Format erroni"}.
 {"Birthday","Aniversari"}.
+{"Both the username and the resource are required","Es requereixen tant el nom d'usuari com el recurs"}.
+{"Bytestream already activated","El Bytestream ja està activat"}.
+{"Cannot remove active list","No es pot eliminar la llista activa"}.
+{"Cannot remove default list","No es pot eliminar la llista per defecte"}.
 {"CAPTCHA web page","Pàgina web del CAPTCHA"}.
+{"Challenge ID","ID de la comprovació"}.
 {"Change Password","Canviar Contrasenya"}.
 {"Change User Password","Canviar Contrasenya d'Usuari"}.
+{"Changing password is not allowed","No està permès canviar la contrasenya"}.
+{"Changing role/affiliation is not allowed","No està permès canviar el rol/afiliació"}.
+{"Channel already exists","El canal ja existeix"}.
+{"Channel does not exist","El canal no existeix"}.
+{"Channels","Canals"}.
 {"Characters not allowed:","Caràcters no permesos:"}.
 {"Chatroom configuration modified","Configuració de la sala de xat modificada"}.
 {"Chatroom is created","La sala s'ha creat"}.
@@ -44,349 +87,577 @@
 {"Chatroom is stopped","La sala s'ha aturat"}.
 {"Chatrooms","Sales de xat"}.
 {"Choose a username and password to register with this server","Tria nom d'usuari i contrasenya per a registrar-te en aquest servidor"}.
-{"Choose modules to stop","Selecciona mòduls a detindre"}.
 {"Choose storage type of tables","Selecciona el tipus d'almacenament de les taules"}.
-{"Choose whether to approve this entity's subscription.","Tria si aprova aquesta entitat de subscripció"}.
+{"Choose whether to approve this entity's subscription.","Tria si aproves aquesta entitat de subscripció."}.
 {"City","Ciutat"}.
+{"Client acknowledged more stanzas than sent by server","El client ha reconegut més paquets dels que ha enviat el servidor"}.
 {"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"}.
+{"Configuration","Configuració"}.
 {"Connected Resources:","Recursos connectats:"}.
-{"Connections parameters","Paràmetres de connexió"}.
+{"Contact Addresses (normally, room owner or owners)","Adreces de contacte (normalment, propietaris de la sala)"}.
 {"Country","Pais"}.
-{"CPU Time:","Temps de CPU"}.
-{"Database","Base de dades"}.
+{"CPU Time:","Temps de CPU:"}.
+{"Current Discussion Topic","Assumpte de discussió actual"}.
+{"Database failure","Error a la 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 "}.
+{"Database","Base de dades"}.
 {"December","Decembre"}.
 {"Default users as participants","Els usuaris són participants per defecte"}.
-{"Delete message of the day","Eliminar el missatge del dia"}.
+{"Delete content","Eliminar contingut"}.
 {"Delete message of the day on all hosts","Elimina el missatge del dis de tots els hosts"}.
+{"Delete message of the day","Eliminar el missatge del dia"}.
 {"Delete Selected","Eliminar els seleccionats"}.
+{"Delete table","Eliminar taula"}.
 {"Delete User","Eliminar Usuari"}.
+{"Deliver event notifications","Entrega de notificacions d'events"}.
+{"Deliver payloads with event notifications","Enviar payloads junt a les notificacions d'events"}.
 {"Description:","Descripció:"}.
 {"Disc only copy","Còpia sols en disc"}.
-{"Displayed Groups:","Mostrar grups:"}.
-{"Don't tell your password to anybody, not even the administrators of the Jabber server.","No li donis la teva contrasenya a ningú, ni tan sols als administradors del servidor Jabber."}.
+{"'Displayed groups' not added (they do not exist!): ","'Mostrats' no afegits (no existeixen!): "}.
+{"Displayed:","Mostrats:"}.
+{"Don't tell your password to anybody, not even the administrators of the XMPP server.","No li donis la teva contrasenya a ningú, ni tan sols als administradors del servidor XMPP."}.
 {"Dump Backup to Text File at ","Exporta còpia de seguretat a fitxer de text en "}.
 {"Dump to Text File","Exportar a fitxer de text"}.
+{"Duplicated groups are not allowed by RFC6121","No estan permesos els grups duplicats al RFC6121"}.
+{"Dynamically specify a replyto of the item publisher","Especifica dinàmicament l'adreça on respondre al publicador del element"}.
 {"Edit Properties","Editar propietats"}.
-{"Either approve or decline the voice request.","Aprova o denega la petició de veu"}.
-{"ejabberd IRC module","mòdul ejabberd IRC"}.
+{"Either approve or decline the voice request.","Aprova o denega la petició de veu."}.
+{"ejabberd HTTP Upload service","ejabberd - servei de HTTP Upload"}.
 {"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 Multicast service","ejabberd - servei de Multicast"}.
+{"ejabberd Publish-Subscribe module","ejabberd - Mòdul 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"}.
+{"ejabberd vCard module","ejabberd mòdul vCard"}.
+{"ejabberd Web Admin","ejabberd Web d'administració"}.
+{"ejabberd","ejabberd"}.
 {"Elements","Elements"}.
-{"Email","Email"}.
+{"Email Address","Adreça de correu"}.
+{"Email","Correu"}.
 {"Enable logging","Habilitar el registre de la conversa"}.
-{"Encoding for server ~b","Codificació pel servidor ~b"}.
+{"Enable message archiving","Activar l'emmagatzematge de missatges"}.
+{"Enabling push without 'node' attribute is not supported","No està suportat activar Push sense l'atribut 'node'"}.
 {"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 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"}.
 {"Enter path to text file","Introdueix ruta al fitxer de text"}.
 {"Enter the text you see","Introdueix el text que veus"}.
-{"Enter username and encodings you wish to use for connecting to IRC servers.  Press 'Next' to get more fields to fill in.  Press 'Complete' to save settings.","Introdueix el nom d'usuari i les codificacions de caràcters per a utilitzar als servidors de IRC. Apreta \"Seguent\" per veure més caps per omplir. Apreta \"Completar\" per guardar la configuració. "}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Introdueix el nom d'usuari, les codificacions de caràcters, els ports i contrasenyes per a utilitzar al connectar als servidors de IRC"}.
-{"Erlang Jabber Server","Servidor Erlang Jabber"}.
+{"Erlang XMPP Server","Servidor Erlang XMPP"}.
 {"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):"}.
+{"External component failure","Error al component extern"}.
+{"External component timeout","Temps esgotat al component extern"}.
+{"Failed to activate bytestream","Errada al activar bytestream"}.
 {"Failed to extract JID from your voice request approval","No s'ha pogut extraure el JID de la teva aprovació de petició de veu"}.
+{"Failed to map delegated namespace to external component","Ha fallat mapejar la delegació de l'espai de noms al component extern"}.
+{"Failed to parse HTTP response","Ha fallat el processat de la resposta HTTP"}.
+{"Failed to process option '~s'","Ha fallat el processat de la opció '~s'"}.
 {"Family Name","Cognom"}.
+{"FAQ Entry","Entrada a la FAQ"}.
 {"February","Febrer"}.
-{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","Emplena el formulari per a buscar usuaris Jabber. Afegix * al final d'un camp per a buscar subcadenes."}.
+{"File larger than ~w bytes","El fitxer es més gran que ~w bytes"}.
+{"Fill in the form to search for any matching XMPP User","Emplena camps per a buscar usuaris XMPP que concorden"}.
 {"Friday","Divendres"}.
+{"From ~ts","De ~ts"}.
 {"From","De"}.
-{"From ~s","De ~s"}.
+{"Full List of Room Admins","Llista completa de administradors de la sala"}.
+{"Full List of Room Owners","Llista completa de propietaris de la sala"}.
 {"Full Name","Nom complet"}.
 {"Get Number of Online Users","Obtenir Número d'Usuaris Connectats"}.
 {"Get Number of Registered Users","Obtenir Número d'Usuaris Registrats"}.
+{"Get Pending","Obtenir Pendents"}.
 {"Get User Last Login Time","Obtenir la última connexió d'Usuari"}.
 {"Get User Password","Obtenir Contrasenya d'usuari"}.
 {"Get User Statistics","Obtenir Estadístiques d'Usuari"}.
-{"Group ","Grup "}.
+{"Given Name","Nom propi"}.
+{"Grant voice to this person?","Concedir veu a aquesta persona?"}.
+{"Group","Grup"}.
+{"Groups that will be displayed to the members","Grups que seran mostrats als membres"}.
 {"Groups","Grups"}.
-{"has been banned","Has sigut banejat"}.
-{"has been kicked because of an affiliation change","Has sigut expulsat a causa d'un canvi d'afiliació"}.
-{"has been kicked because of a system shutdown","Has sigut expulsat perquè el sistema s'ha apagat"}.
-{"has been kicked because the room has been changed to members-only","Has sigut expulsat perquè la sala ha canviat a sols membres"}.
-{"has been kicked","Has sigut expulsat"}.
-{" has set the subject to: "," ha posat l'assumpte: "}.
+{"has been banned","ha sigut bloquejat"}.
+{"has been kicked because of a system shutdown","ha sigut expulsat perquè el sistema va a apagar-se"}.
+{"has been kicked because of an affiliation change","ha sigut expulsat a causa d'un canvi d'afiliació"}.
+{"has been kicked because the room has been changed to members-only","ha sigut expulsat perquè la sala ara és només per a membres"}.
+{"has been kicked","ha sigut expulsat"}.
+{"Host unknown","Host desconegut"}.
 {"Host","Host"}.
+{"HTTP File Upload","HTTP File Upload"}.
+{"Idle connection","Connexió sense us"}.
 {"If you don't see the CAPTCHA image here, visit the web page.","Si no veus la imatge CAPTCHA açí, visita la pàgina web."}.
-{"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Si vols especificar codificacions de caràcters diferents per a cada servidor IRC emplena aquesta llista amb els valors amb el format '{\"servidor irc\", \"codificació\", port, \"contrasenya\"}'.  Aquest servei utilitza per defecte la codificació \"~s\", port ~p, no contrasenya."}.
 {"Import Directory","Importar directori"}.
 {"Import File","Importar fitxer"}.
-{"Import user data from jabberd14 spool file:","Importar dades d'usuaris de l'arxiu de spool de jabberd14"}.
+{"Import user data from jabberd14 spool file:","Importar dades d'usuaris de l'arxiu de spool de jabberd14:"}.
 {"Import User from File at ","Importa usuari des de fitxer en "}.
 {"Import users data from a PIEFXIS file (XEP-0227):","Importar dades d'usuaris des d'un arxiu PIEFXIS (XEP-0227):"}.
 {"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 domain part of 'from' attribute","La part de domini de l'atribut 'from' es impròpia"}.
 {"Improper message type","Tipus de missatge incorrecte"}.
-{"Incoming s2s Connections:","Connexions s2s d'entrada"}.
+{"Incoming s2s Connections:","Connexions s2s d'entrada:"}.
+{"Incorrect CAPTCHA submit","El CAPTCHA proporcionat és incorrecte"}.
+{"Incorrect data form","El formulari de dades és incorrecte"}.
 {"Incorrect password","Contrasenya incorrecta"}.
+{"Incorrect value of 'action' attribute","Valor incorrecte del atribut 'action'"}.
+{"Incorrect value of 'action' in data form","Valor incorrecte de 'action' al formulari de dades"}.
+{"Incorrect value of 'path' in data form","Valor incorrecte de 'path' al formulari de dades"}.
+{"Insufficient privilege","Privilegi insuficient"}.
+{"Internal server error","Error intern del servidor"}.
+{"Invalid 'from' attribute in forwarded message","Atribut 'from' invàlid al missatge reenviat"}.
+{"Invalid node name","Nom de node no vàlid"}.
+{"Invalid 'previd' value","Valor no vàlid de 'previd'"}.
+{"Invitations are not allowed in this conference","Les invitacions no estan permeses en aquesta sala de conferència"}.
 {"IP addresses","Adreça IP"}.
-{"IP","IP"}.
-{"IRC channel (don't put the first #)","Canal d'IRC (no posis la primera #)"}.
-{"IRC server","Servidor d'IRC"}.
-{"IRC settings","Configuració d'IRC."}.
-{"IRC Transport","Transport a IRC"}.
-{"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"}.
+{"It is not allowed to send private messages","No està permés enviar missatges privats"}.
 {"Jabber ID","ID Jabber"}.
 {"January","Gener"}.
-{"Join IRC channel","Entra a canal d'IRC"}.
-{"joins the room","Entrar a la sala"}.
-{"Join the IRC channel here.","Entra al canal d'IRC aquí."}.
-{"Join the IRC channel in this Jabber ID: ~s","Entra al canal d'IRC en aquesta Jabber ID: ~s"}.
+{"JID normalization denied by service policy","S'ha denegat la normalització del JID per política del servei"}.
+{"JID normalization failed","Ha fallat la normalització del JID"}.
+{"joins the room","entra a la sala"}.
 {"July","Juliol"}.
 {"June","Juny"}.
+{"Just created","Creació recent"}.
+{"Label:","Etiqueta:"}.
 {"Last Activity","Última activitat"}.
 {"Last login","Últim login"}.
+{"Last message","Últim missatge"}.
 {"Last month","Últim mes"}.
 {"Last year","Últim any"}.
-{"leaves the room","Deixar la sala"}.
-{"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"}.
+{"Least significant bits of SHA-256 hash of text should equal hexadecimal label","Els bits menys significants del hash SHA-256 del text deurien ser iguals a l'etiqueta hexadecimal"}.
+{"leaves the room","surt de la sala"}.
 {"List of rooms","Llista de sales"}.
+{"Logging","Registre"}.
 {"Low level update script","Script d'actualització de baix nivell"}.
 {"Make participants list public","Crear una llista de participants pública"}.
 {"Make room CAPTCHA protected","Crear una sala protegida per CAPTCHA"}.
-{"Make room members-only","Crear una sala de \"només membres\""}.
+{"Make room members-only","Crear una sala només per a membres"}.
 {"Make room moderated","Crear una sala moderada"}.
 {"Make room password protected","Crear una sala amb contrasenya"}.
 {"Make room persistent","Crear una sala persistent"}.
 {"Make room public searchable","Crear una sala pública"}.
+{"Malformed username","Nom d'usuari mal format"}.
+{"MAM preference modification denied by service policy","Se t'ha denegat la modificació de la preferència de MAM per política del servei"}.
 {"March","Març"}.
+{"Max # of items to persist","Màxim # d'elements que persistixen"}.
+{"Max payload size in bytes","Màxim tamany del payload en bytes"}.
+{"Maximum file size","Mida màxima de fitxer"}.
+{"Maximum Number of History Messages Returned by Room","Numero màxim de missatges de l'historia que retorna la sala"}.
+{"Maximum number of items to persist","Número màxim d'elements que persistixen"}.
 {"Maximum Number of Occupants","Número màxim d'ocupants"}.
 {"May","Maig"}.
+{"Members not added (inexistent vhost!): ","Membres no afegits (perquè el vhost no existeix): "}.
 {"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."}.
+{"Memorize your password, or write it in a paper placed in a safe place. In XMPP 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 XMPP no hi ha una forma automatitzada de recuperar la teva contrasenya si la oblides."}.
 {"Memory","Memòria"}.
+{"Mere Availability in XMPP (No Show Value)","Simplement disponibilitat a XMPP (sense valor de 'show')"}.
 {"Message body","Missatge"}.
+{"Message not found in forwarded payload","Missatge no trobat al contingut reenviat"}.
+{"Messages from strangers are rejected","Els missatges de desconeguts son rebutjats"}.
+{"Messages of type headline","Missatges de tipus titular"}.
+{"Messages of type normal","Missatges de tipus normal"}.
 {"Middle Name","Segon nom"}.
+{"Minimum interval between voice requests (in seconds)","Interval mínim entre peticions de veu (en segons)"}.
 {"Moderator privileges required","Es necessita tenir privilegis de moderador"}.
+{"Moderator","Moderador"}.
+{"Moderators Only","Només moderadors"}.
 {"Modified modules","Mòduls modificats"}.
-{"Module","Mòdul"}.
-{"Modules at ~p","Mòduls en ~p"}.
-{"Modules","Mòduls"}.
+{"Module failed to handle the query","El modul ha fallat al gestionar la petició"}.
 {"Monday","Dilluns"}.
 {"Multicast","Multicast"}.
+{"Multiple <item/> elements are not allowed by RFC6121","No estan permesos múltiples elements <item/> per RFC6121"}.
 {"Multi-User Chat","Multi-Usuari Converses"}.
-{"Name:","Nom:"}.
+{"Name in the rosters where this group will be displayed","Nom a les llistes de contactes on es mostrarà aquest grup"}.
 {"Name","Nom"}.
+{"Name:","Nom:"}.
+{"Natural Language for Room Discussions","Llengua natural per a les discussions a les sales"}.
+{"Natural-Language Room Name","Nom de la sala a la seua llengua natural"}.
+{"Neither 'jid' nor 'nick' attribute found","No s'han trobat els atributs 'jid' ni 'nick'"}.
+{"Neither 'role' nor 'affiliation' attribute found","No s'han trobat els atributs 'role' ni 'affiliation'"}.
 {"Never","Mai"}.
 {"New Password:","Nova Contrasenya:"}.
+{"Nickname can't be empty","El sobrenom no pot estar buit"}.
 {"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"}.
+{"No address elements found","No s'han trobat elements d'adreces ('address')"}.
+{"No addresses element found","No s'ha trobat l'element d'adreces ('addresses')"}.
+{"No 'affiliation' attribute found","No s'ha trobat l'atribut 'affiliation'"}.
+{"No available resource found","No s'ha trobat un recurs disponible"}.
 {"No body provided for announce message","No hi ha proveedor per al missatge anunci"}.
+{"No child elements found","No s'han trobat subelements"}.
+{"No data form found","No s'ha trobat el formulari de dades"}.
 {"No Data","No hi ha dades"}.
+{"No features available","No n'hi ha característiques disponibles"}.
+{"No <forwarded/> element found","No s'ha trobat cap element <forwarded/>"}.
+{"No hook has processed this command","Cap event ha processat este comandament"}.
+{"No info about last activity found","No s'ha trobat informació de l'ultima activitat"}.
+{"No 'item' element found","No s'ha trobat cap element 'item'"}.
+{"No items found in this query","En aquesta petició no s'ha trobat cap element"}.
+{"No limit","Sense Llímit"}.
+{"No module is handling this query","Cap element està manegant esta petició"}.
+{"No node specified","No s'ha especificat node"}.
+{"No 'password' found in data form","No s'ha trobat 'password' al formulari de dades"}.
+{"No 'password' found in this query","No s'ha trobat 'password' en esta petició"}.
+{"No 'path' found in data form","No s'ha trobat 'path' en el formulari de dades"}.
+{"No pending subscriptions found","No s'han trobat subscripcions pendents"}.
+{"No privacy list with this name found","No s'ha trobat cap llista de privacitat amb aquest nom"}.
+{"No private data found in this query","No s'ha trobat dades privades en esta petició"}.
+{"No running node found","No s'ha trobat node en marxa"}.
+{"No services available","No n'hi ha serveis disponibles"}.
+{"No statistics found for this item","No n'hi ha estadístiques disponibles per a aquest element"}.
+{"No 'to' attribute found in the invitation","No s'ha trobat l'atribut 'to' en la invitació"}.
+{"Nobody","Ningú"}.
+{"Node already exists","El node ja existeix"}.
+{"Node ID","ID del Node"}.
+{"Node index not found","Index de node no trobat"}.
 {"Node not found","Node no trobat"}.
 {"Node ~p","Node ~p"}.
+{"Nodeprep has failed","Ha fallat Nodeprep"}.
 {"Nodes","Nodes"}.
 {"None","Cap"}.
+{"Not allowed","No permès"}.
 {"Not Found","No Trobat"}.
+{"Not subscribed","No subscrit"}.
+{"Notify subscribers when items are removed from the node","Notificar subscriptors quan els elements són eliminats del node"}.
+{"Notify subscribers when the node configuration changes","Notificar subscriptors quan canvia la configuració del node"}.
+{"Notify subscribers when the node is deleted","Notificar subscriptors quan el node és eliminat"}.
 {"November","Novembre"}.
+{"Number of answers required","Número de respostes requerides"}.
+{"Number of occupants","Número d'ocupants"}.
+{"Number of Offline Messages","Número de missatges offline"}.
 {"Number of online users","Número d'usuaris connectats"}.
 {"Number of registered users","Número d'Usuaris Registrats"}.
+{"Number of seconds after which to automatically purge items","Número de segons després dels quals es purgaran automàticament elements"}.
+{"Occupants are allowed to invite others","Els ocupants poden invitar a altres"}.
+{"Occupants May Change the Subject","Els ocupants poden canviar el Tema"}.
 {"October","Octubre"}.
 {"Offline Messages:","Missatges fora de línia:"}.
 {"Offline Messages","Missatges offline"}.
 {"OK","Acceptar"}.
 {"Old Password:","Antiga contrasenya:"}.
-{"Online","Connectat"}.
 {"Online Users","Usuaris conectats"}.
 {"Online Users:","Usuaris en línia:"}.
+{"Online","Connectat"}.
+{"Only admins can see this","Només els administradors poden veure esto"}.
+{"Only collection node owners may associate leaf nodes with the collection","Només els propietaris de la col·lecció de nodes poden associar nodes fulla amb la col·lecció"}.
+{"Only deliver notifications to available users","Sols enviar notificacions als usuaris disponibles"}.
+{"Only <enable/> or <disable/> tags are allowed","Només es permeten etiquetes <enable/> o <disable/>"}.
+{"Only <list/> element is allowed in this query","En esta petició només es permet l'element <list/>"}.
 {"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 and participants are allowed to change the subject in this room","Només els moderadors i participants poden canviar el tema d'aquesta sala"}.
+{"Only moderators are allowed to change the subject in this room","Només els moderadors poden canviar el tema 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 publishers may publish","Només els publicadors poden publicar"}.
 {"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"}.
+{"Only those on a whitelist may associate leaf nodes with the collection","Només qui estiga a una llista blanca pot associar nodes fulla amb la col·lecció"}.
+{"Only those on a whitelist may subscribe and retrieve items","Només qui estiga a una llista blanca pot subscriure's i recuperar elements"}.
 {"Organization Name","Nom de la organizació"}.
 {"Organization Unit","Unitat de la organizació"}.
-{"Outgoing s2s Connections:","Connexions d'eixida s2s"}.
+{"Outgoing s2s Connections:","Connexions d'eixida s2s:"}.
 {"Outgoing s2s Connections","Connexions s2s d'eixida"}.
 {"Owner privileges required","Es requerixen privilegis de propietari de la sala"}.
+{"Packet relay is denied by service policy","S'ha denegat el reenviament del paquet per política del servei"}.
 {"Packet","Paquet"}.
-{"Password ~b","Contrasenya ~b"}.
-{"Password:","Contrasenya:"}.
-{"Password","Contrasenya"}.
-{"Password Verification:","Verificació de la Contrasenya:"}.
+{"Participant","Participant"}.
 {"Password Verification","Verificació de la Contrasenya"}.
+{"Password Verification:","Verificació de la Contrasenya:"}.
+{"Password","Contrasenya"}.
+{"Password:","Contrasenya:"}.
 {"Path to Dir","Ruta al directori"}.
 {"Path to File","Ruta al fitxer"}.
+{"Payload type","Tipus de payload"}.
 {"Pending","Pendent"}.
 {"Period: ","Període: "}.
-{"Permanent rooms","Sales permanents"}.
+{"Persist items to storage","Persistir elements al guardar"}.
+{"Persistent","Persistent"}.
+{"Ping query is incorrect","La petició de Ping es incorrecta"}.
 {"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, 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"}.
-{"private, ","privat"}.
-{"Protocol","Protocol"}.
+{"Possessing 'ask' attribute is not allowed by RFC6121","Posseir l'atribut 'ask' no està permès per RFC6121"}.
+{"Present real Jabber IDs to","Presentar Jabber ID's reals a"}.
+{"Previous session not found","No s'ha trobat la sessió prèvia"}.
+{"Previous session PID has been killed","El procés de la sessió prèvia ha sigut matat"}.
+{"Previous session PID has exited","El procés de la sessió prèvia ha sortit"}.
+{"Previous session PID is dead","El procés de la sessió prèvia està mort"}.
+{"Previous session timed out","La sessió prèvia ha caducat"}.
+{"private, ","privat, "}.
+{"Public","Public"}.
+{"Publish model","Model de publicació"}.
 {"Publish-Subscribe","Publicar-subscriure't"}.
 {"PubSub subscriber request","Petició de subscriptor PubSub"}.
-{"Queries to the conference members are not allowed in this room"," En aquesta sala no es permeten sol·licituds als membres de la conferència"}.
+{"Purge all items when the relevant publisher goes offline","Eliminar tots els elements quan el publicant relevant es desconnecti"}.
+{"Push record not found","No s'ha trobat l'element Push"}.
+{"Queries to the conference members are not allowed in this room","En aquesta sala no es permeten sol·licituds als membres"}.
+{"Query to another users is forbidden","Enviar peticions a altres usuaris no està permès"}.
 {"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?"}.
+{"Receive notification from all descendent nodes","Rebre notificació de tots els nodes descendents"}.
+{"Receive notification from direct child nodes only","Rebre notificació només de nodes fills directes"}.
+{"Receive notification of new items only","Rebre notificació només de nous elements"}.
+{"Receive notification of new nodes only","Rebre notificació només de nous nodes"}.
 {"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:"}.
+{"Register an XMPP account","Registrar un compte XMPP"}.
 {"Registered Users","Usuaris registrats"}.
+{"Registered Users:","Usuaris registrats:"}.
 {"Register","Registrar"}.
-{"Registration in mod_irc for ","Registre en mod_irc per a"}.
 {"Remote copy","Còpia remota"}.
 {"Remove All Offline Messages","Eliminar tots els missatges offline"}.
-{"Remove","Borrar"}.
 {"Remove User","Eliminar usuari"}.
+{"Remove","Borrar"}.
 {"Replaced by new connection","Reemplaçat per una nova connexió"}.
+{"Request has timed out","La petició ha caducat"}.
+{"Request is ignored","La petició ha sigut ignorada"}.
+{"Requested role","Rol sol·licitat"}.
 {"Resources","Recursos"}.
-{"Restart","Reiniciar"}.
 {"Restart Service","Reiniciar el Servei"}.
+{"Restart","Reiniciar"}.
 {"Restore Backup from File at ","Restaura còpia de seguretat des del fitxer en "}.
 {"Restore binary backup after next ejabberd restart (requires less memory):","Restaurar una còpia de seguretat binària després de reiniciar el ejabberd (requereix menys memòria:"}.
-{"Restore binary backup immediately:","Restaurar una còpia de seguretat binària ara mateix."}.
+{"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 and Affiliations that May Retrieve Member List","Rols i Afiliacions que poden recuperar la llista de membres"}.
+{"Roles for which Presence is Broadcasted","Rols per als que sí se difon la seua presencia"}.
+{"Roles that May Send Private Messages","Rols que poden enviar missatges privats"}.
 {"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 description","Descripció de la sala"}.
+{"Room Occupants","Ocupants de la sala"}.
+{"Room terminates","La sala està terminant"}.
 {"Room title","Títol de la sala"}.
-{"Roster","Llista de contactes"}.
-{"Roster of ","Llista de contactes de "}.
-{"Roster size","Tamany de la llista"}.
+{"Roster groups allowed to subscribe","Llista de grups que tenen permés subscriures"}.
+{"Roster of ~ts","Llista de contactes de ~ts"}.
+{"Roster size","Mida de la llista"}.
+{"Roster:","Llista de contactes:"}.
 {"RPC Call Error","Error de cridada RPC"}.
 {"Running Nodes","Nodes funcionant"}.
-{"~s access rule configuration","Configuració de les Regles d'Accés ~s"}.
+{"~s invites you to the room ~s","~s et convida a la sala ~s"}.
 {"Saturday","Dissabte"}.
 {"Script check","Comprovar script"}.
-{"Search Results for ","Resultat de la búsqueda"}.
+{"Search from the date","Buscar des de la data"}.
+{"Search Results for ","Resultats de la búsqueda "}.
+{"Search the text","Buscar el text"}.
+{"Search until the date","Buscar fins la data"}.
 {"Search users in ","Cerca usuaris en "}.
-{"Send announcement to all online users","Enviar anunci a tots els usuaris connectats"}.
+{"Select All","Seleccionar Tots"}.
 {"Send announcement to all online users on all hosts","Enviar anunci a tots els usuaris connectats a tots els hosts"}.
-{"Send announcement to all users","Enviar anunci a tots els usuaris"}.
+{"Send announcement to all online users","Enviar anunci a tots els usuaris connectats"}.
 {"Send announcement to all users on all hosts","Enviar anunci a tots els usuaris de tots els hosts"}.
+{"Send announcement to all users","Enviar anunci a tots els usuaris"}.
 {"September","Setembre"}.
-{"Server ~b","Servidor ~b"}.
 {"Server:","Servidor:"}.
+{"Service list retrieval timed out","L'intent de recuperar la llista de serveis ha caducat"}.
+{"Session state copying timed out","La copia del estat de la sessió ha caducat"}.
 {"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"}.
 {"Show Integral Table","Mostrar Taula Integral"}.
 {"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 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."}.
-{"~s's Offline Messages Queue","~s's cua de missatges offline"}.
-{"Start","Iniciar"}.
-{"Start Modules at ","Iniciar mòduls en "}.
-{"Start Modules","Iniciar mòduls"}.
-{"Statistics","Estadístiques"}.
+{"SOCKS5 Bytestreams","SOCKS5 Bytestreams"}.
+{"Some XMPP clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Alguns clients XMPP poden emmagatzemar la teva contrasenya al ordinador, però només hauries de fer això al teu ordinador personal, per raons de seguretat."}.
+{"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"}.
+{"Stanza ID","ID del paquet"}.
+{"Statically specify a replyto of the node owner(s)","Especifica estaticament una adreça on respondre al propietari del node"}.
 {"Statistics of ~p","Estadístiques de ~p"}.
+{"Statistics","Estadístiques"}.
 {"Stop","Detindre"}.
-{"Stop Modules at ","Detindre mòduls en "}.
-{"Stop Modules","Parar mòduls"}.
 {"Stopped Nodes","Nodes parats"}.
 {"Storage Type","Tipus d'emmagatzematge"}.
 {"Store binary backup:","Guardar una còpia de seguretat binària:"}.
 {"Store plain text backup:","Guardar una còpia de seguretat en format de text pla:"}.
-{"Subject","Assumpte"}.
+{"Stream management is already enabled","L'administració de la connexió (stream management) ja està activada"}.
+{"Stream management is not enabled","L'administració de la conexió (stream management) no està activada"}.
+{"Subject","Tema"}.
 {"Submit","Enviar"}.
 {"Submitted","Enviat"}.
+{"Subscriber Address","Adreça del Subscriptor"}.
+{"Subscribers may publish","Els subscriptors poden publicar"}.
+{"Subscription requests must be approved and only subscribers may retrieve items","Les peticiones de subscripció han de ser aprovades i només els subscriptors poden recuperar elements"}.
+{"Subscriptions are not allowed","Les subscripcions no estan permeses"}.
 {"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"}.
+{"Text associated with a picture","Text associat amb una imatge"}.
+{"Text associated with a sound","Text associat amb un so"}.
+{"Text associated with a video","Text associat amb un vídeo"}.
+{"Text associated with speech","Text associat amb una veu"}.
+{"That nickname is already in use by another occupant","El sobrenom ja l'està utilitzant una altra persona"}.
+{"That nickname is registered by another person","El sobrenom ja està registrat per una altra persona"}.
+{"The account already exists","El compte ha existeix"}.
+{"The account was not unregistered","El compte no ha sigut esborrat"}.
+{"The body text of the last received message","El contingut del text de l'ultim missatge rebut"}.
 {"The CAPTCHA is valid.","El CAPTCHA es vàlid."}.
 {"The CAPTCHA verification has failed","La verificació CAPTCHA ha fallat"}.
-{"the password is","la contrasenya és"}.
+{"The captcha you entered is wrong","El CAPTCHA que has proporcionat és incorrecte"}.
+{"The child nodes (leaf or collection) associated with a collection","El nodes fills (fulla o col·leccions) associats amb una col·lecció"}.
+{"The collections with which a node is affiliated","Les col.leccions amb les que un node està afiliat"}.
+{"The DateTime at which a leased subscription will end or has ended","La Data i Hora a la que una subscripció prestada terminarà o ha terminat"}.
+{"The datetime when the node was created","La data i hora a la que un node va ser creat"}.
+{"The default language of the node","El llenguatge per defecte d'un node"}.
+{"The feature requested is not supported by the conference","La característica sol·licitada no està suportada per la sala de conferència"}.
+{"The JID of the node creator","El JID del creador del node"}.
+{"The JIDs of those to contact with questions","Els JIDs a qui contactar amb preguntes"}.
+{"The JIDs of those with an affiliation of owner","Els JIDs de qui tenen una afiliació de propietaris"}.
+{"The JIDs of those with an affiliation of publisher","Els JIDs de qui tenen una afiliació de publicadors"}.
+{"The list of JIDs that may associate leaf nodes with a collection","La llista de JIDs que poden associar nodes fulla amb una col·lecció"}.
+{"The maximum number of child nodes that can be associated with a collection","El màxim número de nodes fills que poden associar-se amb una col·lecció"}.
+{"The minimum number of milliseconds between sending any two notification digests","El número mínim de mil·lisegons entre l'enviament de dos resums de notificacions"}.
+{"The name of the node","El nom del node"}.
+{"The node is a collection node","El node es una col·lecció"}.
+{"The node is a leaf node (default)","El node es un node fulla (per defecte)"}.
+{"The NodeID of the relevant node","El NodeID del node rellevant"}.
+{"The number of pending incoming presence subscription requests","El número de peticions rebudes de subscripció de presencia pendents"}.
+{"The number of subscribers to the node","El número de subscriptors al node"}.
+{"The number of unread or undelivered messages","El número de missatges no llegits o no enviats"}.
+{"The password contains unacceptable characters","La contrasenya conté caràcters inacceptables"}.
 {"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."}.
+{"the password is","la contrasenya és"}.
+{"The password of your XMPP account was successfully changed.","La contrasenya del teu compte XMPP s'ha canviat correctament."}.
+{"The password was not changed","La contrasenya no ha sigut canviada"}.
+{"The passwords are different","Les contrasenyes son diferents"}.
+{"The presence states for which an entity wants to receive notifications","El estats de presencia per als quals una entitat vol rebre notificacions"}.
+{"The query is only allowed from local users","La petició està permesa només d'usuaris locals"}.
+{"The query must not contain <item/> elements","La petició no pot contenir elements <item/>"}.
+{"The room subject can be modified by participants","El tema de la sala pot modificar-lo els participants"}.
+{"The sender of the last received message","Qui ha enviat l'ultim missatge rebut"}.
+{"The stanza MUST contain only one <active/> element, one <default/> element, or one <list/> element","El paquet DEU contindre només un element <active/>, un element <default/>, o un element <list/>"}.
+{"The subscription identifier associated with the subscription request","L'identificador de subscripció associat amb la petició de subscripció"}.
+{"The type of node data, usually specified by the namespace of the payload (if any)","El tipus de dades al node, usualment especificat pel namespace del payload (si n'hi ha)"}.
+{"The URL of an XSL transformation which can be applied to payloads in order to generate an appropriate message body element.","La URL de uns transformació XSL que pot ser aplicada als payloads per a generar un element apropiat de contingut de missatge."}.
+{"The URL of an XSL transformation which can be applied to the payload format in order to generate a valid Data Forms result that the client could display using a generic Data Forms rendering engine","La URL de una transformació XSL que pot ser aplicada al format de payload per a generar un resultat valid de Data Forms, que el client puga mostrar usant un métode generic de Data Forms"}.
+{"The username is not valid","El nom d'usuari no es vàlid"}.
 {"There was an error changing the password: ","Hi ha hagut un error canviant la contrasenya: "}.
 {"There was an error creating the account: ","Hi ha hagut un error creant el compte: "}.
 {"There was an error deleting the account: ","Hi ha hagut un error esborrant el compte: "}.
 {"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Això no distingeix majúscules de minúscules: macbeth es el mateix que MacBeth i Macbeth."}.
-{"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Aquesta pàgina permet crear un compte Jabber en aquest servidor Jabber. El teu JID (Jabber IDentifier; Identificador Jabber) tindrà aquesta forma: usuari@servidor. Si us plau, llegeix amb cura les instruccions per emplenar correctament els camps."}.
-{"This page allows to unregister a Jabber account in this Jabber server.","Aquesta pàgina permet anul·lar el registre d'un compte Jabber en aquest servidor Jabber."}.
+{"This page allows to register an XMPP account in this XMPP server. Your JID (Jabber ID) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Aquesta pàgina permet crear un compte XMPP en aquest servidor XMPP. El teu JID (Jabber ID; 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 an XMPP account in this XMPP server.","Aquesta pàgina permet esborrar un compte XMPP en aquest servidor XMPP."}.
 {"This room is not anonymous","Aquesta sala no és anònima"}.
+{"This service can not process the address: ~s","Este servei no pot processar la direcció: ~s"}.
 {"Thursday","Dijous"}.
-{"Time","Data"}.
 {"Time delay","Temps de retard"}.
+{"Timed out waiting for stream resumption","Massa temps esperant que es resumisca la connexió"}.
+{"Time","Data"}.
+{"To register, visit ~s","Per a registrar-te, visita ~s"}.
+{"To ~ts","A ~ts"}.
+{"Token TTL","Token TTL"}.
+{"Too many active bytestreams","N'hi ha massa Bytestreams actius"}.
 {"Too many CAPTCHA requests","Massa peticions de CAPTCHA"}.
+{"Too many child elements","N'hi ha massa subelements"}.
+{"Too many <item/> elements","N'hi ha massa elements <item/>"}.
+{"Too many <list/> elements","N'hi ha massa elements <list/>"}.
+{"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 receiver fields were specified","S'han especificat massa camps de receptors"}.
 {"Too many unacked stanzas","Massa missatges sense haver reconegut la seva recepció"}.
+{"Too many users in this conference","N'hi ha massa usuaris en esta sala de conferència"}.
 {"To","Per a"}.
-{"To ~s","A ~s"}.
-{"Total rooms","Nombre total de sales"}.
+{"Total rooms","Sales totals"}.
 {"Traffic rate limit is exceeded","El llímit de tràfic ha sigut sobrepassat"}.
-{"Transactions Aborted:","Transaccions Avortades"}.
+{"Transactions Aborted:","Transaccions Avortades:"}.
 {"Transactions Committed:","Transaccions Realitzades:"}.
-{"Transactions Logged:","Transaccions registrades"}.
-{"Transactions Restarted:","Transaccions reiniciades"}.
+{"Transactions Logged:","Transaccions registrades:"}.
+{"Transactions Restarted:","Transaccions reiniciades:"}.
+{"~ts's Offline Messages Queue","~ts's cua de missatges offline"}.
 {"Tuesday","Dimarts"}.
 {"Unable to generate a CAPTCHA","No s'ha pogut generar un CAPTCHA"}.
+{"Unable to register route on existing local domain","No s'ha pogut registrar la ruta al domini local existent"}.
 {"Unauthorized","No autoritzat"}.
-{"Unregister a Jabber account","Anul·lar el registre d'un compte Jabber"}.
+{"Unexpected action","Acció inesperada"}.
+{"Unexpected error condition: ~p","Condició d'error inesperada: ~p"}.
+{"Unregister an XMPP account","Anul·lar el registre d'un compte XMPP"}.
 {"Unregister","Anul·lar el registre"}.
-{"Update","Actualitzar"}.
+{"Unselect All","Deseleccionar tots"}.
+{"Unsupported <index/> element","Element <index/> no soportat"}.
+{"Unsupported version","Versió no suportada"}.
 {"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"}.
-{"Use of STARTTLS required","És obligatori utilitzar STARTTLS"}.
+{"Update","Actualitzar"}.
+{"Uptime:","Temps en marxa:"}.
+{"URL for Archived Discussion Logs","URL dels Arxius de Discussions"}.
+{"User already exists","El usuari ja existeix"}.
+{"User JID","JID del usuari"}.
+{"User (jid)","Usuari (jid)"}.
 {"User Management","Gestió d'Usuaris"}.
+{"User removed","Usuari borrat"}.
+{"User session not found","Sessió d'usuari no trobada"}.
+{"User session terminated","Sessió d'usuari terminada"}.
+{"User ~ts","Usuari ~ts"}.
 {"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"}.
+{"Value 'get' of 'type' attribute is not allowed","El valor 'get' a l'atribut 'type' no és permès"}.
+{"Value of '~s' should be boolean","El valor de '~s' deuria ser booleà"}.
+{"Value of '~s' should be datetime string","El valor de '~s' deuria ser una data"}.
+{"Value of '~s' should be integer","El valor de '~s' deuria ser un numero enter"}.
+{"Value 'set' of 'type' attribute is not allowed","El valor 'set' a l'atribut 'type' no és permès"}.
+{"vCard User Search","vCard recerca d'usuari"}.
+{"View Queue","Vore Cua"}.
+{"View Roster","Vore Llista de contactes"}.
 {"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"}.
-{"You can later change your password using a Jabber client.","Podràs canviar la teva contrasenya més endavant utilitzant un client Jabber."}.
+{"When a new subscription is processed and whenever a subscriber comes online","Quan es processa una nova subscripció i un subscriptor es connecta"}.
+{"When a new subscription is processed","Quan es processa una nova subscripció"}.
+{"When to send the last published item","Quan s'ha enviat l'última publicació"}.
+{"Whether an entity wants to receive an XMPP message body in addition to the payload format","Si una entitat vol rebre un missatge XMPP amb el format payload"}.
+{"Whether an entity wants to receive digests (aggregations) of notifications or all notifications individually","Si una entitat vol rebre resums (agregacions) de notificacions o totes les notificacions individualment"}.
+{"Whether an entity wants to receive or disable notifications","Si una entitat vol rebre notificacions o no"}.
+{"Whether owners or publisher should receive replies to items","Si el propietaris o publicadors deurien de rebre respostes als elements"}.
+{"Whether the node is a leaf (default) or a collection","Si el node es fulla (per defecte) o es una col·lecció"}.
+{"Whether to allow subscriptions","Permetre subscripcions"}.
+{"Whether to make all subscriptions temporary, based on subscriber presence","Si fer totes les subscripcions temporals, basat en la presencia del subscriptor"}.
+{"Whether to notify owners about new subscribers and unsubscribes","Si notificar als propietaris sobre noves subscripcions i desubscripcions"}.
+{"Who may associate leaf nodes with a collection","Qui pot associar nodes fulla amb una col·lecció"}.
+{"Wrong parameters in the web formulary","Paràmetres incorrectes en el formulari web"}.
+{"Wrong xmlns","El xmlns ès incorrecte"}.
+{"XMPP Account Registration","Registre de compte XMPP"}.
+{"XMPP Domains","Dominis XMPP"}.
+{"XMPP Show Value of Away","Valor 'show' de XMPP: Ausent"}.
+{"XMPP Show Value of Chat","Valor 'show' de XMPP: Disposat per a xarrar"}.
+{"XMPP Show Value of DND (Do Not Disturb)","Valor 'show' de XMPP: DND (No Molestar)"}.
+{"XMPP Show Value of XA (Extended Away)","Valor 'show' de XMPP: XA (Molt Ausent)"}.
+{"XMPP URI of Associated Publish-Subscribe Node","URI XMPP del Node Associat Publish-Subscribe"}.
+{"You are being removed from the room because of a system shutdown","Has sigut expulsat de la sala perquè el sistema va a apagar-se"}.
+{"You are not joined to the channel","No t'has unit al canal"}.
+{"You can later change your password using an XMPP client.","Podràs canviar la teva contrasenya més endavant utilitzant un client XMPP."}.
 {"You have been banned from this room","Has sigut bloquejat en aquesta sala"}.
+{"You have joined too many conferences","Has entrat en massa sales de conferència"}.
 {"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 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 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"}.
+{"Your contact offline message queue is full. The message has been discarded.","La teua cua de missatges offline és plena. El missatge ha sigut descartat."}.
+{"Your subscription request and/or messages to ~s have been blocked. To unblock your subscription request, visit ~s","La teua petició de subscripció i/o missatges a ~s han sigut bloquejats. Per a desbloquejar-los, visita ~s"}.
+{"Your XMPP account was successfully registered.","El teu compte XMPP ha sigut creat correctament."}.
+{"Your XMPP account was successfully unregistered.","El teu compte XMPP ha sigut esborrat correctament."}.
+{"You're not allowed to create nodes","No tens permís per a crear nodes"}.

priv/msgs/cs.msg

@@ -1,20 +1,23 @@
-%% -*- coding: latin-1 -*-
+%% Generated automatically
+%% DO NOT EDIT: run `make translations` instead
+%% To improve translations please read:
+%%   https://docs.ejabberd.im/developer/extending-ejabberd/localization/
+
+{" has set the subject to: "," změnil(a) téma na: "}.
+{"A friendly name for the node","Přívětivé jméno pro uzel"}.
+{"A password is required to enter this room","Pro vstup do místnosti musíte zadat heslo"}.
 {"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"}.
 {"Add Jabber ID","Přidat Jabber ID"}.
 {"Add New","Přidat nový"}.
 {"Add User","Přidat uživatele"}.
-{"Administration","Administrace"}.
 {"Administration of ","Administrace "}.
+{"Administration","Administrace"}.
 {"Administrator privileges required","Potřebujete práva administrátora"}.
 {"All activity","Všechny aktivity"}.
+{"All Users","Všichni uživatelé"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Povolit tomuto Jabber ID odebírat tento pubsub uzel?"}.
 {"Allow users to change the subject","Povolit uživatelům měnit téma místnosti"}.
 {"Allow users to query other users","Povolit uživatelům odesílat požadavky (query) ostatním uživatelům"}.
 {"Allow users to send invites","Povolit uživatelům posílání pozvánek"}.
@@ -22,58 +25,62 @@
 {"Allow visitors to change nickname","Povolit návštěvníkům měnit přezdívku"}.
 {"Allow visitors to send private messages to","Povolit návštěvníkům odesílat soukromé zprávy"}.
 {"Allow visitors to send status text in presence updates","Povolit návštěvníkům posílat stavové zprávy ve statusu"}.
-{"All Users","Všichni uživatelé"}.
+{"Allow visitors to send voice requests","Povolit uživatelům posílat žádosti o voice práva"}.
 {"Announcements","Oznámení"}.
-{"A password is required to enter this room","Pro vstup do místnosti musíte zadat heslo"}.
 {"April",". dubna"}.
 {"August",". srpna"}.
+{"Automatic node creation is not enabled","Automatické vytváření uzlů není povoleno"}.
 {"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"}.
 {"Birthday","Datum narození"}.
+{"Both the username and the resource are required","Uživatelské jméno i zdroj jsou požadované položky"}.
+{"Bytestream already activated","Bytestream již byl aktivován"}.
+{"Cannot remove active list","Aktivní seznam nelze odebrat"}.
+{"Cannot remove default list","Výchozí seznam nelze odebrat"}.
 {"CAPTCHA web page","Webová stránka CAPTCHA"}.
 {"Change Password","Změnit heslo"}.
 {"Change User Password","Změnit heslo uživatele"}.
+{"Changing password is not allowed","Změna hesla není povolena"}.
+{"Changing role/affiliation is not allowed","Změna role/příslušnosti není povolena"}.
 {"Characters not allowed:","Nepřípustné znaky:"}.
 {"Chatroom configuration modified","Nastavení diskuzní místnosti bylo změněno"}.
-{"Chatroom is created","Konference vytvořena"}.
-{"Chatroom is destroyed","Konference zrušena"}.
-{"Chatroom is started","Konference spuštěna"}.
-{"Chatroom is stopped","Konference zastavena"}.
-{"Chatrooms","Konference"}.
+{"Chatroom is created","Místnost vytvořena"}.
+{"Chatroom is destroyed","Místnost zrušena"}.
+{"Chatroom is started","Místnost spuštěna"}.
+{"Chatroom is stopped","Místnost zastavena"}.
+{"Chatrooms","Místnosti"}.
 {"Choose a username and password to register with this server","Zadejte jméno uživatele a heslo pro registraci na tomto serveru"}.
-{"Choose modules to stop","Vyberte moduly, které mají být zastaveny"}.
 {"Choose storage type of tables","Vyberte typ úložiště pro tabulky"}.
-{"Choose whether to approve this entity's subscription.","Zvolte, zda chcete schválit odebírání touto entitou"}.
+{"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"}.
+{"Conference room does not exist","Místnost neexistuje"}.
 {"Configuration of room ~s","Konfigurace místnosti ~s"}.
+{"Configuration","Konfigurace"}.
 {"Connected Resources:","Připojené zdroje:"}.
-{"Connections parameters","Parametry spojení"}.
 {"Country","Země"}.
-{"CPU Time:","Čas procesoru"}.
-{"Database","Databáze"}.
+{"CPU Time:","Čas procesoru:"}.
+{"Database failure","Chyba databáze"}.
 {"Database Tables at ~p","Databázové tabulky na ~p"}.
 {"Database Tables Configuration at ","Konfigurace databázových tabulek "}.
+{"Database","Databáze"}.
 {"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 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"}.
 {"Description:","Popis:"}.
 {"Disc only copy","Jen kopie disku"}.
-{"Displayed Groups:","Zobrazené skupiny:"}.
-{"Don't tell your password to anybody, not even the administrators of the Jabber server.","Nikdy nikomu nesdělujte své heslo, ani administrátorovi serveru Jabberu."}.
 {"Dump Backup to Text File at ","Uložit zálohu do textového souboru na "}.
 {"Dump to Text File","Uložit do textového souboru"}.
 {"Edit Properties","Upravit vlastnosti"}.
 {"Either approve or decline the voice request.","Povolit nebo odmítnout voice žádost."}.
-{"ejabberd IRC module","ejabberd IRC modul"}.
 {"ejabberd MUC module","ejabberd MUC modul"}.
 {"ejabberd Multicast service","Služba ejabberd Multicast"}.
 {"ejabberd Publish-Subscribe module","ejabberd Publish-Subscribe modul"}.
@@ -83,47 +90,50 @@
 {"Elements","Položek"}.
 {"Email","E-mail"}.
 {"Enable logging","Zaznamenávat konverzace"}.
-{"Encoding for server ~b","Kódování pro server ~b"}.
+{"Enable message archiving","Povolit ukládání historie zpráv"}.
+{"Enabling push without 'node' attribute is not supported","Aktivováno push bez atributu 'node' není podporováno"}.
 {"End User Session","Ukončit sezení uživatele"}.
-{"Enter list of {Module, [Options]}","Vložte seznam modulů {Modul, [Parametry]}"}.
 {"Enter nickname you want to register","Zadejte přezdívku, kterou chcete zaregistrovat"}.
 {"Enter path to backup file","Zadajte cestu k souboru se zálohou"}.
 {"Enter path to jabberd14 spool dir","Zadejte cestu k jabberd14 spool adresáři"}.
 {"Enter path to jabberd14 spool file","Zadejte cestu k spool souboru jabberd14"}.
 {"Enter path to text file","Zadajte cestu k textovému souboru"}.
 {"Enter the text you see","Zadejte text, který vidíte"}.
-{"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.","Zadejte přezdívku a kódování, které chcete používat pro připojení k serverům IRC. Stiskněte 'Další' pro více políček k vyplnění. Stiskněte 'Dokončit' pro uložení nastavení."}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Zadejte přezdívku, kódování, porty a hesla, které chcete používat pro připojení k serverům IRC"}.
-{"Erlang Jabber Server","Erlang Jabber Server"}.
 {"Error","Chyba"}.
-{"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Příklad: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].2\"}]."}.
+{"Exclude Jabber IDs from CAPTCHA challenge","Vyloučit Jabber ID z procesu CAPTCHA ověřování"}.
 {"Export 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):"}.
+{"External component failure","Chyba externí komponenty"}.
+{"External component timeout","Timeout externí komponenty"}.
+{"Failed to activate bytestream","Chyba při aktivaci bytestreamu"}.
 {"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"}.
+{"Failed to map delegated namespace to external component","Chyba při mapování namespace pro externí komponentu"}.
+{"Failed to parse HTTP response","Chyba parsování HTTP odpovědi"}.
+{"Failed to process option '~s'","Chyba při zpracování možnosti '~s'"}.
 {"Family Name","Příjmení"}.
 {"February",". února"}.
-{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","Pro vyhledání uživatele Jabberu vyplňte formulář (na konec přidejte znak * pro vyhledání podřetězce)"}.
+{"File larger than ~w bytes","Soubor větší než ~w bytů"}.
 {"Friday","Pátek"}.
 {"From","Od"}.
-{"From ~s","Od  ~s"}.
 {"Full Name","Celé jméno"}.
 {"Get Number of Online Users","Získat počet online uživatelů"}.
 {"Get Number of Registered Users","Získat počet registrovaných uživatelů"}.
 {"Get User Last Login Time","Získat čas podleního přihlášení uživatele"}.
 {"Get User Password","Získat heslo uživatele"}.
 {"Get User Statistics","Získat statistiky uživatele"}.
-{"Group ","Skupina "}.
+{"Given Name","Křestní jméno"}.
+{"Grant voice to this person?","Udělit voice práva této osobě?"}.
+{"Group","Skupina"}.
 {"Groups","Skupiny"}.
 {"has been banned","byl(a) zablokován(a)"}.
-{"has been kicked because of an affiliation change","byl(a) vyhozen(a) kvůli změně přiřazení"}.
 {"has been kicked because of a system shutdown","byl(a) vyhozen(a), protože dojde k vypnutí systému"}.
+{"has been kicked because of an affiliation change","byl(a) vyhozen(a) kvůli změně přiřazení"}.
 {"has been kicked because the room has been changed to members-only","byl(a) vyhozen(a), protože mísnost je nyní pouze pro členy"}.
 {"has been kicked","byl(a) vyhozen(a) z místnosti"}.
-{" has set the subject to: "," změnil(a) téma na: "}.
+{"Host unknown","Neznámý hostitel"}.
 {"Host","Hostitel"}.
 {"If you don't see the CAPTCHA image here, visit the web page.","Pokud zde nevidíte obrázek CAPTCHA, přejděte na webovou stránku."}.
-{"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Pokud chcete zadat jiné kódování pro IRC servery, vyplňte seznam s hodnotami ve formátu '{\"irc server\",\"encoding\", port, \"password\"}'. Výchozí kódování pro tuto službu je \"~s\", port ~p, empty password."}.
 {"Import Directory","Import adresáře"}.
 {"Import File","Import souboru"}.
 {"Import user data from jabberd14 spool file:","Importovat uživatele z jabberd14 spool souborů:"}.
@@ -132,29 +142,27 @@
 {"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 domain part of 'from' attribute","Nesprávná část s doménou atributu 'from'"}.
 {"Improper message type","Nesprávný typ zprávy"}.
 {"Incoming s2s Connections:","Příchozí s2s spojení:"}.
+{"Incorrect CAPTCHA submit","Nesprávné odeslání CAPTCHA"}.
+{"Incorrect data form","Nesprávný datový formulář"}.
 {"Incorrect password","Nesprávné heslo"}.
+{"Incorrect value of 'action' attribute","Nesprávná hodnota atributu 'action'"}.
+{"Incorrect value of 'action' in data form","Nesprávná hodnota atributu 'action' v datovém formuláři"}.
+{"Incorrect value of 'path' in data form","Nesprávná hodnota atributu 'path' v datovém formuláři"}.
+{"Insufficient privilege","Nedostatečné oprávnění"}.
+{"Invalid 'from' attribute in forwarded message","Nesprávný atribut 'from' v přeposlané zprávě"}.
+{"Invitations are not allowed in this conference","Pozvánky nejsou povoleny v této místnosti"}.
 {"IP addresses","IP adresy"}.
-{"IP","IP"}.
-{"IRC channel (don't put the first #)","IRC kanál (bez počátečního #)"}.
-{"IRC server","IRC přezdívka"}.
-{"IRC settings","Nastavení IRC"}.
-{"IRC Transport","IRC transport"}.
-{"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 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 místnosti. Účastník (~s) odeslal chybovou zprávu (~s) a byl vyhozen z místnosti"}.
 {"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"}.
+{"It is not allowed to send private messages to the conference","Není povoleno odesílat soukromé zprávy v této místnosti"}.
+{"It is not allowed to send private messages","Je zakázáno posílat soukromé zprávy"}.
 {"Jabber ID","Jabber ID"}.
 {"January",". ledna"}.
-{"Join IRC channel","Vstoupit do IRC kanálu"}.
 {"joins the room","vstoupil(a) do místnosti"}.
-{"Join the IRC channel here.","Vstoupit do tohoto IRC kanálu."}.
-{"Join the IRC channel in this Jabber ID: ~s","Vstupte do IRC kanálu s tímto Jabber ID: ~s"}.
 {"July",". července"}.
 {"June",". června"}.
 {"Last Activity","Poslední aktivita"}.
@@ -162,10 +170,7 @@
 {"Last month","Poslední měsíc"}.
 {"Last year","Poslední rok"}.
 {"leaves the room","opustil(a) místnost"}.
-{"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í"}.
+{"List of rooms","Seznam místností"}.
 {"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"}.
@@ -174,128 +179,160 @@
 {"Make room password protected","Chránit místnost heslem"}.
 {"Make room persistent","Nastavit místnost jako stálou"}.
 {"Make room public searchable","Nastavit místnost jako veřejnou"}.
+{"Malformed username","Chybně formátováné jméno uživatele"}.
 {"March",". března"}.
+{"Max # of items to persist","Maximální počet položek, které je možné natrvalo uložit"}.
+{"Max payload size in bytes","Maximální náklad v bajtech"}.
 {"Maximum Number of Occupants","Počet účastníků"}.
 {"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"}.
+{"Message not found in forwarded payload","Zpráva nebyla nalezena v přeposlaném obsahu"}.
 {"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 privileges required","Potřebujete práva moderátora"}.
+{"Moderator","Moderátor"}.
 {"Modified modules","Aktualizované moduly"}.
-{"Module","Modul"}.
-{"Modules at ~p","Moduly v ~p"}.
-{"Modules","Moduly"}.
+{"Module failed to handle the query","Modul chyboval při zpracování dotazu"}.
 {"Monday","Pondělí"}.
 {"Multicast","Multicast"}.
 {"Multi-User Chat","Víceuživatelský chat"}.
-{"Name:","Jméno:"}.
 {"Name","Jméno"}.
+{"Name:","Jméno:"}.
+{"Neither 'jid' nor 'nick' attribute found","Nebyl nalezen atribut 'jid' ani 'nick'"}.
+{"Neither 'role' nor 'affiliation' attribute found","Nebyl nalezen atribut 'role'  ani 'affiliation'"}.
 {"Never","Nikdy"}.
 {"New Password:","Nové heslo:"}.
-{"Nickname","Přezdívka"}.
 {"Nickname Registration at ","Registrace přezdívky na "}.
 {"Nickname ~s does not exist in the room","Přezdívka ~s v místnosti neexistuje"}.
+{"Nickname","Přezdívka"}.
+{"No 'affiliation' attribute found","Chybějící atribut 'affiliation'"}.
+{"No available resource found","Nebyl nalezen žádný dostupný zdroj"}.
 {"No body provided for announce message","Zpráva neobsahuje text"}.
+{"No data form found","Nebyl nalezen datový formulář"}.
 {"No Data","Žádná data"}.
+{"No features available","Žádné funce nejsou dostupné"}.
+{"No hook has processed this command","Žádný hook nebyl zpracován tímto příkazem"}.
+{"No info about last activity found","Nebyla žádná informace o poslední aktivitě"}.
+{"No 'item' element found","Element 'item' nebyl nalezen"}.
+{"No items found in this query","Žádné položky nebyly nalezeny v tomto dotazu"}.
+{"No limit","Bez limitu"}.
+{"No module is handling this query","Žádný modul neobsluhuje tento dotaz"}.
+{"No node specified","Žádný uzel nebyl specifikován"}.
+{"No 'password' found in data form","Chybějící atribut 'password' v datovém formuláři"}.
+{"No 'password' found in this query","Chybějící atribut 'password' v tomto dotazu"}.
+{"No 'path' found in data form","Chybějící atribut 'path' v datovém formuláři"}.
+{"No pending subscriptions found","Žádné čekající předplatné nebylo nalezeno"}.
+{"No privacy list with this name found","Žádný privacy list s tímto jménem nebyl nalezen"}.
+{"No private data found in this query","Žádná soukromá data nebyla nalezena tímto dotazem"}.
+{"No running node found","Nebyl nalezen žádný běžící uzel"}.
+{"No services available","Žádné služby nejsou dostupné"}.
+{"No statistics found for this item","Nebyly nalezeny statistiky pro uvedenou položku"}.
+{"No 'to' attribute found in the invitation","Chybějící atribut 'to' v pozvánce"}.
+{"Node already exists","Uzel již existuje"}.
+{"Node ID","ID uzlu"}.
+{"Node index not found","Index uzlu nebyl nalezen"}.
 {"Node not found","Uzel nenalezen"}.
 {"Node ~p","Uzel ~p"}.
+{"Nodeprep has failed","Nodeprep chyboval"}.
 {"Nodes","Uzly"}.
 {"None","Nic"}.
 {"Not Found","Nenalezeno"}.
+{"Not subscribed","Není odebíráno"}.
+{"Notify subscribers when items are removed from the node","Upozornit odběratele na odstranění položek z uzlu"}.
+{"Notify subscribers when the node configuration changes","Upozornit odběratele na změnu nastavení uzlu"}.
+{"Notify subscribers when the node is deleted","Upozornit odběratele na smazání uzlu"}.
 {"November",". listopadu"}.
+{"Number of occupants","Počet účastníků"}.
 {"Number of online users","Počet online uživatelů"}.
 {"Number of registered users","Počet registrovaných uživatelů"}.
 {"October",". října"}.
-{"Offline Messages:","Offline zprávy:"}.
 {"Offline Messages","Offline zprávy"}.
+{"Offline Messages:","Offline zprávy:"}.
 {"OK","OK"}.
 {"Old Password:","Současné heslo:"}.
+{"Online Users","Připojení uživatelé"}.
+{"Online Users:","Připojení uživatelé:"}.
 {"Online","Online"}.
-{"Online Users:","Online uživatelé:"}.
-{"Online Users","Online uživatelé"}.
+{"Only deliver notifications to available users","Doručovat upozornění jen právě přihlášeným uživatelům"}.
+{"Only <enable/> or <disable/> tags are allowed","Pouze značky <enable/> nebo <disable/>jsou povoleny"}.
+{"Only <list/> element is allowed in this query","Pouze element <list/> je povolen v tomto dotazu"}.
 {"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 occupants are allowed to send messages to the conference","Jen členové mají povolené zasílat zprávy do místnosti"}.
+{"Only occupants are allowed to send queries to the conference","Jen členové mohou odesílat požadavky (query) do místnosti"}.
 {"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 Connections:","Odchozí s2s spojení:"}.
 {"Owner privileges required","Jsou vyžadována práva vlastníka"}.
 {"Packet","Paket"}.
-{"Password ~b","Heslo ~b"}.
-{"Password:","Heslo:"}.
-{"Password","Heslo"}.
-{"Password Verification:","Ověření hesla:"}.
+{"Participant","Účastník"}.
 {"Password Verification","Ověření hesla"}.
+{"Password Verification:","Ověření hesla:"}.
+{"Password","Heslo"}.
+{"Password:","Heslo:"}.
 {"Path to Dir","Cesta k adresáři"}.
 {"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 query is incorrect","Ping dotaz je nesprávný"}.
 {"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, 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"}.
+{"Present real Jabber IDs to","Odhalovat skutečná Jabber ID"}.
 {"private, ","soukromá, "}.
-{"Protocol","Protokol"}.
 {"Publish-Subscribe","Publish-Subscribe"}.
 {"PubSub subscriber request","Žádost odběratele PubSub"}.
-{"Queries to the conference members are not allowed in this room","Požadavky (queries) na členy konference nejsou v této místnosti povolené"}.
+{"Purge all items when the relevant publisher goes offline","Smazat všechny položky, pokud se příslušný poskytovatel odpojí"}.
+{"Queries to the conference members are not allowed in this room","Požadavky (queries) na členy místnosti nejsou v této místnosti povolené"}.
+{"Query to another users is forbidden","Dotaz na jiné uživatele je zakázán"}.
 {"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"}.
+{"Recipient is not in the conference room","Příjemce se nenachází v místnosti"}.
 {"Registered Users","Registrovaní uživatelé"}.
-{"Registered Users:","Registrovaní živatelé:"}.
+{"Registered Users:","Registrovaní uživatelé:"}.
 {"Register","Zaregistrovat se"}.
-{"Registration in mod_irc for ","Registrace do mod_irc na "}.
 {"Remote copy","Vzdálená kopie"}.
 {"Remove All Offline Messages","Odstranit všechny offline zprávy"}.
-{"Remove","Odstranit"}.
 {"Remove User","Odstranit uživatele"}.
+{"Remove","Odstranit"}.
 {"Replaced by new connection","Nahrazeno novým spojením"}.
 {"Resources","Zdroje"}.
-{"Restart","Restart"}.
 {"Restart Service","Restartovat službu"}.
+{"Restart","Restart"}.
 {"Restore Backup from File at ","Obnovit zálohu ze souboru na "}.
-{"Restore binary backup after next ejabberd restart (requires less memory):","Obnovit binární zálohu při následujícím restartu ejabberd (vyžaduje méně paměti)"}.
+{"Restore binary backup after next ejabberd restart (requires less memory):","Obnovit binární zálohu při následujícím restartu ejabberd (vyžaduje méně paměti):"}.
 {"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:"}.
+{"Restore","Obnovit"}.
+{"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"}.
-{"Roster of ","Seznam kontaktů "}.
-{"Roster","Seznam kontaktů"}.
+{"Roster groups allowed to subscribe","Skupiny kontaktů, které mohou odebírat"}.
 {"Roster size","Velikost seznamu kontaktů"}.
 {"RPC Call Error","Chyba RPC volání"}.
 {"Running Nodes","Běžící uzly"}.
-{"~s access rule configuration","~s konfigurace pravidla přístupu"}.
 {"Saturday","Sobota"}.
 {"Script check","Kontrola skriptu"}.
 {"Search Results for ","Výsledky hledání pro "}.
 {"Search users in ","Hledat uživatele v "}.
-{"Send announcement to all online users","Odeslat oznámení všem online uživatelům"}.
 {"Send announcement to all online users on all hosts","Odeslat oznámení všem online uživatelům na všech hostitelích"}.
-{"Send announcement to all users","Odeslat oznámení všem uživatelům"}.
+{"Send announcement to all online users","Odeslat oznámení všem online uživatelům"}.
 {"Send announcement to all users on all hosts","Odeslat oznámení všem uživatelům na všech hostitelích"}.
+{"Send announcement to all users","Odeslat oznámení všem uživatelům"}.
 {"September",". září"}.
-{"Server ~b","Server ~b"}.
 {"Server:","Server:"}.
 {"Set message of the day and send to online users","Nastavit zprávu dne a odeslat ji online uživatelům"}.
 {"Set message of the day on all hosts and send to online users","Nastavit zprávu dne a odeslat ji online uživatelům"}.
@@ -303,16 +340,11 @@
 {"Show Integral Table","Zobrazit kompletní tabulku"}.
 {"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 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."}.
-{"~s's Offline Messages Queue","Fronta offline zpráv uživatele ~s"}.
-{"Start Modules at ","Spustit moduly na "}.
-{"Start Modules","Spustit moduly"}.
-{"Start","Start"}.
+{"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í"}.
 {"Statistics of ~p","Statistiky ~p"}.
 {"Statistics","Statistiky"}.
-{"Stop Modules at ","Zastavit moduly na "}.
-{"Stop Modules","Zastavit moduly"}.
 {"Stopped Nodes","Zastavené uzly"}.
 {"Stop","Stop"}.
 {"Storage Type","Typ úložiště"}.
@@ -321,72 +353,92 @@
 {"Subject","Předmět"}.
 {"Submit","Odeslat"}.
 {"Submitted","Odeslané"}.
+{"Subscriber Address","Adresa odběratele"}.
 {"Subscription","Přihlášení"}.
+{"Subscriptions are not allowed","Předplatné není povoleno"}.
 {"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 password is","heslo je"}.
+{"The collections with which a node is affiliated","Kolekce, se kterými je uzel spřízněn"}.
+{"The feature requested is not supported by the conference","Požadovaná vlastnost není podporována touto místností"}.
+{"The password contains unacceptable characters","Heslo obsahuje nepovolené znaky"}.
 {"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ě."}.
+{"the password is","heslo je"}.
+{"The query is only allowed from local users","Dotaz je povolen pouze pro místní uživatele"}.
+{"The query must not contain <item/> elements","Dotaz nesmí obsahovat elementy <item/>"}.
+{"The stanza MUST contain only one <active/> element, one <default/> element, or one <list/> element","Stanza MUSÍ obsahovat pouze jeden element  <active/>, jeden element <default/> nebo jeden element <list/>"}.
+{"There was an error creating the account: ","Při vytváření účtu došlo k chybě:"}.
 {"There was an error deleting the account: ","Při mazání účtu došlo k chybě: "}.
-{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Zde nezáleží na velikosti písmen: macbeth je stejný jako MacBeth a Macbeth."}.
-{"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Na této stránce si můžete vytvořit účet na tomto serveru Jabberu. Vaše JID (Jabber IDentifikátor) bude mít tvar: uživatelskéjméno@server. Přečtěte si prosím pozorně instrukce pro vyplnění údajů."}.
-{"This page allows to unregister a Jabber account in this Jabber server.","Zde můžete zrušit registraci účtu na tomto serveru Jabberu."}.
 {"This room is not anonymous","Tato místnost není anonymní"}.
 {"Thursday","Čtvrtek"}.
-{"Time","Čas"}.
 {"Time delay","Časový posun"}.
+{"Time","Čas"}.
+{"To register, visit ~s","Pokud se chcete zaregistrovat, navštivte ~s"}.
+{"Token TTL","Token TTL"}.
+{"Too many active bytestreams","Příliš mnoho aktivních bytestreamů"}.
 {"Too many CAPTCHA requests","Přiliš mnoho CAPTCHA žádostí"}.
+{"Too many <item/> elements","Příliš mnoho elementů <item/>"}.
+{"Too many <list/> elements","Přilíš mnoho elementů <list/>"}.
+{"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"}.
+{"Too many users in this conference","Přiliš mnoho uživatelů v této místnosti"}.
 {"To","Pro"}.
-{"To ~s","Pro ~s"}.
-{"Total rooms","Celkem konferencí"}.
+{"Total rooms","Celkem místností"}.
 {"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"}.
+{"Transactions Aborted:","Transakcí zrušených:"}.
+{"Transactions Committed:","Transakcí potvrzených:"}.
+{"Transactions Logged:","Transakcí zaznamenaných:"}.
+{"Transactions Restarted:","Transakcí restartovaných:"}.
 {"Tuesday","Úterý"}.
 {"Unable to generate a CAPTCHA","Nebylo možné vygenerovat CAPTCHA"}.
+{"Unable to register route on existing local domain","Není možné zaregistrovat routu na existující místní doménu"}.
 {"Unauthorized","Nemáte oprávnění"}.
-{"Unregister a Jabber account","Zrušte registraci účtu Jabberu"}.
+{"Unexpected action","Neočekávaná akce"}.
 {"Unregister","Zrušit registraci"}.
-{"Update","Aktualizovat"}.
+{"Unsupported <index/> element","Nepodporovaný <index/> element"}.
 {"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"}.
+{"Update","Aktualizovat"}.
 {"Uptime:","Čas běhu:"}.
-{"Use of STARTTLS required","Je vyžadováno STARTTLS"}.
+{"User already exists","Uživatel již existuje"}.
+{"User JID","Jabber ID uživatele"}.
+{"User (jid)","Uživatel (JID)"}.
 {"User Management","Správa uživatelů"}.
+{"User session not found","Sezení uživatele nebylo nalezeno"}.
+{"User session terminated","Sezení uživatele bylo ukončeno"}.
 {"Username:","Uživatelské jméno:"}.
 {"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 ~s","Uživatel ~s"}.
 {"User","Uživatel"}.
 {"Validate","Ověřit"}.
-{"vCard User Search","Hledání uživatelů podle vizitek"}.
+{"Value 'get' of 'type' attribute is not allowed","Hodnota 'get' atrubutu 'type' není povolena"}.
+{"Value of '~s' should be boolean","Hodnota  '~s' by měla být boolean"}.
+{"Value of '~s' should be datetime string","Hodnota  '~s' by měla být datetime řetězec"}.
+{"Value of '~s' should be integer","Hodnota '~s' by měla být celé číslo"}.
+{"Value 'set' of 'type' attribute is not allowed","Hodnota 'set' atrubutu 'type' není povolena"}.
+{"vCard User Search","Hledání uživatelů ve vizitkách"}.
 {"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"}.
+{"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 v této místnosti"}.
+{"Voice requests are disabled in this conference","Voice žádosti jsou v této místnosti zakázány"}.
 {"Voice request","Žádost o voice práva"}.
 {"Wednesday","Středa"}.
-{"You can later change your password using a Jabber client.","Později můžete své heslo změnit pomocí klienta Jabberu."}.
+{"When to send the last published item","Kdy odeslat poslední publikovanou položku"}.
+{"Whether to allow subscriptions","Povolit odebírání"}.
 {"You have been banned from this room","Byl jste vyloučen z této místnosti"}.
+{"You have joined too many conferences","Vstoupil jste do příliš velkého množství místností"}.
 {"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 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"}.
+{"Your subscription request and/or messages to ~s have been blocked. To unblock your subscription request, visit ~s","Nesmíte posílat zprávy na ~s. Pro povolení navštivte ~s"}.
+{"You're not allowed to create nodes","Nemáte povoleno vytvářet uzly"}.

priv/msgs/de.msg

@@ -1,392 +1,664 @@
-%% -*- coding: latin-1 -*-
+%% Generated automatically
+%% DO NOT EDIT: run `make translations` instead
+%% To improve translations please read:
+%%   https://docs.ejabberd.im/developer/extending-ejabberd/localization/
+
+{" (Add * to the end of field to match substring)"," (Fügen Sie * am Ende des Feldes hinzu um nach Teilzeichenketten zu suchen)"}.
+{" has set the subject to: "," hat das Thema geändert auf: "}.
+{"# participants","# Teilnehmer"}.
+{"A description of the node","Eine Beschreibung des Knotens"}.
+{"A friendly name for the node","Ein benutzerfreundlicher Name für den Knoten"}.
+{"A password is required to enter this room","Ein Passwort ist erforderlich um diesen Raum zu betreten"}.
+{"A Web Page","Eine Webseite"}.
 {"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"}.
+{"Access denied by service policy","Zugriff aufgrund der Dienstrichtlinien verweigert"}.
+{"Access model of authorize","Zugriffsmodell von 'authorize'"}.
+{"Access model of open","Zugriffsmodell von 'open'"}.
+{"Access model of presence","Zugriffsmodell von 'presence'"}.
+{"Access model of roster","Zugriffsmodell der Kontaktliste"}.
+{"Access model of whitelist","Zugriffsmodell von 'whitelist'"}.
+{"Access model","Zugriffsmodell"}.
+{"Account doesn't exist","Konto existiert nicht"}.
 {"Action on user","Aktion auf Benutzer"}.
 {"Add Jabber ID","Jabber-ID 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"}.
+{"Administrator privileges required","Administratorrechte erforderlich"}.
 {"All activity","Alle Aktivitäten"}.
+{"All Users","Alle Benutzer"}.
+{"Allow subscription","Abonnement erlauben"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Dieser Jabber-ID das Abonnement dieses pubsub-Knotens erlauben?"}.
+{"Allow this person to register with the room?","Dieser Person erlauben, sich beim Raum anzumelden?"}.
 {"Allow users to change the subject","Erlaube Benutzern das Thema zu ändern"}.
 {"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 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"}.
-{"All Users","Alle Benutzer"}.
+{"Allow visitors to send status text in presence updates","Erlaube Besuchern einen Statustext bei Präsenzupdates zu senden"}.
+{"Allow visitors to send voice requests","Erlaube Besuchern Sprachrecht-Anforderungen zu senden"}.
+{"An associated LDAP group that defines room membership; this should be an LDAP Distinguished Name according to an implementation-specific or deployment-specific definition of a group.","Eine zugehörige LDAP-Gruppe die Raummitgliedschaft definiert; dies sollte ein 'LDAP Distinguished Name' gemäß einer implementierungs- oder bereitstellungsspezifischen Definition einer Gruppe sein."}.
 {"Announcements","Ankündigungen"}.
-{"A password is required to enter this room","Sie brauchen ein Passwort um diesen Raum zu betreten"}.
+{"Answer associated with a picture","Antwort verbunden mit einem Bild"}.
+{"Answer associated with a video","Antwort verbunden mit einem Video"}.
+{"Answer associated with speech","Antwort verbunden mit Sprache"}.
+{"Answer to a question","Antwort auf eine Frage"}.
+{"Anyone in the specified roster group(s) may subscribe and retrieve items","Jeder in der/den angeführten Kontaktlistengruppe(n) darf Items abonnieren und abrufen"}.
+{"Anyone may associate leaf nodes with the collection","Jeder darf Blattknoten mit der Sammlung verknüpfen"}.
+{"Anyone may publish","Jeder darf veröffentlichen"}.
+{"Anyone may subscribe and retrieve items","Jeder darf Items abonnieren und abrufen"}.
+{"Anyone with a presence subscription of both or from may subscribe and retrieve items","Jeder mit einem Präsenzabonnement von beiden oder davon darf Items abonnieren oder abrufen"}.
+{"Anyone with Voice","Jeder mit Stimme"}.
+{"Anyone","Jeder"}.
 {"April","April"}.
+{"Attribute 'channel' is required for this request","Attribut 'channel' ist für diese Anforderung erforderlich"}.
+{"Attribute 'id' is mandatory for MIX messages","Attribut 'id' ist verpflichtend für MIX-Nachrichten"}.
+{"Attribute 'jid' is not allowed here","Attribut 'jid' ist hier nicht erlaubt"}.
+{"Attribute 'node' is not allowed here","Attribut 'node' ist hier nicht erlaubt"}.
+{"Attribute 'to' of stanza that triggered challenge","Attribut 'to' des Stanza das die Herausforderung ausgelöst hat"}.
 {"August","August"}.
-{"Backup","Datensicherung"}.
-{"Backup Management","Datensicherungsverwaltung"}.
-{"Backup of ~p","Sicherung von ~p"}.
-{"Backup to File at ","Datensicherung in die Datei "}.
+{"Automatic node creation is not enabled","Automatische Knotenerstellung ist nicht aktiviert"}.
+{"Backup Management","Backupverwaltung"}.
+{"Backup of ~p","Backup von ~p"}.
+{"Backup to File at ","Backup in Datei bei "}.
+{"Backup","Backup"}.
 {"Bad format","Ungültiges Format"}.
 {"Birthday","Geburtsdatum"}.
-{"CAPTCHA web page","CAPTCHA Webseite"}.
+{"Both the username and the resource are required","Sowohl der Benutzername als auch die Ressource sind erforderlich"}.
+{"Bytestream already activated","Bytestream bereits aktiviert"}.
+{"Cannot remove active list","Kann aktive Liste nicht entfernen"}.
+{"Cannot remove default list","Kann Standardliste nicht entfernen"}.
+{"CAPTCHA web page","CAPTCHA -Webseite"}.
+{"Challenge ID","Herausforderungs-ID"}.
 {"Change Password","Passwort ändern"}.
-{"Change User Password","Benutzer-Passwort ändern"}.
+{"Change User Password","Benutzerpasswort ändern"}.
+{"Changing password is not allowed","Ändern des Passwortes ist nicht erlaubt"}.
+{"Changing role/affiliation is not allowed","Ändern der Rolle/Zugehörigkeit ist nicht erlaubt"}.
+{"Channel already exists","Kanal existiert bereits"}.
+{"Channel does not exist","Kanal existiert nicht"}.
+{"Channels","Kanäle"}.
 {"Characters not allowed:","Nicht erlaubte Zeichen:"}.
 {"Chatroom configuration modified","Chatraum-Konfiguration geändert"}.
-{"Chatroom is created","Chatraum wurde erstellt"}.
-{"Chatroom is destroyed","Chatraum wurde entfernt"}.
-{"Chatroom is started","Chatraum wurde gestartet"}.
-{"Chatroom is stopped","Chatraum wurde beendet"}.
+{"Chatroom is created","Chatraum ist erstellt"}.
+{"Chatroom is destroyed","Chatraum ist entfernt"}.
+{"Chatroom is started","Chatraum ist gestartet"}.
+{"Chatroom is stopped","Chatraum ist beendet"}.
 {"Chatrooms","Chaträume"}.
-{"Choose a username and password to register with this server","Wählen sie zum Registrieren einen Benutzernamen und ein Passwort"}.
-{"Choose modules to stop","Wähle zu stoppende Module"}.
+{"Choose a username and password to register with this server","Wählen Sie zum Registrieren auf diesem Server einen Benutzernamen und ein Passwort"}.
 {"Choose storage type of tables","Wähle Speichertyp der Tabellen"}.
-{"Choose whether to approve this entity's subscription.","Wählen sie, ob dieses Abonnement akzeptiert werden soll."}.
+{"Choose whether to approve this entity's subscription.","Wählen Sie, ob das Abonnement dieser Entität genehmigt werden soll."}.
 {"City","Stadt"}.
+{"Client acknowledged more stanzas than sent by server","Client bestätigte mehr Stanzas als vom Server gesendet"}.
 {"Commands","Befehle"}.
 {"Conference room does not exist","Konferenzraum existiert nicht"}.
+{"Configuration of room ~s","Konfiguration des Raumes ~s"}.
 {"Configuration","Konfiguration"}.
-{"Configuration of room ~s","Konfiguration für Raum ~s"}.
 {"Connected Resources:","Verbundene Ressourcen:"}.
-{"Connections parameters","Verbindungsparameter"}.
+{"Contact Addresses (normally, room owner or owners)","Kontaktadresse (normalerweise Raumbesitzer)"}.
 {"Country","Land"}.
 {"CPU Time:","CPU-Zeit:"}.
+{"Current Discussion Topic","Aktuelles Diskussionsthema"}.
+{"Database failure","Datenbankfehler"}.
+{"Database Tables at ~p","Datenbanktabellen bei ~p"}.
+{"Database Tables Configuration at ","Datenbanktabellen-Konfiguration bei "}.
 {"Database","Datenbank"}.
-{"Database Tables at ~p","Datenbanktabellen auf ~p"}.
-{"Database Tables Configuration at ","Datenbanktabellen-Konfiguration auf "}.
 {"December","Dezember"}.
-{"Default users as participants","Benutzer werden standardmäßig vollwertige Teilnehmer"}.
-{"Delete message of the day","Lösche Nachricht des Tages"}.
+{"Default users as participants","Benutzer werden standardmäßig Teilnehmer"}.
+{"Delete content","Inhalt löschen"}.
 {"Delete message of the day on all hosts","Lösche Nachricht des Tages auf allen Hosts"}.
+{"Delete message of the day","Lösche Nachricht des Tages"}.
 {"Delete Selected","Markierte löschen"}.
+{"Delete table","Tabelle löschen"}.
 {"Delete User","Benutzer löschen"}.
+{"Deliver event notifications","Ereignisbenachrichtigungen zustellen"}.
+{"Deliver payloads with event notifications","Nutzdaten mit Ereignisbenachrichtigungen zustellen"}.
 {"Description:","Beschreibung:"}.
 {"Disc only copy","Nur auf Festplatte"}.
-{"Displayed Groups:","Angezeigte Gruppen:"}.
-{"Don't tell your password to anybody, not even the administrators of the Jabber server.","Geben sie niemandem ihr Passwort, auch nicht den Administratoren des Jabber Servers."}.
-{"Dump Backup to Text File at ","Ausgabe der Sicherung in diese Textdatei "}.
+{"'Displayed groups' not added (they do not exist!): ","'Angezeigte Gruppen' nicht hinzugefügt (sie existieren nicht!): "}.
+{"Displayed:","Angezeigt:"}.
+{"Don't tell your password to anybody, not even the administrators of the XMPP server.","Geben Sie niemandem Ihr Passwort, auch nicht den Administratoren des XMPP-Servers."}.
+{"Dump Backup to Text File at ","Gib Backup in Textdatei aus bei "}.
 {"Dump to Text File","Ausgabe in Textdatei"}.
-{"Edit Properties","Einstellungen ändern"}.
-{"Either approve or decline the voice request.","Diese Anfrage für Sprachrechte bestätigen oder ablehnen."}.
-{"ejabberd IRC module","ejabberd IRC-Modul"}.
+{"Duplicated groups are not allowed by RFC6121","Doppelte Gruppen sind laut RFC6121 nicht erlaubt"}.
+{"Dynamically specify a replyto of the item publisher","Dynamisch ein 'replyto' des Item-Veröffentlichers angeben"}.
+{"Edit Properties","Eigenschaften ändern"}.
+{"Either approve or decline the voice request.","Sprachrecht-Anforderung entweder genehmigen oder ablehnen."}.
+{"ejabberd HTTP Upload service","ejabberd HTTP Upload-Dienst"}.
 {"ejabberd MUC module","ejabberd MUC-Modul"}.
-{"ejabberd Multicast service","ejabberd Multicast Dienst"}.
+{"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"}.
+{"ejabberd","ejabberd"}.
 {"Elements","Elemente"}.
+{"Email Address","E-Mail-Adresse"}.
 {"Email","E-Mail"}.
 {"Enable logging","Protokollierung 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 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 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"}.
+{"Enable message archiving","Nachrichtenarchivierung aktivieren"}.
+{"Enabling push without 'node' attribute is not supported","push ohne 'node'-Attribut zu aktivieren wird nicht unterstützt"}.
+{"End User Session","Benutzersitzung beenden"}.
+{"Enter nickname you want to register","Geben Sie den Spitznamen ein den Sie registrieren wollen"}.
+{"Enter path to backup file","Geben Sie den Pfad zur Backupdatei ein"}.
+{"Enter path to jabberd14 spool dir","Geben Sie den Pfad zum jabberd14-Spoolverzeichnis ein"}.
+{"Enter path to jabberd14 spool file","Geben Sie den Pfad zur jabberd14-Spooldatei ein"}.
+{"Enter path to text file","Geben Sie den Pfad zur Textdatei ein"}.
+{"Enter the text you see","Geben Sie den Text ein den Sie sehen"}.
+{"Erlang XMPP Server","Erlang XMPP-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\"}]."}.
-{"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"}.
+{"Exclude Jabber IDs from CAPTCHA challenge","Jabber-IDs von CAPTCHA-Herausforderung ausschließen"}.
+{"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:"}.
+{"External component failure","Fehler externer Komponente"}.
+{"External component timeout","Zeitüberschreitung externer Komponente"}.
+{"Failed to activate bytestream","Konnte Bytestream nicht aktivieren"}.
+{"Failed to extract JID from your voice request approval","Konnte JID nicht aus Ihrer Genehmigung der Sprachrecht-Anforderung extrahieren"}.
+{"Failed to map delegated namespace to external component","Konnte delegierten Namensraum nicht externer Komponente zuordnen"}.
+{"Failed to parse HTTP response","Konnte HTTP-Antwort nicht parsen"}.
+{"Failed to process option '~s'","Konnte Option '~s' nicht verarbeiten"}.
 {"Family Name","Nachname"}.
+{"FAQ Entry","FAQ-Eintrag"}.
 {"February","Februar"}.
-{"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)"}.
+{"File larger than ~w bytes","Datei größer als ~w Bytes"}.
+{"Fill in the form to search for any matching XMPP User","Füllen Sie das Formular aus, um nach jeglichen passenden XMPP-Benutzern zu suchen"}.
 {"Friday","Freitag"}.
-{"From ~s","Von ~s"}.
+{"From ~ts","Von ~ts"}.
 {"From","Von"}.
+{"Full List of Room Admins","Vollständige Liste der Raumadmins"}.
+{"Full List of Room Owners","Vollständige Liste der Raumbesitzer"}.
 {"Full Name","Vollständiger Name"}.
 {"Get Number of Online Users","Anzahl der angemeldeten Benutzer abrufen"}.
 {"Get Number of Registered Users","Anzahl der registrierten Benutzer abrufen"}.
-{"Get User Last Login Time","letzte Anmeldezeit abrufen"}.
-{"Get User Password","Benutzer-Passwort abrufen"}.
-{"Get User Statistics","Benutzer-Statistiken abrufen"}.
-{"Group ","Gruppe "}.
+{"Get Pending","Ausstehende abrufen"}.
+{"Get User Last Login Time","letzte Anmeldezeit des Benutzers abrufen"}.
+{"Get User Password","Benutzerpasswort abrufen"}.
+{"Get User Statistics","Benutzerstatistiken abrufen"}.
+{"Given Name","Vorname"}.
+{"Grant voice to this person?","Dieser Person Sprachrechte erteilen?"}.
+{"Group","Gruppe"}.
+{"Groups that will be displayed to the members","Gruppen, die den Mitgliedern angezeigt werden"}.
 {"Groups","Gruppen"}.
 {"has been banned","wurde gebannt"}.
-{"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: "}.
+{"has been kicked because of a system shutdown","wurde wegen einer Systemabschaltung hinausgeworfen"}.
+{"has been kicked because of an affiliation change","wurde wegen einer Änderung der Zugehörigkeit hinausgeworfen"}.
+{"has been kicked because the room has been changed to members-only","wurde hinausgeworfen weil der Raum zu Nur-Mitglieder geändert wurde"}.
+{"has been kicked","wurde hinausgeworfen"}.
+{"Host unknown","Host unbekannt"}.
 {"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."}.
-{"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Wenn sie verschiedene Ports, Passwörter und Kodierungen für IRC Server angeben wollen, erstellen sie die Liste mit folgendem Format '{\"IRC Server\", \"Kodierung\", Port, \"Passwort\"}'.  Standardmäßig benutzt dieser Dienst die \"~s\" Kodierung, den Port ~p und kein Passwort."}.
+{"HTTP File Upload","HTTP-Dateiupload"}.
+{"Idle connection","Inaktive Verbindung"}.
+{"If you don't see the CAPTCHA image here, visit the web page.","Wenn Sie das CAPTCHA-Bild nicht sehen, besuchen Sie die Webseite."}.
 {"Import Directory","Verzeichnis importieren"}.
 {"Import File","Datei importieren"}.
-{"Import user data from jabberd14 spool file:","Importiere Benutzer von jabberd14 Spool Datei:"}.
-{"Import User from File at ","Benutzer aus dieser Datei importieren "}.
-{"Import users data from a PIEFXIS file (XEP-0227):","Benutzerdaten von einer PIEFXIS Datei (XEP-0227) importieren:"}.
-{"Import users data from jabberd14 spool directory:","Importiere Benutzer von jabberd14 Spool Verzeichnis:"}.
-{"Import Users from Dir at ","Benutzer importieren aus dem Verzeichnis "}.
-{"Import Users From jabberd14 Spool Files","Importiere Benutzer aus jabberd14-Spool-Dateien"}.
+{"Import user data from jabberd14 spool file:","Importiere Benutzer von jabberd14-Spooldatei:"}.
+{"Import User from File at ","Benutzer importieren aus Datei bei "}.
+{"Import users data from a PIEFXIS file (XEP-0227):","Benutzerdaten von einer PIEFXIS-Datei (XEP-0227) importieren:"}.
+{"Import users data from jabberd14 spool directory:","Importiere Benutzer von jabberd14-Spoolverzeichnis:"}.
+{"Import Users from Dir at ","Benutzer importieren aus Verzeichnis bei "}.
+{"Import Users From jabberd14 Spool Files","Importiere Benutzer aus jabberd14-Spooldateien"}.
+{"Improper domain part of 'from' attribute","Falscher Domänenteil des 'from'-Attributs"}.
 {"Improper message type","Unzulässiger Nachrichtentyp"}.
 {"Incoming s2s Connections:","Eingehende s2s-Verbindungen:"}.
+{"Incorrect CAPTCHA submit","Falsche CAPTCHA-Eingabe"}.
+{"Incorrect data form","Falsches Datenformular"}.
 {"Incorrect password","Falsches Passwort"}.
-{"IP addresses","IP Adressen"}.
-{"IP","IP"}.
-{"IRC channel (don't put the first #)","IRC Channel (ohne dem ersten #)"}.
-{"IRC server","IRC Server"}.
-{"IRC settings","IRC Einstellungen"}.
-{"IRC Transport","IRC Transport"}.
-{"IRC username","IRC Benutzername"}.
-{"IRC Username","IRC-Benutzername"}.
+{"Incorrect value of 'action' attribute","Falscher Wert des 'action'-Attributs"}.
+{"Incorrect value of 'action' in data form","Falscher Wert von 'action' in Datenformular"}.
+{"Incorrect value of 'path' in data form","Falscher Wert von 'path' in Datenformular"}.
+{"Insufficient privilege","Unzureichende Privilegien"}.
+{"Internal server error","Interner Serverfehler"}.
+{"Invalid 'from' attribute in forwarded message","Ungültiges 'from'-Attribut in weitergeleiteter Nachricht"}.
+{"Invalid node name","Ungültiger Knotenname"}.
+{"Invalid 'previd' value","Ungültiger 'previd'-Wert"}.
+{"Invitations are not allowed in this conference","Einladungen sind in dieser Konferenz nicht erlaubt"}.
+{"IP addresses","IP-Adressen"}.
 {"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 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 geworfen"}.
+{"It is not allowed to send private messages of type \"groupchat\"","Es ist nicht erlaubt private Nachrichten des Typs \"groupchat\" zu senden"}.
+{"It is not allowed to send private messages to the conference","Es ist nicht erlaubt private Nachrichten an die Konferenz zu senden"}.
 {"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","Jabber-ID"}.
 {"January","Januar"}.
-{"Join IRC channel","IRC Channel beitreten"}.
-{"joins the room","betretet den Raum"}.
-{"Join the IRC channel here.","Hier den IRC Channel beitreten."}.
-{"Join the IRC channel in this Jabber ID: ~s","Den IRC Channel mit dieser Jabber ID beitreten: ~s"}.
+{"JID normalization denied by service policy","JID-Normalisierung aufgrund der Dienstrichtlinien verweigert"}.
+{"JID normalization failed","JID-Normalisierung fehlgeschlagen"}.
+{"joins the room","betritt den Raum"}.
 {"July","Juli"}.
 {"June","Juni"}.
+{"Just created","Gerade erstellt"}.
+{"Label:","Label:"}.
 {"Last Activity","Letzte Aktivität"}.
 {"Last login","Letzte Anmeldung"}.
+{"Last message","Letzte Nachricht"}.
 {"Last month","Letzter Monat"}.
 {"Last year","Letztes Jahr"}.
+{"Least significant bits of SHA-256 hash of text should equal hexadecimal label","Niederwertigstes Bit des SHA-256-Hashes des Textes sollte hexadezimalem Label gleichen"}.
 {"leaves the room","verlässt den Raum"}.
-{"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"}.
+{"List of rooms","Liste von Räumen"}.
+{"Logging","Protokollierung"}.
+{"Low level update script","Low-Level-Aktualisierungsscript"}.
 {"Make participants list public","Teilnehmerliste öffentlich machen"}.
-{"Make room CAPTCHA protected","Raum mit Verifizierung (Captcha) versehen"}.
+{"Make room CAPTCHA protected","Raum mittels CAPTCHA schützen"}.
 {"Make room members-only","Raum nur für Mitglieder zugänglich machen"}.
 {"Make room moderated","Raum moderiert machen"}.
 {"Make room password protected","Raum mit Passwort schützen"}.
 {"Make room persistent","Raum persistent machen"}.
 {"Make room public searchable","Raum öffentlich suchbar machen"}.
+{"Malformed username","Ungültiger Benutzername"}.
+{"MAM preference modification denied by service policy","Modifikation der MAM-Präferenzen aufgrund der Dienstrichtlinien verweigert"}.
 {"March","März"}.
-{"Maximum Number of Occupants","Maximale Anzahl von Teilnehmern"}.
+{"Max # of items to persist","Maximale Anzahl persistenter Items"}.
+{"Max payload size in bytes","Maximale Nutzdatengröße in Bytes"}.
+{"Maximum file size","Maximale Dateigröße"}.
+{"Maximum Number of History Messages Returned by Room","Maximale Anzahl der vom Raum zurückgegebenen History-Nachrichten"}.
+{"Maximum number of items to persist","Maximale Anzahl persistenter Items"}.
+{"Maximum Number of Occupants","Maximale Anzahl der Teilnehmer"}.
 {"May","Mai"}.
-{"Membership is required to enter this room","Um diesen Raum zu betreten müssen sie Mitglied sein"}.
+{"Members not added (inexistent vhost!): ","Mitglieder nicht hinzugefügt (nicht existierender vhost!): "}.
+{"Membership is required to enter this room","Mitgliedschaft ist erforderlich um diesen Raum zu betreten"}.
 {"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."}.
+{"Memorize your password, or write it in a paper placed in a safe place. In XMPP 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 XMPP gibt es keine automatische Möglichkeit, das Passwort wiederherzustellen falls Sie es vergessen."}.
 {"Memory","Speicher"}.
+{"Mere Availability in XMPP (No Show Value)","Bloße Verfügbarkeit in XMPP (kein Anzeigewert)"}.
 {"Message body","Nachrichtentext"}.
+{"Message not found in forwarded payload","Nachricht nicht in weitergeleiteten Nutzdaten gefunden"}.
+{"Messages from strangers are rejected","Nachrichten von Fremden werden zurückgewiesen"}.
+{"Messages of type headline","Nachrichten vom Typ 'headline'"}.
+{"Messages of type normal","Nachrichten vom Typ 'normal'"}.
 {"Middle Name","Zweiter Vorname"}.
-{"Moderator privileges required","Moderatorrechte benötigt"}.
+{"Minimum interval between voice requests (in seconds)","Mindestdauer zwischen Sprachrecht-Anforderung (in Sekunden)"}.
+{"Moderator privileges required","Moderatorrechte erforderlich"}.
+{"Moderator","Moderator"}.
+{"Moderators Only","nur Moderatoren"}.
 {"Modified modules","Geänderte Module"}.
-{"Module","Modul"}.
-{"Modules at ~p","Module bei ~p"}.
-{"Modules","Module"}.
+{"Module failed to handle the query","Modul konnte die Anfrage nicht verarbeiten"}.
 {"Monday","Montag"}.
 {"Multicast","Multicast"}.
+{"Multiple <item/> elements are not allowed by RFC6121","Mehrere <item/>-Elemente sind laut RFC6121 nicht erlaubt"}.
 {"Multi-User Chat","Mehrbenutzer-Chat (MUC)"}.
+{"Name in the rosters where this group will be displayed","Name in den Kontaktlisten wo diese Gruppe angezeigt werden wird"}.
 {"Name:","Name:"}.
 {"Name","Vorname"}.
+{"Natural Language for Room Discussions","Natürliche Sprache für Raumdiskussionen"}.
+{"Natural-Language Room Name","Raumname in natürlicher Sprache"}.
+{"Neither 'jid' nor 'nick' attribute found","Weder 'jid'- noch 'nick'-Attribut gefunden"}.
+{"Neither 'role' nor 'affiliation' attribute found","Weder 'role'- noch 'affiliation'-Attribut gefunden"}.
 {"Never","Nie"}.
 {"New Password:","Neues Passwort:"}.
-{"Nickname","Benutzername"}.
-{"Nickname Registration at ","Registrieren des Benutzernames auf "}.
-{"Nickname ~s does not exist in the room","Der Benutzername ~s existiert im Raum nicht"}.
+{"Nickname can't be empty","Spitzname darf nicht leer sein"}.
+{"Nickname Registration at ","Registrieren des Spitznamens auf "}.
+{"Nickname ~s does not exist in the room","Der Spitzname ~s existiert nicht im Raum"}.
+{"Nickname","Spitzname"}.
+{"No address elements found","Keine 'address'-Elemente gefunden"}.
+{"No addresses element found","Kein 'addresses'-Element gefunden"}.
+{"No 'affiliation' attribute found","Kein 'affiliation'-Attribut gefunden"}.
+{"No available resource found","Keine verfügbare Ressource gefunden"}.
 {"No body provided for announce message","Kein Text für die Ankündigungsnachricht angegeben"}.
+{"No child elements found","Keine 'child'-Elemente gefunden"}.
+{"No data form found","Kein Datenformular gefunden"}.
 {"No Data","Keine Daten"}.
+{"No features available","Keine Eigenschaften verfügbar"}.
+{"No <forwarded/> element found","Kein <forwarded/>-Element gefunden"}.
+{"No hook has processed this command","Kein Hook hat diesen Befehl verarbeitet"}.
+{"No info about last activity found","Keine Informationen über letzte Aktivität gefunden"}.
+{"No 'item' element found","Kein 'item'-Element gefunden"}.
+{"No items found in this query","Keine Items in dieser Anfrage gefunden"}.
+{"No limit","Keine Begrenzung"}.
+{"No module is handling this query","Kein Modul verarbeitet diese Anfrage"}.
+{"No node specified","Kein Knoten angegeben"}.
+{"No 'password' found in data form","Kein 'password' im Datenformular gefunden"}.
+{"No 'password' found in this query","Kein 'password' in dieser Anfrage gefunden"}.
+{"No 'path' found in data form","Kein 'path' im Datenformular gefunden"}.
+{"No pending subscriptions found","Keine ausstehenden Abonnements gefunden"}.
+{"No privacy list with this name found","Keine Privacy-Liste mit diesem Namen gefunden"}.
+{"No private data found in this query","Keine privaten Daten in dieser Anfrage gefunden"}.
+{"No running node found","Kein laufender Knoten gefunden"}.
+{"No services available","Keine Dienste verfügbar"}.
+{"No statistics found for this item","Keine Statistiken für dieses Item gefunden"}.
+{"No 'to' attribute found in the invitation","Kein 'to'-Attribut in der Einladung gefunden"}.
+{"Nobody","Niemand"}.
+{"Node already exists","Knoten existiert bereits"}.
+{"Node ID","Knoten-ID"}.
+{"Node index not found","Knotenindex nicht gefunden"}.
 {"Node not found","Knoten nicht gefunden"}.
 {"Node ~p","Knoten ~p"}.
+{"Node","Knoten"}.
+{"Nodeprep has failed","Nodeprep fehlgeschlagen"}.
 {"Nodes","Knoten"}.
 {"None","Keine"}.
+{"Not allowed","Nicht erlaubt"}.
 {"Not Found","Nicht gefunden"}.
+{"Not subscribed","Nicht abonniert"}.
+{"Notify subscribers when items are removed from the node","Abonnenten benachrichtigen, wenn Items vom Knoten entfernt werden"}.
+{"Notify subscribers when the node configuration changes","Abonnenten benachrichtigen, wenn sich die Knotenkonfiguration ändert"}.
+{"Notify subscribers when the node is deleted","Abonnenten benachrichtigen, wenn der Knoten gelöscht wird"}.
 {"November","November"}.
+{"Number of answers required","Anzahl der erforderlichen Antworten"}.
+{"Number of occupants","Anzahl der Teilnehmer"}.
+{"Number of Offline Messages","Anzahl der Offline-Nachrichten"}.
 {"Number of online users","Anzahl der angemeldeten Benutzer"}.
 {"Number of registered users","Anzahl der registrierten Benutzer"}.
+{"Number of seconds after which to automatically purge items","Anzahl der Sekunden, nach der Items automatisch gelöscht werden"}.
+{"Occupants are allowed to invite others","Teilnehmer dürfen andere einladen"}.
+{"Occupants May Change the Subject","Teilnehmer dürfen das Thema ändern"}.
 {"October","Oktober"}.
-{"Offline Messages:","Offline-Nachrichten:"}.
 {"Offline Messages","Offline-Nachrichten"}.
+{"Offline Messages:","Offline-Nachrichten:"}.
 {"OK","OK"}.
-{"Old Password:","Aktuelles Passwort:"}.
-{"Online","Angemeldet"}.
-{"Online Users:","Angemeldete Benutzer:"}.
+{"Old Password:","Altes Passwort:"}.
 {"Online Users","Angemeldete Benutzer"}.
+{"Online Users:","Angemeldete Benutzer:"}.
+{"Online","Angemeldet"}.
+{"Only admins can see this","Nur Admins können dies sehen"}.
+{"Only collection node owners may associate leaf nodes with the collection","Nur Sammlungsknoten-Besitzer dürfen Blattknoten mit der Sammlung verknüpfen"}.
+{"Only deliver notifications to available users","Benachrichtigungen nur an verfügbare Benutzer schicken"}.
+{"Only <enable/> or <disable/> tags are allowed","Nur <enable/>- oder <disable/>-Tags sind erlaubt"}.
+{"Only <list/> element is allowed in this query","Nur <list/>-Elemente sind in dieser Anfrage erlaubt"}.
 {"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 and participants are allowed to change the subject in this room","Nur Moderatoren und Teilnehmer 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"}.
+{"Only moderators can approve voice requests","Nur Moderatoren können Sprachrecht-Anforderungen genehmigen"}.
+{"Only occupants are allowed to send messages to the conference","Nur Teilnehmer dürfen Nachrichten an die Konferenz senden"}.
+{"Only occupants are allowed to send queries to the conference","Nur Teilnehmer dürfen Anfragen an die Konferenz senden"}.
+{"Only publishers may publish","Nur Veröffentlicher dürfen veröffentlichen"}.
+{"Only service administrators are allowed to send service messages","Nur Service-Administratoren dürfen Servicenachrichten senden"}.
+{"Only those on a whitelist may associate leaf nodes with the collection","Nur jemand auf einer Whitelist darf Blattknoten mit der Sammlung verknüpfen"}.
+{"Only those on a whitelist may subscribe and retrieve items","Nur jemand auf einer Whitelist darf Items abonnieren und abrufen"}.
 {"Organization Name","Name der Organisation"}.
 {"Organization Unit","Abteilung"}.
-{"Outgoing s2s Connections:","Ausgehende s2s-Verbindungen:"}.
 {"Outgoing s2s Connections","Ausgehende s2s-Verbindungen"}.
-{"Owner privileges required","Besitzerrechte benötigt"}.
+{"Outgoing s2s Connections:","Ausgehende s2s-Verbindungen:"}.
+{"Owner privileges required","Besitzerrechte erforderlich"}.
+{"Packet relay is denied by service policy","Paket-Relay aufgrund der Dienstrichtlinien verweigert"}.
 {"Packet","Paket"}.
-{"Password ~b","Passwort ~b"}.
-{"Password:","Passwort:"}.
-{"Password","Passwort"}.
-{"Password Verification:","Passwort bestätigen:"}.
+{"Participant","Teilnehmer"}.
 {"Password Verification","Passwort bestätigen"}.
+{"Password Verification:","Passwort bestätigen:"}.
+{"Password","Passwort"}.
+{"Password:","Passwort:"}.
 {"Path to Dir","Pfad zum Verzeichnis"}.
 {"Path to File","Pfad zur Datei"}.
-{"Pending","Schwebend"}.
+{"Payload type","Nutzdatentyp"}.
+{"Pending","Ausstehend"}.
 {"Period: ","Zeitraum: "}.
-{"Permanent rooms","Permanente Chaträume"}.
+{"Persist items to storage","Items dauerhaft speichern"}.
+{"Persistent","Persistent"}.
+{"Ping query is incorrect","Ping-Anfrage ist falsch"}.
 {"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, wait for a while before sending new voice request","Bitte warten sie ein wenig, bevor sie eine weitere Anfrage für Sprachrechte senden"}.
+{"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, dass diese Optionen nur die eingebaute Mnesia-Datenbank sichern. Wenn Sie das ODBC-Modul verwenden, müssen Sie auch Ihre SQL-Datenbank separat sichern."}.
+{"Please, wait for a while before sending new voice request","Bitte warten Sie ein wenig, bevor Sie eine weitere Sprachrecht-Anforderung senden"}.
 {"Pong","Pong"}.
-{"Port ~b","Port ~b"}.
-{"Port","Port"}.
+{"Possessing 'ask' attribute is not allowed by RFC6121","Ein 'ask'-Attribut zu besitzen ist laut RFC6121 nicht erlaubt"}.
+{"Present real Jabber IDs to","Echte Jabber-IDs anzeigen für"}.
+{"Previous session not found","Vorherige Sitzung nicht gefunden"}.
+{"Previous session PID has been killed","Vorherige Sitzungs-PID wurde getötet"}.
+{"Previous session PID has exited","Vorherige Sitzungs-PID wurde beendet"}.
+{"Previous session PID is dead","Vorherige Sitzungs-PID ist tot"}.
+{"Previous session timed out","Zeitüberschreitung bei vorheriger Sitzung"}.
 {"private, ","privat, "}.
-{"Protocol","Protokoll"}.
+{"Public","Öffentlich"}.
+{"Publish model","Veröffentlichungsmodell"}.
 {"Publish-Subscribe","Publish-Subscribe"}.
-{"PubSub subscriber request","PubSub-Abonnenten-Anfrage"}.
-{"Queries to the conference members are not allowed in this room","Anfragen an die Teilnehmer sind in diesem Raum nicht erlaubt"}.
+{"PubSub subscriber request","PubSub-Abonnenten-Anforderung"}.
+{"Purge all items when the relevant publisher goes offline","Alle Items löschen, wenn der relevante Veröffentlicher offline geht"}.
+{"Push record not found","Push-Eintrag nicht gefunden"}.
+{"Queries to the conference members are not allowed in this room","Anfragen an die Konferenzteilnehmer sind in diesem Raum nicht erlaubt"}.
+{"Query to another users is forbidden","Anfrage an andere Benutzer ist verboten"}.
 {"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"}.
+{"Really delete message of the day?","Nachricht des Tages wirklich löschen?"}.
+{"Receive notification from all descendent nodes","Benachrichtigung von allen abstammenden Nodes erhalten"}.
+{"Receive notification from direct child nodes only","Benachrichtigung nur von direkten Kindknoten erhalten"}.
+{"Receive notification of new items only","Benachrichtigung nur von neuen Items erhalten"}.
+{"Receive notification of new nodes only","Benachrichtigung nur von neuen Knoten erhalten"}.
+{"Recipient is not in the conference room","Empfänger ist nicht im Konferenzraum"}.
+{"Register an XMPP account","Ein XMPP-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 "}.
+{"Registered Users:","Registrierte Benutzer:"}.
 {"Remote copy","Fernkopie"}.
-{"Remove All Offline Messages","Alle Offline Nachrichten löschen"}.
-{"Remove","Entfernen"}.
+{"Remove All Offline Messages","Alle Offline-Nachrichten löschen"}.
 {"Remove User","Benutzer löschen"}.
+{"Remove","Entfernen"}.
 {"Replaced by new connection","Durch neue Verbindung ersetzt"}.
+{"Request has timed out","Zeitüberschreitung bei Anforderung"}.
+{"Request is ignored","Anforderung wird ignoriert"}.
+{"Requested role","Angeforderte Rolle"}.
 {"Resources","Ressourcen"}.
-{"Restart","Neustart"}.
 {"Restart Service","Dienst neustarten"}.
-{"Restore Backup from File at ","Datenwiederherstellung aus der Datei "}.
-{"Restore binary backup after next ejabberd restart (requires less memory):","Stelle binäre Sicherung beim nächsten ejabberd-Neustart wieder her (benötigt weniger Speicher):"}.
-{"Restore binary backup immediately:","Stelle binäre Sicherung sofort wieder her:"}.
-{"Restore plain text backup immediately:","Stelle Klartext-Sicherung sofort wieder her:"}.
+{"Restart","Neustart"}.
+{"Restore Backup from File at ","Backup wiederherstellen aus Datei bei "}.
+{"Restore binary backup after next ejabberd restart (requires less memory):","Stelle binäres Backup beim nächsten ejabberd-Neustart wieder her (benötigt weniger Speicher):"}.
+{"Restore binary backup immediately:","Stelle binäres Backup sofort wieder her:"}.
+{"Restore plain text backup immediately:","Stelle Klartext-Backup sofort wieder her:"}.
 {"Restore","Wiederherstellung"}.
+{"Roles and Affiliations that May Retrieve Member List","Rollen und Zugehörigkeiten die Mitgliederliste abrufen dürfen"}.
+{"Roles for which Presence is Broadcasted","Rollen für welche die Präsenz übertragen wird"}.
+{"Roles that May Send Private Messages","Rollen die Privatnachrichten senden dürfen"}.
 {"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 description","Raumbeschreibung"}.
+{"Room Occupants","Raumteilnehmer"}.
+{"Room terminates","Raum wird beendet"}.
 {"Room title","Raumname"}.
-{"Roster","Kontaktliste"}.
-{"Roster of ","Kontaktliste von "}.
+{"Roster groups allowed to subscribe","Kontaktlistengruppen die abonnieren dürfen"}.
+{"Roster of ~ts","Kontaktliste von ~ts"}.
 {"Roster size","Kontaktlistengröße"}.
+{"Roster:","Kontaktliste:"}.
 {"RPC Call Error","Fehler bei RPC-Aufruf"}.
-{"Running Nodes","Aktive Knoten"}.
-{"~s access rule configuration","~s Zugangsregel-Konfiguration"}.
+{"Running Nodes","Laufende Knoten"}.
+{"~s invites you to the room ~s","~s lädt Sie in den Raum ~s ein"}.
 {"Saturday","Samstag"}.
 {"Script check","Script-Überprüfung"}.
+{"Search from the date","Suche ab Datum"}.
 {"Search Results for ","Suchergebnisse für "}.
-{"Search users in ","Benutzer suchen in "}.
-{"Send announcement to all online users on all hosts","Sende Ankündigung an alle angemeldeten Benutzer auf allen Hosts"}.
-{"Send announcement to all online users","Sende Ankündigung an alle angemeldeten Benutzer"}.
-{"Send announcement to all users on all hosts","Sende Ankündigung an alle Benutzer auf allen Hosts"}.
-{"Send announcement to all users","Sende Ankündigung an alle Benutzer"}.
+{"Search the text","Text durchsuchen"}.
+{"Search until the date","Suche bis Datum"}.
+{"Search users in ","Suche Benutzer in "}.
+{"Select All","Alles auswählen"}.
+{"Send announcement to all online users on all hosts","Ankündigung an alle angemeldeten Benutzer auf allen Hosts senden"}.
+{"Send announcement to all online users","Ankündigung an alle angemeldeten Benutzer senden"}.
+{"Send announcement to all users on all hosts","Ankündigung an alle Benutzer auf allen Hosts senden"}.
+{"Send announcement to all users","Ankündigung an alle Benutzer senden"}.
 {"September","September"}.
-{"Server ~b","Server ~b"}.
 {"Server:","Server:"}.
-{"Set message of the day and send to online users","Setze Nachricht des Tages und sende sie an alle angemeldeten Benutzer"}.
-{"Set message of the day on all hosts and send to online users","Setze Nachricht des Tages auf allen Hosts und sende sie an alle angemeldeten Benutzer"}.
+{"Service list retrieval timed out","Zeitüberschreitung bei Abfrage der Serviceliste"}.
+{"Session state copying timed out","Zeitüberschreitung beim Kopieren des Sitzungszustandes"}.
+{"Set message of the day and send to online users","Nachricht des Tages setzen und an alle angemeldeten Benutzer senden"}.
+{"Set message of the day on all hosts and send to online users","Nachricht des Tages auf allen Hosts setzen und an alle angemeldeten Benutzer senden"}.
 {"Shared Roster Groups","Gruppen der gemeinsamen Kontaktliste"}.
-{"Show Integral Table","Integrale Tabelle anzeigen"}.
+{"Show Integral Table","Integral-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 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."}.
-{"~s's Offline Messages Queue","~s's Offline-Nachrichten-Warteschlange"}.
-{"Start Modules at ","Starte Module auf "}.
-{"Start Modules","Module starten"}.
-{"Start","Starten"}.
+{"SOCKS5 Bytestreams","SOCKS5-Bytestreams"}.
+{"Some XMPP clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Einige XMPP-Clients speichern Ihr Passwort auf dem Computer. Aus Sicherheitsgründen sollten Sie das nur auf Ihrem persönlichen Computer tun."}.
+{"Specify the access model","Geben Sie das Zugangsmodell an"}.
+{"Specify the event message type","Geben Sie den Ereignisnachrichtentyp an"}.
+{"Specify the publisher model","Geben Sie das Veröffentlichermodell an"}.
+{"Stanza ID","Stanza-ID"}.
+{"Statically specify a replyto of the node owner(s)","Ein 'replyto' des/der Nodebesitzer(s) statisch angeben"}.
 {"Statistics of ~p","Statistiken von ~p"}.
 {"Statistics","Statistiken"}.
-{"Stop Modules at ","Stoppe Module auf "}.
-{"Stop Modules","Module stoppen"}.
+{"Stop","Anhalten"}.
 {"Stopped Nodes","Angehaltene Knoten"}.
-{"Stop","Stoppen"}.
 {"Storage Type","Speichertyp"}.
-{"Store binary backup:","Speichere binäre Sicherung:"}.
-{"Store plain text backup:","Speichere Klartext-Sicherung:"}.
+{"Store binary backup:","Speichere binäres Backup:"}.
+{"Store plain text backup:","Speichere Klartext-Backup:"}.
+{"Stream management is already enabled","Stream-Verwaltung ist bereits aktiviert"}.
+{"Stream management is not enabled","Stream-Verwaltung ist nicht aktiviert"}.
 {"Subject","Betreff"}.
 {"Submit","Senden"}.
 {"Submitted","Gesendet"}.
+{"Subscriber Address","Abonnenten-Adresse"}.
+{"Subscribers may publish","Abonnenten dürfen veröffentlichen"}.
+{"Subscription requests must be approved and only subscribers may retrieve items","Abonnement-Anforderungen müssen genehmigt werden und nur Abonnenten dürfen Items abrufen"}.
 {"Subscription","Abonnement"}.
+{"Subscriptions are not allowed","Abonnements sind nicht erlaubt"}.
 {"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"}.
+{"Text associated with a picture","Text verbunden mit einem Bild"}.
+{"Text associated with a sound","Text verbunden mit einem Klang"}.
+{"Text associated with a video","Text verbunden mit einem Video"}.
+{"Text associated with speech","Text verbunden mit Sprache"}.
+{"That nickname is already in use by another occupant","Dieser Spitzname wird bereits von einem anderen Teilnehmer verwendet"}.
+{"That nickname is registered by another person","Dieser Spitzname wurde von jemand anderem registriert"}.
+{"The account already exists","Das Konto existiert bereits"}.
+{"The account was not unregistered","Das Konto wurde nicht entfernt"}.
+{"The body text of the last received message","Der Nachrichtenkörper der letzten erhaltenen Nachricht"}.
+{"The CAPTCHA is valid.","Das CAPTCHA ist gültig."}.
+{"The CAPTCHA verification has failed","Die CAPTCHA-Verifizierung ist fehlgeschlagen"}.
+{"The captcha you entered is wrong","Das CAPTCHA das Sie eingegeben haben ist falsch"}.
+{"The child nodes (leaf or collection) associated with a collection","Die mit einer Sammlung verknüpften Kindknoten (Blatt oder Sammlung)"}.
+{"The collections with which a node is affiliated","Sammlungen, mit welchen ein Knoten in Verbindung steht"}.
+{"The DateTime at which a leased subscription will end or has ended","Das DateTime an welchem ein geleastes Abonnement enden wird oder geendet hat"}.
+{"The datetime when the node was created","Das DateTime an welchem der Knoten erstellt wurde"}.
+{"The default language of the node","Die voreingestellte Sprache des Knotens"}.
+{"The feature requested is not supported by the conference","Die angeforderte Eigenschaft wird von der Konferenz nicht unterstützt"}.
+{"The JID of the node creator","Die JID des Nodeerstellers"}.
+{"The JIDs of those to contact with questions","Die JIDs jener, die bei Fragen zu kontaktieren sind"}.
+{"The JIDs of those with an affiliation of owner","Die JIDs jener mit einer Zugehörigkeit von Besitzer"}.
+{"The JIDs of those with an affiliation of publisher","Die JIDs jener mit einer Zugehörigkeit von Veröffentlicher"}.
+{"The list of JIDs that may associate leaf nodes with a collection","Die Liste der JIDs die Blattknoten mit einer Sammlung verknüpfen dürfen"}.
+{"The maximum number of child nodes that can be associated with a collection","Die maximale Anzahl der Kindknoten die mit einer Sammlung verknüpft werden können"}.
+{"The minimum number of milliseconds between sending any two notification digests","Die minimale Anzahl an Millisekunden zwischen dem Senden von zwei Benachrichtigungs-Übersichten"}.
+{"The name of the node","Der Name des Knotens"}.
+{"The node is a collection node","Der Knoten ist ein Sammlungsknoten"}.
+{"The node is a leaf node (default)","Der Knoten ist ein Blattknoten (Voreinstellung)"}.
+{"The NodeID of the relevant node","Die NodeID des relevanten Knotens"}.
+{"The number of pending incoming presence subscription requests","Die Anzahl der ausstehenden eintreffenden Präsenzabonnement-Anforderungen"}.
+{"The number of subscribers to the node","Die Anzahl der Abonnenten des Knotens"}.
+{"The number of unread or undelivered messages","Die Anzahl der ungelesenen oder nicht zugestellten Nachrichten"}.
+{"The password contains unacceptable characters","Das Passwort enthält ungültige Zeichen"}.
+{"The password is too weak","Das Passwort ist zu schwach"}.
 {"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: "}.
+{"The password of your XMPP account was successfully changed.","Das Passwort Ihres XMPP-Kontos wurde erfolgreich geändert."}.
+{"The password was not changed","Das Passwort wurde nicht geändert"}.
+{"The passwords are different","Die Passwörter sind unterschiedlich"}.
+{"The presence states for which an entity wants to receive notifications","Die Präsenzzustände für welche eine Entität Benachrichtigungen erhalten will"}.
+{"The query is only allowed from local users","Die Anfrage ist nur von lokalen Benutzern erlaubt"}.
+{"The query must not contain <item/> elements","Die Anfrage darf keine <item/>-Elemente enthalten"}.
+{"The room subject can be modified by participants","Das Raum-Thema kann von Teilnehmern geändert werden"}.
+{"The sender of the last received message","Der Absender der letzten erhaltenen Nachricht"}.
+{"The stanza MUST contain only one <active/> element, one <default/> element, or one <list/> element","Das Stanza darf nur ein <active/>-Element, ein <default/>-Element oder ein <list/>-Element enthalten"}.
+{"The subscription identifier associated with the subscription request","Die mit der Abonnement-Anforderung verknüpfte Abonnement-Bezeichnung"}.
+{"The type of node data, usually specified by the namespace of the payload (if any)","Die Art der Knotendaten, üblicherweise vom Namensraum der Nutzdaten angegeben (gegebenenfalls)"}.
+{"The URL of an XSL transformation which can be applied to payloads in order to generate an appropriate message body element.","Die URL einer XSL-Transformation welche auf Nutzdaten angewendet werden kann, um ein geeignetes Nachrichtenkörper-Element zu generieren."}.
+{"The URL of an XSL transformation which can be applied to the payload format in order to generate a valid Data Forms result that the client could display using a generic Data Forms rendering engine","Die URL einer XSL-Transformation welche auf das Nutzdaten-Format angewendet werden kann, um ein gültiges Data Forms-Ergebnis zu generieren das der Client mit Hilfe einer generischen Data Forms-Rendering-Engine anzeigen könnte"}.
+{"The username is not valid","Der Benutzername ist nicht gültig"}.
+{"There was an error changing the password: ","Es trat ein Fehler beim Ändern des Passwortes auf: "}.
 {"There was an error creating the account: ","Es trat ein Fehler beim Erstellen des Kontos auf: "}.
 {"There was an error deleting the account: ","Es trat ein Fehler beim Löschen des Kontos auf: "}.
-{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Groß/Klein-Schreibung spielt hierbei keine Rolle: macbeth ist gleich MacBeth und Macbeth."}.
-{"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Diese Seite erlaubt das anlegen eines Jabber Kontos auf diesem Jabber Server. Ihre JID (Jabber IDentifier) setzt sich folgend zusammen: benutzername@server. Bitte lesen sie die Hinweise genau durch, um die Felder korrekt auszufüllen."}.
-{"This page allows to unregister a Jabber account in this Jabber server.","Diese Seite erlaubt es, ein Jabber Konto von diesem Server zu entfernen."}.
+{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Dies ist schreibungsunabhängig: macbeth ist gleich MacBeth und Macbeth."}.
+{"This page allows to register an XMPP account in this XMPP server. Your JID (Jabber ID) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Diese Seite erlaubt das Anlegen eines XMPP-Kontos auf diesem XMPP-Server. Ihre JID (Jabber-ID) wird diese Form aufweisen: benutzername@server. Bitte lesen Sie die Anweisungen genau durch, um die Felder korrekt auszufüllen."}.
+{"This page allows to unregister an XMPP account in this XMPP server.","Diese Seite erlaubt es, ein XMPP-Konto von diesem XMPP-Server zu entfernen."}.
 {"This room is not anonymous","Dieser Raum ist nicht anonym"}.
+{"This service can not process the address: ~s","Dieser Dienst kann die Adresse nicht verarbeiten: ~s"}.
 {"Thursday","Donnerstag"}.
 {"Time delay","Zeitverzögerung"}.
+{"Timed out waiting for stream resumption","Zeitüberschreitung beim Warten auf Streamfortsetzung"}.
 {"Time","Zeit"}.
+{"To register, visit ~s","Um sich zu registrieren, besuchen Sie ~s"}.
+{"To ~ts","An ~ts"}.
 {"To","An"}.
-{"Too many CAPTCHA requests","Zu viele CAPTCHA Anfragen"}.
+{"Token TTL","Token-TTL"}.
+{"Too many active bytestreams","Zu viele aktive Bytestreams"}.
+{"Too many CAPTCHA requests","Zu viele CAPTCHA-Anforderungen"}.
+{"Too many child elements","Zu viele 'child'-Elemente"}.
+{"Too many <item/> elements","Zu viele <item/>-Elemente"}.
+{"Too many <list/> elements","Zu viele <list/>-Elemente"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Zu viele (~p) fehlgeschlagene Authentifizierungen von dieser IP-Adresse (~s). Die Adresse wird an ~s UTC entsperrt"}.
+{"Too many receiver fields were specified","Zu viele Empfängerfelder wurden angegeben"}.
 {"Too many unacked stanzas","Zu viele unbestätigte Stanzas"}.
-{"To ~s","An ~s"}.
-{"Total rooms","Alle Chaträume"}.
+{"Too many users in this conference","Zu viele Benutzer in dieser Konferenz"}.
+{"Total rooms","Gesamte Räume"}.
 {"Traffic rate limit is exceeded","Datenratenlimit wurde überschritten"}.
 {"Transactions Aborted:","Abgebrochene Transaktionen:"}.
-{"Transactions Committed:","Durchgeführte Transaktionen:"}.
+{"Transactions Committed:","Übergebene Transaktionen:"}.
 {"Transactions Logged:","Protokollierte Transaktionen:"}.
 {"Transactions Restarted:","Neu gestartete Transaktionen:"}.
+{"~ts's Offline Messages Queue","Offline-Nachrichten-Warteschlange von ~ts"}.
 {"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"}.
+{"Unable to generate a CAPTCHA","Konnte kein CAPTCHA erstellen"}.
+{"Unable to register route on existing local domain","Konnte Route auf existierender lokaler Domäne nicht registrieren"}.
+{"Unauthorized","Nicht autorisiert"}.
+{"Unexpected action","Unerwartete Aktion"}.
+{"Unexpected error condition: ~p","Unerwarteter Fehlerzustand: ~p"}.
+{"Unregister an XMPP account","Ein XMPP-Konto entfernen"}.
+{"Unregister","Deregistrieren"}.
+{"Unselect All","Alle abwählen"}.
+{"Unsupported <index/> element","Nicht unterstütztes <index/>-Element"}.
+{"Unsupported version","Nicht unterstützte Version"}.
 {"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 ~p","~p aktualisieren"}.
 {"Update script","Aktualisierungsscript"}.
+{"Update","Aktualisieren"}.
 {"Uptime:","Betriebszeit:"}.
-{"Use of STARTTLS required","Verwendung von STARTTLS erforderlich"}.
-{"User","Benutzer"}.
+{"URL for Archived Discussion Logs","URL für archivierte Diskussionsprotokolle"}.
+{"User already exists","Benutzer existiert bereits"}.
+{"User (jid)","Benutzer (JID)"}.
+{"User JID","Benutzer-JID"}.
 {"User Management","Benutzerverwaltung"}.
+{"User removed","Benutzer entfernt"}.
+{"User session not found","Benutzersitzung nicht gefunden"}.
+{"User session terminated","Benutzersitzung beendet"}.
+{"User ~ts","Benutzer ~ts"}.
+{"User","Benutzer"}.
 {"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"}.
+{"Users","Benutzer"}.
 {"Validate","Validieren"}.
+{"Value 'get' of 'type' attribute is not allowed","Wert 'get' des 'type'-Attributs ist nicht erlaubt"}.
+{"Value of '~s' should be boolean","Wert von '~s' sollte boolesch sein"}.
+{"Value of '~s' should be datetime string","Wert von '~s' sollte DateTime-Zeichenkette sein"}.
+{"Value of '~s' should be integer","Wert von '~s' sollte eine Ganzzahl sein"}.
+{"Value 'set' of 'type' attribute is not allowed","Wert 'set' des 'type'-Attributs ist nicht erlaubt"}.
 {"vCard User Search","vCard-Benutzer-Suche"}.
+{"View Queue","Warteschlange ansehen"}.
+{"View Roster","Kontaktliste ansehen"}.
 {"Virtual Hosts","Virtuelle Hosts"}.
-{"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"}.
+{"Visitor","Besucher"}.
+{"Visitors are not allowed to change their nicknames in this room","Besucher dürfen in diesem Raum ihren Spitznamen nicht ändern"}.
+{"Visitors are not allowed to send messages to all occupants","Besucher dürfen nicht an alle Teilnehmer Nachrichten versenden"}.
+{"Voice requests are disabled in this conference","Sprachrecht-Anforderungen sind in diesem Raum deaktiviert"}.
+{"Voice request","Sprachrecht-Anforderung"}.
 {"Wednesday","Mittwoch"}.
-{"You can later change your password using a Jabber client.","Sie können das Passwort später mit einem Jabber Client Programm ändern."}.
+{"When a new subscription is processed and whenever a subscriber comes online","Sobald ein neues Abonnement verarbeitet wird und wann immer ein Abonnent sich anmeldet"}.
+{"When a new subscription is processed","Sobald ein neues Abonnement verarbeitet wird"}.
+{"When to send the last published item","Wann das letzte veröffentlichte Item gesendet werden soll"}.
+{"Whether an entity wants to receive an XMPP message body in addition to the payload format","Ob eine Entität zusätzlich zum Nutzdatenformat einen XMPP-Nachrichtenkörper erhalten will"}.
+{"Whether an entity wants to receive digests (aggregations) of notifications or all notifications individually","Ob eine Entität Übersichten (Gruppierungen) von Benachrichtigungen oder alle Benachrichtigungen separat erhalten will"}.
+{"Whether an entity wants to receive or disable notifications","Ob eine Entität Benachrichtigungen erhalten oder deaktivieren will"}.
+{"Whether owners or publisher should receive replies to items","Ob Besitzer oder Veröffentlicher Antworten auf Items erhalten sollen"}.
+{"Whether the node is a leaf (default) or a collection","Ob der Knoten ein Blatt (Voreinstellung) oder eine Sammlung ist"}.
+{"Whether to allow subscriptions","Ob Abonnements erlaubt sind"}.
+{"Whether to make all subscriptions temporary, based on subscriber presence","Ob alle Abonnements temporär gemacht werden sollen, basierend auf der Abonnentenpräsenz"}.
+{"Whether to notify owners about new subscribers and unsubscribes","Ob Besitzer über neue Abonnenten und Abbestellungen benachrichtigt werden sollen"}.
+{"Who may associate leaf nodes with a collection","Wer Blattknoten mit einer Sammlung verknüpfen darf"}.
+{"Wrong parameters in the web formulary","Falsche Parameter im Webformular"}.
+{"Wrong xmlns","Falscher xmlns"}.
+{"XMPP Account Registration","XMPP-Konto-Registrierung"}.
+{"XMPP Domains","XMPP-Domänen"}.
+{"XMPP Show Value of Away","XMPP-Anzeigewert von Abwesend"}.
+{"XMPP Show Value of Chat","XMPP-Anzeigewert von Chat"}.
+{"XMPP Show Value of DND (Do Not Disturb)","XMPP-Anzeigewert von DND (Do Not Disturb/Bitte nicht stören)"}.
+{"XMPP Show Value of XA (Extended Away)","XMPP-Anzeigewert von XA (Extended Away/für längere Zeit abwesend)"}.
+{"XMPP URI of Associated Publish-Subscribe Node","XMPP-URI des verknüpften Publish-Subscribe-Knotens"}.
+{"You are being removed from the room because of a system shutdown","Sie werden wegen einer Systemabschaltung aus dem Raum entfernt"}.
+{"You are not joined to the channel","Sie sind dem Raum nicht beigetreten"}.
+{"You can later change your password using an XMPP client.","Sie können Ihr Passwort später mit einem XMPP-Client ä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 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"}.
+{"You have joined too many conferences","Sie sind zu vielen Konferenzen beigetreten"}.
+{"You must fill in field \"Nickname\" in the form","Sie müssen das Feld \"Spitzname\" im Formular 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 sich 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 Spitznamen zu registrieren"}.
+{"You need an x:data capable client to search","Sie benötigen einen Client der x:data unterstützt, um zu suchen"}.
+{"Your active privacy list has denied the routing of this stanza.","Ihre aktive Privacy-Liste hat das Routing dieses Stanzas verweigert."}.
+{"Your contact offline message queue is full. The message has been discarded.","Die Offline-Nachrichten-Warteschlange Ihres Kontaktes ist voll. Die Nachricht wurde verworfen."}.
+{"Your subscription request and/or messages to ~s have been blocked. To unblock your subscription request, visit ~s","Ihre Abonnement-Anforderung und/oder Nachrichten an ~s wurden blockiert. Um Ihre Abonnement-Anforderungen freizugeben, besuchen Sie ~s"}.
+{"Your XMPP account was successfully registered.","Ihr XMPP-Konto wurde erfolgreich registriert."}.
+{"Your XMPP account was successfully unregistered.","Ihr XMPP-Konto wurde erfolgreich entfernt."}.
+{"You're not allowed to create nodes","Sie dürfen keine Knoten erstellen"}.