Update mix deps

Previously we just appended them, so sometimes we just had duplicates

This fixes issue #3056

.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

.travis.yml

@@ -1,12 +1,12 @@
 language: erlang
 
 otp_release:
-  - 17.5
-  - 18.3
-  - 19.2
+  - 19.3
+  - 22.2
 
 services:
   - redis-server
+  - postgresql
 
 before_install:
   #
@@ -21,6 +21,7 @@ before_install:
   - 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 service mysql start
   - sudo mysql_upgrade
   # /END MYSQL 5.6
   - pip install --user coveralls-merge
@@ -33,22 +34,28 @@ 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;"
 
 script:
   - ./autogen.sh
-  - ./configure --prefix=/tmp/ejabberd --enable-all --disable-odbc --disable-riak
+  - ./configure --prefix=/tmp/ejabberd --enable-all --disable-odbc --disable-elixir
   - 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 +63,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,5 +1,5 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1
 
 mQGiBD4+owwRBAC14GIfUfCyEDSIePvEW3SAFUdJBtoQHH/nJKZyQT7h9bPlUWC3
 RODjQReyCITRrdwyrKUGku2FmeVGwn2u2WmDMNABLnpprWPkBdCk96+OmSLN9brZ
@@ -11,9 +11,9 @@ kYpXBACmWpP8NJTkamEnPCia2ZoOHODANwpUkP43I7jsDmgtobZX9qnrAXw+uNDI
 QJEXM6FSbi0LLtZciNlYsafwAPEOMDKpMqAK6IyisNtPvaLd8lH0bPAnWqcyefep
 rv0sxxqUEMcM3o7wwgfN83POkDasDbs3pjwPhxvhz6//62zQJ7Q2TXlTUUwgUmVs
 ZWFzZSBFbmdpbmVlcmluZyA8bXlzcWwtYnVpbGRAb3NzLm9yYWNsZS5jb20+iGwE
-ExECACwCGyMCHgECF4ACGQEGCwkIBwMCBhUKCQgCAwUWAgMBAAUCWKcFIAUJHirJ
-FAAKCRCMcY07UHLh9VcFAJ46pUyVd8BZ2r5CppMC1tmyQ3ceRgCfVPwuVsiS0VER
-5WUqtAQDt+DoetCIaQQTEQIAKQIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkB
+ExECACwCGyMCHgECF4ACGQEGCwkIBwMCBhUKCQgCAwUWAgMBAAUCXEBY+wUJI87e
+5AAKCRCMcY07UHLh9RZPAJ9uvm0zlzfCN+DHxHVaoFLFjdVYTQCfborsC9tmEZYa
+whhogjeBkZkorbyIaQQTEQIAKQIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkB
 BQJTAdRmBQkaZsvLAAoJEIxxjTtQcuH1X4MAoKNLWAbCBUj96637kv6Xa/fJuX5m
 AJwPtmgDfjUe2iuhXdTrFEPT19SB6ohmBBMRAgAmAhsjBgsJCAcDAgQVAggDBBYC
 AwECHgECF4AFAk53PioFCRP7AhUACgkQjHGNO1By4fUmzACeJdfqgc9gWTUhgmcM
@@ -428,5 +428,5 @@ GoaU9u41oyZTIiXPiFidJoIZCh7fdurP8pn3X+R5HUNXMr7M+ba8lSNxce/F3kmH
 0L7rsKqdh9d/aVxhJINJ+inVDnrXWVoXu9GBjT8Nco1iU9SIVAQYEQIADAUCTnc9
 7QUJE/sBuAASB2VHUEcAAQEJEIxxjTtQcuH1FJsAmwWK9vmwRJ/y9gTnJ8PWf0BV
 roUTAKClYAhZuX2nUNwH4vlEJQHDqYa5yQ==
-=HfUN
+=ghXk
 -----END PGP PUBLIC KEY BLOCK-----

CHANGELOG.md

@@ -0,0 +1,286 @@
+# 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,148 @@
+# 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
+
+### <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]: http://lists.jabber.ru/mailman/listinfo/ejabberd
+[muc]: xmpp: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

@@ -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
 
@@ -116,6 +122,11 @@ update:
 xref: all
 	$(REBAR) skip_deps=true xref
 
+hooks: all
+	tools/hook_deps.sh ebin
+
+options: all
+	tools/opt_types.sh ejabberd_option ebin
 
 translations:
 	tools/prepare-tr.sh
@@ -149,7 +160,7 @@ DEPS_FILES_FILTERED=$(filter-out $(BINARIES) deps/elixir/ebin/elixir.app,$(DEPS_
 DEPS_DIRS=$(sort deps/ $(foreach DEP,$(DEPS),deps/$(DEP)/) $(dir $(DEPS_FILES)))
 
 MAIN_FILES=$(filter-out %/configure.beam,$(call FILES_WILDCARD,ebin/*.beam ebin/*.app priv/msgs/*.msg priv/css/*.css priv/img/*.png priv/js/*.js priv/lib/* include/*.hrl COPYING))
-MAIN_DIRS=$(sort $(dir $(MAIN_FILES)) priv/bin priv/sql)
+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)
@@ -181,7 +192,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))
 
@@ -251,10 +265,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 +298,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)
 
@@ -327,8 +344,8 @@ 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:
@@ -367,9 +384,6 @@ test:
 	@cd priv && ln -sf ../sql
 	$(REBAR) skip_deps=true ct
 
-quicktest:
-	$(REBAR) skip_deps=true ct suites=elixir
-
 .PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean rel \
 	install uninstall uninstall-binary uninstall-all translations deps test \
-	quicktest erlang_plt deps_plt ejabberd_plt
+	quicktest erlang_plt deps_plt ejabberd_plt xref hooks options

README

@@ -1,177 +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).
-  - IRC transport.
-  - 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).
- - GNU Iconv 1.8 or higher, for the IRC Transport (mod_irc). Optional. Not
-   needed on systems with GNU Libc.
- - ImageMagick's Convert program. Optional. For CAPTCHA challenges.
-
-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,177 @@
+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.
+  - 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 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.
+ - 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
+
+Links
+-----
+
+- Documentation: https://docs.ejabberd.im
+- Community site: https://www.ejabberd.im
+- ejabberd commercial offering and support: https://www.process-one.net/en/ejabberd

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

@@ -12,9 +12,9 @@ defmodule Ejabberd.ConfigFile do
      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 +61,6 @@ defmodule Ejabberd.ConfigFile do
     @opts [
       port: 5280,
       web_admin: true,
-      http_poll: true,
       http_bind: true,
       captcha: true]
   end
@@ -94,9 +93,6 @@ defmodule Ejabberd.ConfigFile do
   module :mod_disco do
   end
 
-  module :mod_irc do
-  end
-
   module :mod_http_bind do
   end
 
@@ -135,9 +131,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,667 +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_irc: {}
-  mod_http_bind: {}
-  ## mod_http_fileserver:
-  ##   docroot: "/var/www"
-  ##   accesslog: "/var/log/ejabberd/access.log"
-  mod_last: {}
-  mod_muc:
-    ## host: "conference.@HOST@"
-    access: muc
-    access_create: muc_create
-    access_persistent: muc_create
-    access_admin: muc_admin
-  ## mod_muc_log: {}
-  mod_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])
@@ -109,10 +109,10 @@ AC_ARG_ENABLE(mssql,
 esac],[db_type=generic])
 
 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-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 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 tools=false ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
 esac],[])
 
@@ -172,14 +172,6 @@ AC_ARG_ENABLE(zlib,
   *) 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
@@ -196,14 +188,6 @@ AC_ARG_ENABLE(elixir,
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-elixir) ;;
 esac],[if test "x$elixir" = "x"; then elixir=false; fi])
 
-AC_ARG_ENABLE(iconv,
-[AC_HELP_STRING([--enable-iconv], [enable iconv support (default: yes)])],
-[case "${enableval}" in
-  yes) iconv=true ;;
-  no)  iconv=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-iconv) ;;
-esac],[if test "x$iconv" = "x"; then iconv=true; fi])
-
 AC_ARG_ENABLE(debug,
 [AC_HELP_STRING([--enable-debug], [enable debug information (default: yes)])],
 [case "${enableval}" in
@@ -275,8 +259,6 @@ if test "$ENABLEGROUP" != ""; then
   AC_SUBST([INSTALLGROUP], [$ENABLEGROUP])
 fi
 
-ERLANG_DEPRECATED_TYPES_CHECK
-
 if test "$sqlite" = "true"; then
    AX_LIB_SQLITE3([3.6.19])
    if test "x$SQLITE3_VERSION" = "x"; then
@@ -285,7 +267,7 @@ if test "$sqlite" = "true"; then
 fi
 
 enabled_backends=""
-for backend in odbc mysql pgsql sqlite riak redis; do
+for backend in odbc mysql pgsql sqlite redis; do
     if eval test x\${$backend} = xtrue; then
        if test "x$enabled_backends" = "x"; then
           enabled_backends=$backend
@@ -306,10 +288,8 @@ AC_SUBST(pgsql)
 AC_SUBST(sqlite)
 AC_SUBST(pam)
 AC_SUBST(zlib)
-AC_SUBST(riak)
 AC_SUBST(redis)
 AC_SUBST(elixir)
-AC_SUBST(iconv)
 AC_SUBST(stun)
 AC_SUBST(sip)
 AC_SUBST(debug)

ejabberd.service.template

@@ -13,6 +13,7 @@ ExecStart=/bin/sh -c '@ctlscriptpath@/ejabberdctl start && @ctlscriptpath@/ejabb
 ExecStop=/bin/sh -c '@ctlscriptpath@/ejabberdctl stop && @ctlscriptpath@/ejabberdctl stopped'
 ExecReload=@ctlscriptpath@/ejabberdctl reload_config
 PrivateDevices=true
+TimeoutSec=300
 
 [Install]
 WantedBy=multi-user.target

ejabberd.yml.example

@@ -1,612 +1,95 @@
 ###
-###'              ejabberd configuration file
+###              ejabberd configuration file
 ###
+### The parameters used in this configuration file are explained at
+###
+###       https://docs.ejabberd.im/admin/configuration
 ###
-
-### 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.
+### *******************************************************
+### *******           !!! WARNING !!!               *******
+### *******     YAML IS INDENTATION SENSITIVE       *******
+### ******* MAKE SURE YOU INDENT SECTIONS CORRECTLY *******
+### *******************************************************
 ### Refer to http://en.wikipedia.org/wiki/YAML for the brief description.
-### However, ejabberd treats different literals as different types:
 ###
-### - unquoted or single-quoted strings. They are called "atoms".
-###   Example: dog, 'Jupiter', '3.14159', YELLOW
-###
-### - numeric literals. Example: 3, -45.0, .0
-###
-### - quoted or folded strings.
-###   Examples of quoted string: "Lizzard", "orange".
-###   Example of folded string:
-###   > Art thou not Romeo,
-###     and a Montague?
 
-###.  =======
-###'  LOGGING
-
-##
-## loglevel: Verbosity of log files generated by ejabberd.
-## 0: No ejabberd log at all (not recommended)
-## 1: Critical
-## 2: Error
-## 3: Warning
-## 4: Info
-## 5: Debug
-##
-loglevel: 4
-
-##
-## rotation: Describe how to rotate logs. Either size and/or date can trigger
-## log rotation. Setting count to N keeps N rotated logs. Setting count to 0
-## does not disable rotation, it instead rotates the file and keeps no previous
-## versions around. Setting size to X rotate log when it reaches X bytes.
-## To disable rotation set the size to 0 and the date to ""
-## Date syntax is taken from the syntax newsyslog uses in newsyslog.conf.
-## Some examples:
-##  $D0     rotate every night at midnight
-##  $D23    rotate every day at 23:00 hr
-##  $W0D23  rotate every week on Sunday at 23:00 hr
-##  $W5D16  rotate every week on Friday at 16:00 hr
-##  $M1D0   rotate on the first day of every month at midnight
-##  $M5D6   rotate on every 5th day of the month at 6:00 hr
-##
-log_rotate_size: 10485760
-log_rotate_date: ""
-log_rotate_count: 1
-
-##
-## overload protection: If you want to limit the number of messages per second
-## allowed from error_logger, which is a good idea if you want to avoid a flood
-## of messages when system is overloaded, you can set a limit.
-## 100 is ejabberd's default.
-log_rate_limit: 100
-
-##
-## watchdog_admins: Only useful for developers: if an ejabberd process
-## consumes a lot of memory, send live notifications to these XMPP
-## accounts.
-##
-## watchdog_admins:
-##   - "bob@example.com"
-
-###.  ===============
-###'  NODE PARAMETERS
-
-##
-## net_ticktime: Specifies net_kernel tick time in seconds. This options must have
-## identical value on all nodes, and in most cases shouldn't be changed at all from
-## default value.
-##
-## net_ticktime: 60
-
-###.  ================
-###'  SERVED HOSTNAMES
-
-##
-## hosts: Domains served by ejabberd.
-## You can define one or several, for example:
-## hosts:
-##   - "example.net"
-##   - "example.com"
-##   - "example.org"
-##
 hosts:
-  - "localhost"
+  - 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
+loglevel: info
 
-###.  ============
-###'  Certificates
+## If you already have certificates, list them here
+# certfiles:
+#  - /etc/letsencrypt/live/domain.tld/fullchain.pem
+#  - /etc/letsencrypt/live/domain.tld/privkey.pem
 
-## List all available PEM files containing certificates for your domains,
-## chains of certificates or certificate keys. Full chains will be built
-## automatically by ejabberd.
-##
-## certfiles:
-##   - "/etc/letsencrypt/live/example.org/*.pem"
-##   - "/etc/letsencrypt/live/example.com/*.pem"
-##
-## If your system provides only a single CA file (CentOS/FreeBSD):
-## ca_file: "/etc/ssl/certs/ca-bundle.pem"
-
-###.  =================
-###'  TLS configuration
-
-## Note that the following configuration is the default
-## configuration of the TLS driver, so you don't need to
-## uncomment it.
-##
-## define_macro:
-##   'TLS_CIPHERS': "HIGH:!aNULL:!eNULL:!3DES:@STRENGTH"
-##   'TLS_OPTIONS':
-##     - "no_sslv3"
-##     - "cipher_server_preference"
-##     - "no_compression"
-##   'DH_FILE': "/path/to/dhparams.pem" # generated with: openssl dhparam -out dhparams.pem 2048
-##
-## c2s_dhfile: 'DH_FILE'
-## s2s_dhfile: 'DH_FILE'
-## c2s_ciphers: 'TLS_CIPHERS'
-## s2s_ciphers: 'TLS_CIPHERS'
-## c2s_protocol_options: 'TLS_OPTIONS'
-## s2s_protocol_options: 'TLS_OPTIONS'
-
-###.  ===============
-###'  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
     ip: "::"
     module: ejabberd_c2s
-    ##
-    ## If TLS is compiled in and you installed a SSL
-    ## certificate, uncomment this line:
-    ##
-    ## starttls: true
-    ##
-    ## To enforce TLS encryption for client connections,
-    ## use this instead of the "starttls" option:
-    ##
-    ## starttls_required: true
-    ##
-    ## Stream compression
-    ##
-    ## zlib: true
-    ##
-    max_stanza_size: 65536
+    max_stanza_size: 262144
     shaper: c2s_shaper
     access: c2s
-  ##
-  ## Direct-TLS for C2S (XEP-0368). A good practice is to forward
-  ## traffic from port 443 to this port, possibly multiplexing it
-  ## with HTTP using e.g. sslh [https://wiki.xmpp.org/web/Tech_pages/XEP-0368],
-  ## so modern clients can bypass restrictive firewalls (in airports, hotels, etc.).
-  ##
-  ## -
-  ##   port: 5223
-  ##   ip: "::"
-  ##   module: ejabberd_c2s
-  ##   tls: true
-  ##   max_stanza_size: 65536
-  ##   shaper: c2s_shaper
-  ##   access: c2s
+    starttls_required: true
   -
     port: 5269
     ip: "::"
     module: ejabberd_s2s_in
+    max_stanza_size: 524288
+  -
+    port: 5443
+    ip: "::"
+    module: ejabberd_http
+    tls: true
+    request_handlers:
+      /admin: ejabberd_web_admin
+      /api: mod_http_api
+      /bosh: mod_bosh
+      /captcha: ejabberd_captcha
+      /upload: mod_http_upload
+      /ws: ejabberd_http_ws
   -
     port: 5280
     ip: "::"
     module: ejabberd_http
     request_handlers:
-      "/ws": ejabberd_http_ws
-      "/bosh": mod_bosh
-      "/api": mod_http_api
-    ##  "/pub/archive": mod_http_fileserver
-    web_admin: true
-    ## register: true
-    captcha: true
+      /admin: ejabberd_web_admin
+      /.well-known/acme-challenge: ejabberd_acme
+  -
+    port: 1883
+    ip: "::"
+    module: mod_mqtt
+    backlog: 1000
 
-  ##
-  ## ejabberd_service: Interact with external components (transports, ...)
-  ##
-  ## -
-  ##   port: 8888
-  ##   ip: "::"
-  ##   module: ejabberd_service
-  ##   access: all
-  ##   shaper_rule: fast
-  ##   ip: "127.0.0.1"
-  ##   privilege_access:
-  ##      roster: "both"
-  ##      message: "outgoing"
-  ##      presence: "roster"
-  ##   delegations:
-  ##      "urn:xmpp:mam:1":
-  ##        filtering: ["node"]
-  ##      "http://jabber.org/protocol/pubsub":
-  ##        filtering: []
-  ##   hosts:
-  ##     "icq.example.org":
-  ##       password: "secret"
-  ##     "sms.example.org":
-  ##       password: "secret"
+s2s_use_starttls: optional
 
-  ##
-  ## ejabberd_stun: Handles STUN Binding requests
-  ##
-  ## -
-  ##   port: 3478
-  ##   transport: udp
-  ##   module: ejabberd_stun
-
-  ##
-  ## To handle XML-RPC requests that provide admin credentials:
-  ##
-  ## -
-  ##   port: 4560
-  ##   ip: "::"
-  ##   module: ejabberd_xmlrpc
-  ##   maxsessions: 10
-  ##   timeout: 5000
-  ##   access_commands:
-  ##     admin:
-  ##       commands: all
-  ##       options: []
-
-  ##
-  ## To enable secure http upload
-  ##
-  ## -
-  ##   port: 5444
-  ##   ip: "::"
-  ##   module: ejabberd_http
-  ##   request_handlers:
-  ##     "": mod_http_upload
-  ##   tls: true
-  ##   protocol_options: 'TLS_OPTIONS'
-  ##   dhfile: 'DH_FILE'
-  ##   ciphers: 'TLS_CIPHERS'
-
-## Disabling digest-md5 SASL authentication. digest-md5 requires plain-text
-## password storage (see auth_password_format option).
-## disable_sasl_mechanisms: "digest-md5"
-
-###.  ==================
-###'  S2S GLOBAL OPTIONS
-
-##
-## s2s_use_starttls: Enable STARTTLS for S2S connections.
-## Allowed values are: false, optional or required
-## You must specify 'certfiles' option
-##
-## s2s_use_starttls: optional
-
-##
-## 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 seconds.
-##
-## outgoing_s2s_families:
-##   - ipv4
-##   - ipv6
-## outgoing_s2s_timeout: 190
-
-###.  ==============
-###'  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 SQL
-## Remember to setup a database in the next section.
-##
-## auth_method: sql
-
-##
-## 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:
-##
-## sql_type: mysql
-## sql_server: "server"
-## sql_database: "database"
-## sql_username: "username"
-## sql_password: "password"
-##
-## If you want to specify the port:
-## sql_port: 1234
-
-##
-## PostgreSQL server:
-##
-## sql_type: pgsql
-## sql_server: "server"
-## sql_database: "database"
-## sql_username: "username"
-## sql_password: "password"
-##
-## If you want to specify the port:
-## sql_port: 1234
-##
-## If you use PostgreSQL, have a large database, and need a
-## faster but inexact replacement for "select count(*) from users"
-##
-## pgsql_users_number_estimate: true
-
-##
-## SQLite:
-##
-## sql_type: sqlite
-## sql_database: "/path/to/database.db"
-
-##
-## ODBC compatible or MSSQL server:
-##
-## sql_type: odbc
-## sql_server: "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"
-
-##
-## Number of connections to open to the database for each virtual host
-##
-## sql_pool_size: 10
-
-##
-## Interval to make a dummy SQL request to keep the connections to the
-## database alive. Specify in seconds: for example 28800 means 8 hours
-##
-## sql_keepalive_interval: undefined
-
-##
-## Use the new SQL schema
-##
-## new_sql_schema: true
-
-###.  ===============
-###'  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: 10000
-
-###.   ====================
-###'   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"
-      - "::1/128"
-      - "::FFFF:127.0.0.1/128"
+      - 127.0.0.0/8
+      - ::1/128
 
-  ##
-  ## 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"
-
-###.  ============
-###'  SHAPER RULES
-
-shaper_rules:
-  ## Maximum number of simultaneous sessions allowed for a single user:
-  max_user_sessions: 10
-  ## Maximum number of offline messages that users can have:
-  max_user_offline_messages:
-    - 5000: admin
-    - 100
-  ## For C2S connections, all users except admins use the "normal" shaper
-  c2s_shaper:
-    - none: admin
-    - normal
-  ## All S2S connections use the "fast" shaper
-  s2s_shaper: fast
-
-###.  ============
-###'  ACCESS RULES
 access_rules:
-  ## This rule allows access only for local users:
   local:
-    - allow: local
-  ## Only non-blocked users can use c2s connections:
+    allow: local
   c2s:
-    - deny: blocked
-    - allow
-  ## Only admins can send announcement messages:
+    deny: blocked
+    allow: all
   announce:
-    - allow: admin
-  ## Only admins can use the configuration interface:
+    allow: admin
   configure:
-    - allow: admin
-  ## Only accounts of the local ejabberd server can create rooms:
+    allow: admin
   muc_create:
-    - allow: local
-  ## Only accounts on the local ejabberd server can create Pubsub nodes:
+    allow: local
   pubsub_createnode:
-    - allow: local
-  ## In-band registration allows registration of any possible username.
-  ## To disable in-band registration, replace 'allow' with 'deny'.
-  register:
-    - allow
-  ## Only allow to register from localhost
+    allow: local
   trusted_network:
-    - allow: loopback
-  ## Do not establish S2S connections with bad servers
-  ## If you enable this you also have to uncomment "s2s_access: s2s"
-  ## s2s:
-  ##   - deny:
-  ##     - ip: "XXX.XXX.XXX.XXX/32"
-  ##   - deny:
-  ##     - ip: "XXX.XXX.XXX.XXX/32"
-  ##   - allow
+    allow: loopback
 
-## ===============
-## API PERMISSIONS
-## ===============
-##
-## This section allows you to define who and using what method
-## can execute commands offered by ejabberd.
-##
-## By default "console commands" section allow executing all commands
-## issued using ejabberdctl command, and "admin access" section allows
-## users in admin acl that connect from 127.0.0.1 to  execute all
-## commands except start and stop with any available access method
-## (ejabberdctl, http-api, xmlrpc depending what is enabled on server).
-##
-## If you remove "console commands" there will be one added by
-## default allowing executing all commands, but if you just change
-## permissions in it, version from config file will be used instead
-## of default one.
-##
 api_permissions:
   "console commands":
     from:
@@ -615,258 +98,117 @@ api_permissions:
     what: "*"
   "admin access":
     who:
-      - access:
-          - allow:
-            - acl: loopback
-            - acl: admin
-      - oauth:
-        - scope: "ejabberd:admin"
-        - access:
-          - allow:
-            - acl: loopback
-            - acl: admin
+      access:
+        allow:
+          acl: loopback
+          acl: admin
+      oauth:
+        scope: "ejabberd:admin"
+        access:
+          allow:
+            acl: loopback
+            acl: admin
     what:
       - "*"
       - "!stop"
       - "!start"
   "public commands":
     who:
-      - ip: "127.0.0.1/8"
+      ip: 127.0.0.1/8
     what:
-      - "status"
-      - "connected_users_number"
+      - status
+      - connected_users_number
 
-## 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:
-##         - allow: admin
-##         - deny
-##       register:
-##         - deny
+shaper:
+  normal: 1000
+  fast: 50000
 
-###.  ================
-###'  DEFAULT LANGUAGE
+shaper_rules:
+  max_user_sessions: 10
+  max_user_offline_messages:
+    5000: admin
+    100: all
+  c2s_shaper:
+    none: admin
+    normal: all
+  s2s_shaper: fast
 
-##
-## 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
-
-###.  ====
-###'  ACME
-##
-## In order to use the acme certificate acquiring through "Let's Encrypt"
-## an http listener has to be configured to listen to port 80 so that
-## the authorization challenges posed by "Let's Encrypt" can be solved.
-## 
-## A simple way of doing this would be to add the following in the listening
-## section and to configure port forwarding from 80 to 5280 either via NAT
-## (for ipv4 only) or using frontends such as haproxy/nginx/sslh/etc.
-##   - 
-##    port: 5280
-##    ip: "::"
-##    module: ejabberd_http
-
-acme:
-
-   ## A contact mail that the ACME Certificate Authority can contact in case of
-   ## an authorization issue, such as a server-initiated certificate revocation.
-   ## It is not mandatory to provide an email address but it is highly suggested.
-   contact: "mailto:example-admin@example.com"
-
-
-   ## The ACME Certificate Authority URL.
-   ## This could either be:
-   ##   - https://acme-v01.api.letsencrypt.org - (Default) for the production CA
-   ##   - https://acme-staging.api.letsencrypt.org - for the staging CA
-   ##   - http://localhost:4000 - for a local version of the CA
-   ca_url: "https://acme-v01.api.letsencrypt.org"
-
-###.  =======
-###'  MODULES
-
-##
-## Modules enabled in all ejabberd virtual hosts.
-##
 modules:
   mod_adhoc: {}
   mod_admin_extra: {}
-  mod_announce: # recommends mod_adhoc
+  mod_announce:
     access: announce
-  mod_blocking: {} # requires mod_privacy
+  mod_avatar: {}
+  mod_blocking: {}
+  mod_bosh: {}
   mod_caps: {}
   mod_carboncopy: {}
   mod_client_state: {}
-  mod_configure: {} # requires mod_adhoc
-  ## mod_delegation: {} # for xep0356
+  mod_configure: {}
   mod_disco: {}
-  mod_echo: {}
-  mod_irc: {}
-  mod_bosh: {}
-  ## mod_http_fileserver:
-  ##   docroot: "/var/www"
-  ##   accesslog: "/var/log/ejabberd/access.log"
-  ## mod_http_upload:
-  ##   # docroot: "@HOME@/upload"
-  ##   put_url: "https://@HOST@:5444"
-  ##   thumbnail: false # otherwise needs ejabberd to be compiled with libgd support
-  ## mod_http_upload_quota:
-  ##   max_days: 30
+  mod_fail2ban: {}
+  mod_http_api: {}
+  mod_http_upload:
+    put_url: https://@HOST@:5443/upload
   mod_last: {}
-  ## XEP-0313: Message Archive Management
-  ## You might want to setup a SQL backend for MAM because the mnesia database is
-  ## limited to 2GB which might be exceeded on large servers
-  ## mod_mam: {} # for xep0313, mnesia is limited to 2GB, better use an SQL backend
+  mod_mam:
+    ## Mnesia is limited to 2GB, better to use an SQL backend
+    ## For small servers SQLite is a good fit and is very easy
+    ## to configure. Uncomment this when you have SQL configured:
+    ## db_type: sql
+    assume_mam_usage: true
+    default: always
+  mod_mqtt: {}
   mod_muc:
-    ## host: "conference.@HOST@"
     access:
       - allow
     access_admin:
       - allow: admin
     access_create: muc_create
     access_persistent: muc_create
+    access_mam:
+      - allow
+    default_room_options:
+      mam: true
   mod_muc_admin: {}
-  ## mod_muc_log: {}
-  ## mod_multicast: {}
   mod_offline:
     access_max_user_messages: max_user_offline_messages
   mod_ping: {}
-  ## mod_pres_counter:
-  ##   count: 5
-  ##   interval: 60
   mod_privacy: {}
   mod_private: {}
-  ## mod_proxy65: {}
+  mod_proxy65:
+    access: local
+    max_connections: 5
   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
+      - flat
+      - pep
     force_node_config:
-      ## Avoid using OMEMO by default because it
-      ## introduces a lot of hard-to-track problems
-      "eu.siacs.conversations.axolotl.*":
-        access_model: whitelist
       ## Avoid buggy clients to make their bookmarks public
-      "storage:bookmarks":
+      storage:bookmarks:
         access_model: whitelist
   mod_push: {}
   mod_push_keepalive: {}
-  ## 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:
-    search: false
-  mod_vcard_xupdate: {}
-  mod_avatar: {}
-  mod_version: {}
-  mod_stream_mgmt: {}
-  ##   Non-SASL Authentication (XEP-0078) is now disabled by default
-  ##   because it's obsoleted and is used mostly by abandoned
-  ##   client software
-  ## mod_legacy_auth: {}
-  ##   The module for S2S dialback (XEP-0220). Please note that you cannot
-  ##   rely solely on dialback if you want to federate with other servers,
-  ##   because a lot of servers have dialback disabled and instead rely on
-  ##   PKIX authentication. Make sure you have proper certificates installed
-  ##   and check your accessibility at https://check.messaging.one/
+  mod_register:
+    ## Only accept registration requests from the "trusted"
+    ## network (see access_rules section above).
+    ## Think twice before enabling registration from any
+    ## address. See the Jabber SPAM Manifesto for details:
+    ## https://github.com/ge0rg/jabber-spam-fighting-manifesto
+    ip_access: trusted_network
+  mod_roster:
+    versioning: true
   mod_s2s_dialback: {}
-  mod_http_api: {}
-  mod_fail2ban: {}
+  mod_shared_roster: {}
+  mod_stream_mgmt:
+    resend_on_timeout: if_offline
+  mod_vcard: {}
+  mod_vcard_xupdate: {}
+  mod_version:
+    show_os: false
 
-##
-## Enable modules with custom options in a specific virtual host
-##
-## host_config:
-##   "localhost":
-##     modules:
-##       mod_echo:
-##         host: "mirror.localhost"
-
-##
-## Enable modules management via ejabberdctl for installation and
-## uninstallation of public/private contributed modules
-## (enabled by default)
-##
-
-allow_contrib_modules: true
-
-###.
-###'
 ### Local Variables:
 ### mode: yaml
 ### End:
-### vim: set filetype=yaml tabstop=8 foldmarker=###',###. foldmethod=marker:
+### vim: set filetype=yaml tabstop=8

ejabberdctl.cfg.example

@@ -33,10 +33,10 @@
 # from a client or from another Jabber server. So take this into
 # account when setting this limit.
 #
-# Default: 32000
+# Default: 65536 (or 8196 on Windows)
 # Maximum: 268435456
 #
-#ERL_MAX_PORTS=32000
+#ERL_MAX_PORTS=65536
 
 #.
 #' FIREWALL_WINDOW: Range of allowed ports to pass through a firewall
@@ -85,10 +85,10 @@
 # Erlang, and therefore not related to the operating system processes, you do
 # not have to worry about allowing a huge number of them.
 #
-# Default: 250000
+# Default: 262144
 # Maximum: 268435456
 #
-#ERL_PROCESSES=250000
+#ERL_PROCESSES=262144
 
 #.
 #' ERL_MAX_ETS_TABLES: Maximum number of ETS and Mnesia tables
@@ -99,9 +99,9 @@
 # You can safely increase this limit when starting ejabberd. It impacts memory
 # consumption but the difference will be quite small.
 #
-# Default: 1400
+# Default: 2053
 #
-#ERL_MAX_ETS_TABLES=1400
+#ERL_MAX_ETS_TABLES=2053
 
 #.
 #' ERL_OPTIONS: Additional Erlang options

examples/mtr/ejabberd-netbsd.sh

@@ -70,7 +70,7 @@ done
 echo '7. compile ejabberd'
 
 gmake
-for A in mod_irc mod_muc mod_pubsub; do
+for A in mod_muc mod_pubsub; do
     (cd $A; gmake)
 done
 

examples/mtr/ejabberd.cfg

@@ -51,7 +51,6 @@ override_acls.
            {mod_offline,   []},
            {mod_echo,      [{host, "echo.jabber.dbc.mtview.ca.us"}]},
            {mod_private,   []},
-%          {mod_irc,       []},
            {mod_muc,       []},
            {mod_pubsub,    []},
            {mod_time,      []},

include/adhoc.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2020   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-2020   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd.hrl

@@ -1,72 +0,0 @@
-%%%----------------------------------------------------------------------
-%%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
-%%%
-%%% This program is free software; you can redistribute it and/or
-%%% modify it under the terms of the GNU General Public License as
-%%% published by the Free Software Foundation; either version 2 of the
-%%% License, or (at your option) any later version.
-%%%
-%%% This program is distributed in the hope that it will be useful,
-%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
-%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%%% General Public License for more details.
-%%%
-%%% You should have received a copy of the GNU General Public License along
-%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%%
-%%%----------------------------------------------------------------------
-
--ifndef(EJABBERD_HRL).
--define(EJABBERD_HRL, true).
-
--define(VERSION, ejabberd_config:get_version()).
-
--define(MYHOSTS, ejabberd_config:get_myhosts()).
-
--define(MYNAME, hd(ejabberd_config:get_myhosts())).
-
--define(MYLANG, ejabberd_config:get_mylang()).
-
--define(MSGS_DIR, filename:join(["priv", "msgs"])).
-
--define(SQL_DIR, filename:join(["priv", "sql"])).
-
--define(CONFIG_PATH, <<"ejabberd.yml">>).
-
--define(LOG_PATH, "ejabberd.log").
-
--define(EJABBERD_URI, <<"http://www.process-one.net/en/ejabberd/">>).
-
--define(COPYRIGHT, "Copyright (c) ProcessOne").
-
-%%-define(DBGFSM, true).
-
--record(scram,
-	{storedkey = <<"">>,
-         serverkey = <<"">>,
-         salt = <<"">>,
-         iterationcount = 0 :: integer()}).
-
--type scram() :: #scram{}.
-
--define(SCRAM_DEFAULT_ITERATION_COUNT, 4096).
-
--ifdef(ERL_DEPRECATED_TYPES).
-
--define(TDICT, dict()).
--define(TGB_TREE, gb_tree()).
--define(TGB_SET, gb_set()).
--define(TQUEUE, queue()).
-
--else.
-
--define(TDICT, dict:dict()).
--define(TGB_TREE, gb_trees:tree()).
--define(TGB_SET, gb_sets:set()).
--define(TQUEUE, queue:queue()).
-
--endif.
-
--endif.

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-2020   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-2020   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-2020   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-2020   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-2020   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -23,7 +23,7 @@
 	 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()},
@@ -31,7 +31,10 @@
 	 port = 5280       :: inet:port_number(),
 	 opts = []         :: list(),
 	 tp = http         :: protocol(),
-	 headers = []      :: [{atom() | binary(), binary()}]}).
+	 headers = []      :: [{atom() | binary(), binary()}],
+	 length = 0        :: non_neg_integer(),
+	 sockmod           :: gen_tcp | fast_tls,
+	 socket            :: inet:socket() | fast_tls:tls_socket()}).
 
 -record(ws,
 	{socket                  :: inet:socket() | fast_tls:tls_socket(),

include/ejabberd_oauth.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2020   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-2020   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,42 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2020   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)).
+
+-record(sql_query, {hash :: binary(),
+		    format_query :: fun(),
+		    format_res :: fun(),
+		    args :: fun(),
+		    loc :: {module(), pos_integer()}}).
+
+-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-2020   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-2020   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,10 +18,10 @@
 %%%
 %%%----------------------------------------------------------------------
 
--type matchspec_atom() :: '_' | '$1' | '$2' | '$3' | '$4'.
--record(carboncopy, {us       :: {binary(), binary()} | matchspec_atom(), 
-		     resource :: binary() | matchspec_atom(),
-		     version  :: binary() | matchspec_atom(),
-		     node = node() :: node() | matchspec_atom()}).
-
--define(CARBONCOPY_CACHE, carboncopy_cache).
+-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-2020   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,7 @@
 	     {<<"value">>, Value}])).
 
 -define(INPUTT(Type, Name, Value),
-	?INPUT(Type, Name, (?T(Value)))).
+	?INPUT(Type, Name, (translate:translate(Lang, Value)))).
 
 -define(INPUTS(Type, Name, Value, Size),
 	?XA(<<"input">>,
@@ -73,7 +71,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,12 +88,12 @@
 	?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, "]">>)])])).
 

include/eldap.hrl

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

@@ -1,501 +0,0 @@
-%%%----------------------------------------------------------------------
-%%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
-%%%
-%%% This program is free software; you can redistribute it and/or
-%%% modify it under the terms of the GNU General Public License as
-%%% published by the Free Software Foundation; either version 2 of the
-%%% License, or (at your option) any later version.
-%%%
-%%% This program is distributed in the hope that it will be useful,
-%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
-%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%%% General Public License for more details.
-%%%
-%%% You should have received a copy of the GNU General Public License along
-%%% with this program; if not, write to the Free Software Foundation, Inc.,
-%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-%%%
-%%%----------------------------------------------------------------------
-
--include("ns.hrl").
--include("fxml.hrl").
-
--define(STANZA_ERROR(Code, Type, Condition),
-	#xmlel{name = <<"error">>,
-	       attrs = [{<<"code">>, Code}, {<<"type">>, Type}],
-	       children =
-		   [#xmlel{name = Condition,
-			   attrs = [{<<"xmlns">>, ?NS_STANZAS}],
-			   children = []}]}).
-
--define(ERR_BAD_FORMAT,
-	?STANZA_ERROR(<<"406">>, <<"modify">>,
-		      <<"bad-format">>)).
-
--define(ERR_BAD_REQUEST,
-	?STANZA_ERROR(<<"400">>, <<"modify">>,
-		      <<"bad-request">>)).
-
--define(ERR_CONFLICT,
-	?STANZA_ERROR(<<"409">>, <<"cancel">>, <<"conflict">>)).
-
--define(ERR_FEATURE_NOT_IMPLEMENTED,
-	?STANZA_ERROR(<<"501">>, <<"cancel">>,
-		      <<"feature-not-implemented">>)).
-
--define(ERR_FORBIDDEN,
-	?STANZA_ERROR(<<"403">>, <<"auth">>, <<"forbidden">>)).
-
--define(ERR_GONE,
-	?STANZA_ERROR(<<"302">>, <<"modify">>, <<"gone">>)).
-
--define(ERR_INTERNAL_SERVER_ERROR,
-	?STANZA_ERROR(<<"500">>, <<"wait">>,
-		      <<"internal-server-error">>)).
-
--define(ERR_ITEM_NOT_FOUND,
-	?STANZA_ERROR(<<"404">>, <<"cancel">>,
-		      <<"item-not-found">>)).
-
--define(ERR_JID_MALFORMED,
-	?STANZA_ERROR(<<"400">>, <<"modify">>,
-		      <<"jid-malformed">>)).
-
--define(ERR_NOT_ACCEPTABLE,
-	?STANZA_ERROR(<<"406">>, <<"modify">>,
-		      <<"not-acceptable">>)).
-
--define(ERR_NOT_ALLOWED,
-	?STANZA_ERROR(<<"405">>, <<"cancel">>,
-		      <<"not-allowed">>)).
-
--define(ERR_NOT_AUTHORIZED,
-	?STANZA_ERROR(<<"401">>, <<"auth">>,
-		      <<"not-authorized">>)).
-
--define(ERR_PAYMENT_REQUIRED,
-	?STANZA_ERROR(<<"402">>, <<"auth">>,
-		      <<"payment-required">>)).
-
--define(ERR_RECIPIENT_UNAVAILABLE,
-	?STANZA_ERROR(<<"404">>, <<"wait">>,
-		      <<"recipient-unavailable">>)).
-
--define(ERR_REDIRECT,
-	?STANZA_ERROR(<<"302">>, <<"modify">>, <<"redirect">>)).
-
--define(ERR_REGISTRATION_REQUIRED,
-	?STANZA_ERROR(<<"407">>, <<"auth">>,
-		      <<"registration-required">>)).
-
--define(ERR_REMOTE_SERVER_NOT_FOUND,
-	?STANZA_ERROR(<<"404">>, <<"cancel">>,
-		      <<"remote-server-not-found">>)).
-
--define(ERR_REMOTE_SERVER_TIMEOUT,
-	?STANZA_ERROR(<<"504">>, <<"wait">>,
-		      <<"remote-server-timeout">>)).
-
--define(ERR_RESOURCE_CONSTRAINT,
-	?STANZA_ERROR(<<"500">>, <<"wait">>,
-		      <<"resource-constraint">>)).
-
--define(ERR_SERVICE_UNAVAILABLE,
-	?STANZA_ERROR(<<"503">>, <<"cancel">>,
-		      <<"service-unavailable">>)).
-
--define(ERR_SUBSCRIPTION_REQUIRED,
-	?STANZA_ERROR(<<"407">>, <<"auth">>,
-		      <<"subscription-required">>)).
-
--define(ERR_UNEXPECTED_REQUEST,
-	?STANZA_ERROR(<<"400">>, <<"wait">>,
-		      <<"unexpected-request">>)).
-
--define(ERR_UNEXPECTED_REQUEST_CANCEL,
-	?STANZA_ERROR(<<"401">>, <<"cancel">>,
-		      <<"unexpected-request">>)).
-
-%-define(ERR_,
-%	?STANZA_ERROR("", "", "")).
-
--define(STANZA_ERRORT(Code, Type, Condition, Lang,
-		      Text),
-	#xmlel{name = <<"error">>,
-	       attrs = [{<<"code">>, Code}, {<<"type">>, Type}],
-	       children =
-		   [#xmlel{name = Condition,
-			   attrs = [{<<"xmlns">>, ?NS_STANZAS}], children = []},
-		    #xmlel{name = <<"text">>,
-			   attrs = [{<<"xmlns">>, ?NS_STANZAS}],
-			   children =
-			       [{xmlcdata,
-				 translate:translate(Lang, Text)}]}]}).
-
--define(ERRT_BAD_FORMAT(Lang, Text),
-	?STANZA_ERRORT(<<"406">>, <<"modify">>,
-		       <<"bad-format">>, Lang, Text)).
-
--define(ERRT_BAD_REQUEST(Lang, Text),
-	?STANZA_ERRORT(<<"400">>, <<"modify">>,
-		       <<"bad-request">>, Lang, Text)).
-
--define(ERRT_CONFLICT(Lang, Text),
-	?STANZA_ERRORT(<<"409">>, <<"cancel">>, <<"conflict">>,
-		       Lang, Text)).
-
--define(ERRT_FEATURE_NOT_IMPLEMENTED(Lang, Text),
-	?STANZA_ERRORT(<<"501">>, <<"cancel">>,
-		       <<"feature-not-implemented">>, Lang, Text)).
-
--define(ERRT_FORBIDDEN(Lang, Text),
-	?STANZA_ERRORT(<<"403">>, <<"auth">>, <<"forbidden">>,
-		       Lang, Text)).
-
--define(ERRT_GONE(Lang, Text),
-	?STANZA_ERRORT(<<"302">>, <<"modify">>, <<"gone">>,
-		       Lang, Text)).
-
--define(ERRT_INTERNAL_SERVER_ERROR(Lang, Text),
-	?STANZA_ERRORT(<<"500">>, <<"wait">>,
-		       <<"internal-server-error">>, Lang, Text)).
-
--define(ERRT_ITEM_NOT_FOUND(Lang, Text),
-	?STANZA_ERRORT(<<"404">>, <<"cancel">>,
-		       <<"item-not-found">>, Lang, Text)).
-
--define(ERRT_JID_MALFORMED(Lang, Text),
-	?STANZA_ERRORT(<<"400">>, <<"modify">>,
-		       <<"jid-malformed">>, Lang, Text)).
-
--define(ERRT_NOT_ACCEPTABLE(Lang, Text),
-	?STANZA_ERRORT(<<"406">>, <<"modify">>,
-		       <<"not-acceptable">>, Lang, Text)).
-
--define(ERRT_NOT_ALLOWED(Lang, Text),
-	?STANZA_ERRORT(<<"405">>, <<"cancel">>,
-		       <<"not-allowed">>, Lang, Text)).
-
--define(ERRT_NOT_AUTHORIZED(Lang, Text),
-	?STANZA_ERRORT(<<"401">>, <<"auth">>,
-		       <<"not-authorized">>, Lang, Text)).
-
--define(ERRT_PAYMENT_REQUIRED(Lang, Text),
-	?STANZA_ERRORT(<<"402">>, <<"auth">>,
-		       <<"payment-required">>, Lang, Text)).
-
--define(ERRT_RECIPIENT_UNAVAILABLE(Lang, Text),
-	?STANZA_ERRORT(<<"404">>, <<"wait">>,
-		       <<"recipient-unavailable">>, Lang, Text)).
-
--define(ERRT_REDIRECT(Lang, Text),
-	?STANZA_ERRORT(<<"302">>, <<"modify">>, <<"redirect">>,
-		       Lang, Text)).
-
--define(ERRT_REGISTRATION_REQUIRED(Lang, Text),
-	?STANZA_ERRORT(<<"407">>, <<"auth">>,
-		       <<"registration-required">>, Lang, Text)).
-
--define(ERRT_REMOTE_SERVER_NOT_FOUND(Lang, Text),
-	?STANZA_ERRORT(<<"404">>, <<"cancel">>,
-		       <<"remote-server-not-found">>, Lang, Text)).
-
--define(ERRT_REMOTE_SERVER_TIMEOUT(Lang, Text),
-	?STANZA_ERRORT(<<"504">>, <<"wait">>,
-		       <<"remote-server-timeout">>, Lang, Text)).
-
--define(ERRT_RESOURCE_CONSTRAINT(Lang, Text),
-	?STANZA_ERRORT(<<"500">>, <<"wait">>,
-		       <<"resource-constraint">>, Lang, Text)).
-
--define(ERRT_SERVICE_UNAVAILABLE(Lang, Text),
-	?STANZA_ERRORT(<<"503">>, <<"cancel">>,
-		       <<"service-unavailable">>, Lang, Text)).
-
--define(ERRT_SUBSCRIPTION_REQUIRED(Lang, Text),
-	?STANZA_ERRORT(<<"407">>, <<"auth">>,
-		       <<"subscription-required">>, Lang, Text)).
-
--define(ERRT_UNEXPECTED_REQUEST(Lang, Text),
-	?STANZA_ERRORT(<<"400">>, <<"wait">>,
-		       <<"unexpected-request">>, Lang, Text)).
-
--define(ERR_AUTH_NO_RESOURCE_PROVIDED(Lang),
-	?ERRT_NOT_ACCEPTABLE(Lang, <<"No resource provided">>)).
-
--define(ERR_AUTH_BAD_RESOURCE_FORMAT(Lang),
-	?ERRT_NOT_ACCEPTABLE(Lang,
-			     <<"Illegal resource format">>)).
-
--define(ERR_AUTH_RESOURCE_CONFLICT(Lang),
-	?ERRT_CONFLICT(Lang, <<"Resource conflict">>)).
-
--define(STREAM_ERROR(Condition, Cdata),
-	#xmlel{name = <<"stream:error">>, attrs = [],
-	       children =
-		   [#xmlel{name = Condition,
-			   attrs = [{<<"xmlns">>, ?NS_STREAMS}],
-			   children = [{xmlcdata, Cdata}]}]}).
-
--define(SERR_BAD_FORMAT,
-	?STREAM_ERROR(<<"bad-format">>, <<"">>)).
-
--define(SERR_BAD_NAMESPACE_PREFIX,
-	?STREAM_ERROR(<<"bad-namespace-prefix">>, <<"">>)).
-
--define(SERR_CONFLICT,
-	?STREAM_ERROR(<<"conflict">>, <<"">>)).
-
--define(SERR_CONNECTION_TIMEOUT,
-	?STREAM_ERROR(<<"connection-timeout">>, <<"">>)).
-
--define(SERR_HOST_GONE,
-	?STREAM_ERROR(<<"host-gone">>, <<"">>)).
-
--define(SERR_HOST_UNKNOWN,
-	?STREAM_ERROR(<<"host-unknown">>, <<"">>)).
-
--define(SERR_IMPROPER_ADDRESSING,
-	?STREAM_ERROR(<<"improper-addressing">>, <<"">>)).
-
--define(SERR_INTERNAL_SERVER_ERROR,
-	?STREAM_ERROR(<<"internal-server-error">>, <<"">>)).
-
--define(SERR_INVALID_FROM,
-	?STREAM_ERROR(<<"invalid-from">>, <<"">>)).
-
--define(SERR_INVALID_ID,
-	?STREAM_ERROR(<<"invalid-id">>, <<"">>)).
-
--define(SERR_INVALID_NAMESPACE,
-	?STREAM_ERROR(<<"invalid-namespace">>, <<"">>)).
-
--define(SERR_INVALID_XML,
-	?STREAM_ERROR(<<"invalid-xml">>, <<"">>)).
-
--define(SERR_NOT_AUTHORIZED,
-	?STREAM_ERROR(<<"not-authorized">>, <<"">>)).
-
--define(SERR_POLICY_VIOLATION,
-	?STREAM_ERROR(<<"policy-violation">>, <<"">>)).
-
--define(SERR_REMOTE_CONNECTION_FAILED,
-	?STREAM_ERROR(<<"remote-connection-failed">>, <<"">>)).
-
--define(SERR_RESOURSE_CONSTRAINT,
-	?STREAM_ERROR(<<"resource-constraint">>, <<"">>)).
-
--define(SERR_RESTRICTED_XML,
-	?STREAM_ERROR(<<"restricted-xml">>, <<"">>)).
-
--define(SERR_SEE_OTHER_HOST(Host),
-	?STREAM_ERROR(<<"see-other-host">>, Host)).
-
--define(SERR_SYSTEM_SHUTDOWN,
-	?STREAM_ERROR(<<"system-shutdown">>, <<"">>)).
-
--define(SERR_UNSUPPORTED_ENCODING,
-	?STREAM_ERROR(<<"unsupported-encoding">>, <<"">>)).
-
--define(SERR_UNSUPPORTED_STANZA_TYPE,
-	?STREAM_ERROR(<<"unsupported-stanza-type">>, <<"">>)).
-
--define(SERR_UNSUPPORTED_VERSION,
-	?STREAM_ERROR(<<"unsupported-version">>, <<"">>)).
-
--define(SERR_XML_NOT_WELL_FORMED,
-	?STREAM_ERROR(<<"xml-not-well-formed">>, <<"">>)).
-
-%-define(SERR_,
-%	?STREAM_ERROR("", "")).
-
--define(STREAM_ERRORT(Condition, Cdata, Lang, Text),
-	#xmlel{name = <<"stream:error">>, attrs = [],
-	       children =
-		   [#xmlel{name = Condition,
-			   attrs = [{<<"xmlns">>, ?NS_STREAMS}],
-			   children = [{xmlcdata, Cdata}]},
-		    #xmlel{name = <<"text">>,
-			   attrs =
-			       [{<<"xml:lang">>, Lang},
-				{<<"xmlns">>, ?NS_STREAMS}],
-			   children =
-			       [{xmlcdata,
-				 translate:translate(Lang, Text)}]}]}).
-
--define(SERRT_BAD_FORMAT(Lang, Text),
-	?STREAM_ERRORT(<<"bad-format">>, <<"">>, Lang, Text)).
-
--define(SERRT_BAD_NAMESPACE_PREFIX(Lang, Text),
-	?STREAM_ERRORT(<<"bad-namespace-prefix">>, <<"">>, Lang,
-		       Text)).
-
--define(SERRT_CONFLICT(Lang, Text),
-	?STREAM_ERRORT(<<"conflict">>, <<"">>, Lang, Text)).
-
--define(SERRT_CONNECTION_TIMEOUT(Lang, Text),
-	?STREAM_ERRORT(<<"connection-timeout">>, <<"">>, Lang,
-		       Text)).
-
--define(SERRT_HOST_GONE(Lang, Text),
-	?STREAM_ERRORT(<<"host-gone">>, <<"">>, Lang, Text)).
-
--define(SERRT_HOST_UNKNOWN(Lang, Text),
-	?STREAM_ERRORT(<<"host-unknown">>, <<"">>, Lang, Text)).
-
--define(SERRT_IMPROPER_ADDRESSING(Lang, Text),
-	?STREAM_ERRORT(<<"improper-addressing">>, <<"">>, Lang,
-		       Text)).
-
--define(SERRT_INTERNAL_SERVER_ERROR(Lang, Text),
-	?STREAM_ERRORT(<<"internal-server-error">>, <<"">>,
-		       Lang, Text)).
-
--define(SERRT_INVALID_FROM(Lang, Text),
-	?STREAM_ERRORT(<<"invalid-from">>, <<"">>, Lang, Text)).
-
--define(SERRT_INVALID_ID(Lang, Text),
-	?STREAM_ERRORT(<<"invalid-id">>, <<"">>, Lang, Text)).
-
--define(SERRT_INVALID_NAMESPACE(Lang, Text),
-	?STREAM_ERRORT(<<"invalid-namespace">>, <<"">>, Lang,
-		       Text)).
-
--define(SERRT_INVALID_XML(Lang, Text),
-	?STREAM_ERRORT(<<"invalid-xml">>, <<"">>, Lang, Text)).
-
--define(SERRT_NOT_AUTHORIZED(Lang, Text),
-	?STREAM_ERRORT(<<"not-authorized">>, <<"">>, Lang,
-		       Text)).
-
--define(SERRT_POLICY_VIOLATION(Lang, Text),
-	?STREAM_ERRORT(<<"policy-violation">>, <<"">>, Lang,
-		       Text)).
-
--define(SERRT_REMOTE_CONNECTION_FAILED(Lang, Text),
-	?STREAM_ERRORT(<<"remote-connection-failed">>, <<"">>,
-		       Lang, Text)).
-
--define(SERRT_RESOURSE_CONSTRAINT(Lang, Text),
-	?STREAM_ERRORT(<<"resource-constraint">>, <<"">>, Lang,
-		       Text)).
-
--define(SERRT_RESTRICTED_XML(Lang, Text),
-	?STREAM_ERRORT(<<"restricted-xml">>, <<"">>, Lang,
-		       Text)).
-
--define(SERRT_SEE_OTHER_HOST(Host, Lang, Text),
-	?STREAM_ERRORT(<<"see-other-host">>, Host, Lang, Text)).
-
--define(SERRT_SYSTEM_SHUTDOWN(Lang, Text),
-	?STREAM_ERRORT(<<"system-shutdown">>, <<"">>, Lang,
-		       Text)).
-
--define(SERRT_UNSUPPORTED_ENCODING(Lang, Text),
-	?STREAM_ERRORT(<<"unsupported-encoding">>, <<"">>, Lang,
-		       Text)).
-
--define(SERRT_UNSUPPORTED_STANZA_TYPE(Lang, Text),
-	?STREAM_ERRORT(<<"unsupported-stanza-type">>, <<"">>,
-		       Lang, Text)).
-
--define(SERRT_UNSUPPORTED_VERSION(Lang, Text),
-	?STREAM_ERRORT(<<"unsupported-version">>, <<"">>, Lang,
-		       Text)).
-
--define(SERRT_XML_NOT_WELL_FORMED(Lang, Text),
-	?STREAM_ERRORT(<<"xml-not-well-formed">>, <<"">>, Lang,
-		       Text)).
-
--record(jid, {user = <<"">> :: binary(),
-              server = <<"">> :: binary(),
-              resource = <<"">> :: binary(),
-              luser = <<"">> :: binary(),
-              lserver = <<"">> :: binary(),
-              lresource = <<"">> :: binary()}).
-
--type(jid() :: #jid{}).
-
--type(ljid() :: {binary(), binary(), binary()}).
-
--record(iq, {id = <<"">>       :: binary(),
-             type = get        :: get | set | result | error,
-             xmlns = <<"">>    :: binary(),
-             lang  = <<"">>    :: binary(),
-             sub_el = #xmlel{} :: xmlel() | [xmlel()]}).
-
--type(iq_get()
-  :: #iq{
-         id     :: binary(),
-         type   :: get,
-         xmlns  :: binary(),
-         lang   :: binary(),
-         sub_el :: xmlel()
-     }
-).
-
--type(iq_set()
-  :: #iq{
-         id     :: binary(),
-         type   :: set,
-         xmlns  :: binary(),
-         lang   :: binary(),
-         sub_el :: xmlel()
-     }
-).
-
--type iq_request() :: iq_get() | iq_set().
-
--type(iq_result()
-  :: #iq{
-         id     :: binary(),
-         type   :: result,
-         xmlns  :: binary(),
-         lang   :: binary(),
-         sub_el :: [xmlel()]
-     }
-).
-
--type(iq_error()
-  :: #iq{
-         id     :: binary(),
-         type   :: error,
-         xmlns  :: binary(),
-         lang   :: binary(),
-         sub_el :: [xmlel()]
-     }
-).
-
--type iq_reply() :: iq_result() | iq_error() .
-
--type(iq() :: iq_request() | iq_reply()).
-
--record(rsm_in, {max :: integer() | error | undefined,
-                 direction :: before | aft | undefined,
-                 id :: binary() | undefined,
-                 index :: integer() | error | undefined}).
-
--record(rsm_out, {count :: integer() | undefined,
-                  index :: integer() | undefined,
-                  first :: binary() | undefined,
-                  last :: binary() | undefined}).
-
--type(rsm_in() :: #rsm_in{}).
-
--type(rsm_out() :: #rsm_out{}).
-
--type broadcast() :: {broadcast, broadcast_data()}.
-
--type broadcast_data() ::
-        {rebind, pid(), binary()} | %% ejabberd_c2s
-        {item, ljid(), mod_roster:subscription()} | %% mod_roster/mod_shared_roster
-        {exit, binary()} | %% mod_roster/mod_shared_roster
-        {privacy_list, mod_privacy:userlist(), binary()} | %% mod_privacy
-        {blocking, unblock_all | {block | unblock, [ljid()]}}. %% mod_blocking
-
--record(xmlelement, {name = ""     :: string(),
-                     attrs = []    :: [{string(), string()}],
-                     children = [] :: [{xmlcdata, iodata()} | xmlelement()]}).
-
--type xmlelement() :: #xmlelement{}.

include/logger.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2020   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),
@@ -42,3 +61,6 @@
             false -> ok;
             _ -> 'Elixir.Logger':bare_log(error, io_lib:format(Format, Args), [?MODULE])
         end).
+
+%% Uncomment if you want to debug p1_fsm/gen_fsm
+%%-define(DBGFSM, true).

include/mod_announce.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2018   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2020   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-2020   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-2020   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-2020   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-2020   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-2020   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,21 +18,19 @@
 %%%
 %%%----------------------------------------------------------------------
 
--include("ejabberd.hrl").
-
 -define(MAX_USERS_DEFAULT, 200).
 
 -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,
 {
@@ -64,9 +62,10 @@
     logging                              = false :: boolean(),
     vcard                                = <<"">> :: binary(),
     vcard_xupdate                        = undefined :: undefined | external | binary(),
-    captcha_whitelist                    = (?SETS):empty() :: ?TGB_SET,
+    captcha_whitelist                    = (?SETS):empty() :: gb_sets:set(),
     mam                                  = false :: boolean(),
-    pubsub                               = <<"">> :: binary()
+    pubsub                               = <<"">> :: binary(),
+    lang                                 = ejabberd_option:language() :: binary()
 }).
 
 -type config() :: #config{}.
@@ -92,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
 }).
@@ -103,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() :: ?TDICT,
-    subscribers             = (?DICT):new() :: ?TDICT,
-    subscriber_nicks        = (?DICT):new() :: ?TDICT,
+    users                   = #{} :: users(),
+    subscribers             = #{} :: subscribers(),
+    subscriber_nicks        = #{} :: subscriber_nicks(),
     last_voice_request_time = treap:empty() :: treap:treap(),
-    robots                  = (?DICT):new() :: ?TDICT,
-    nicks                   = (?DICT):new() :: ?TDICT,
-    affiliations            = (?DICT):new() :: ?TDICT,
-    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-2020   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-2020   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-2020   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-2020   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-2020 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-2020   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-2020   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-2020   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-2020   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-2020 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-2020   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -18,8 +18,6 @@
 %%%
 %%%----------------------------------------------------------------------
 
--include("ejabberd.hrl").
-
 %% -------------------------------
 %% Pubsub constants
 -define(ERR_EXTENDED(E, C), mod_pubsub:extended_error(E, C)).
@@ -28,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
@@ -60,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().
@@ -86,7 +84,7 @@
      Value::binary() | [binary()] | boolean()
 }).
 
--type(subOptions() :: [mod_pubsub:subOption(),...]).
+-type(subOptions() :: [mod_pubsub:subOption()]).
 
 -type(pubOption() ::
     {Option::binary(),
@@ -131,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(),
@@ -148,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()
 }).
 
@@ -163,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/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,13 @@ defmodule ModPresenceDemo do
     info('Receive presence for #{user}')
     :none
   end
+
+  def depends(_host, _opts) do
+    []
+  end
+
+  def mod_options(_host) do
+    []
+  end
+  
 end

m4/erlang-extra.m4

@@ -84,20 +84,3 @@ EOF
 	   AC_MSG_RESULT([ok])
 	fi
 ]) dnl ERLANG_VERSION_CHECK
-
-AC_DEFUN([ERLANG_DEPRECATED_TYPES_CHECK],
-[		AC_MSG_CHECKING([whether Erlang is using deprecated types])
-		cat > conftest.erl <<EOF
--module(conftest).
-
--record(state, {host = dict:new() :: dict:dict()}).
-EOF
-
-	if $ERLC conftest.erl > /dev/null 2>&1; then
-	   AC_MSG_RESULT([no])
-	   AC_SUBST(erlang_deprecated_types, false)
-	else
-	   AC_MSG_RESULT([yes])
-	   AC_SUBST(erlang_deprecated_types, true)
-	fi
-])

mix.exs

@@ -3,7 +3,7 @@ defmodule Ejabberd.Mixfile do
 
   def project do
     [app: :ejabberd,
-     version: "18.4.0",
+     version: "20.2.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,62 +43,77 @@ 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 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}])
+    if_version_above('20', [{:d, :DEPRECATED_GET_STACKTRACE}]) ++
+    if_function_exported(:erl_error, :format_exception, 6, [{:d, :HAVE_ERL_ERROR}])
   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"},
+    [{:lager, "~> 3.6.0"},
      {:p1_utils, "~> 1.0"},
      {:fast_xml, "~> 1.1"},
-     {:xmpp, "~> 1.1"},
+     {:xmpp, "~> 1.4"},
      {:cache_tab, "~> 1.0"},
      {:stringprep, "~> 1.0"},
      {:fast_yaml, "~> 1.0"},
-     {:fast_tls, "~> 1.0"},
+     {:fast_tls, "~> 1.1"},
      {:stun, "~> 1.0"},
      {:esip, "~> 1.0"},
      {:p1_mysql, "~> 1.0"},
+     {:mqtree, "~> 1.0"},
      {:p1_pgsql, "~> 1.1"},
-     {:jiffy, "~> 0.14.7"},
+     {:jiffy, "~> 1.0"},
      {:p1_oauth2, "~> 0.6.1"},
-     {:distillery, "~> 1.0"},
+     {:distillery, "~> 2.0"},
+     {:pkix, "~> 1.0"},
      {:ex_doc, ">= 0.0.0", only: :dev},
      {:eimp, "~> 1.0"},
      {:base64url, "~> 0.0.1"},
-     {:jose, "~> 1.8"}]
+     {:yconf, "~> 1.0"},
+     {:jose, "~> 1.8"},
+     {:idna, "~> 6.0"},
+     {:p1_acme, "~> 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"}},
                          {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(:tools), {:luerl, "~> 0.3.1"}}], do:
       dep
   end
 
@@ -106,8 +122,7 @@ defmodule Ejabberd.Mixfile do
                          {config(:mysql), :p1_mysql},
                          {config(:pgsql), :p1_pgsql},
                          {config(:sqlite), :sqlite3},
-                         {config(:zlib), :ezlib},
-                         {config(:iconv), :iconv}], do:
+                         {config(:zlib), :ezlib}], do:
       app
   end
 
@@ -125,7 +140,7 @@ defmodule Ejabberd.Mixfile do
   defp vars do
     case :file.consult("vars.config") do
       {:ok,config} -> config
-      _ -> [zlib: true, iconv: true]
+      _ -> [zlib: true]
     end
   end
 

mix.lock

@@ -1,35 +1,38 @@
 %{
+  "artificery": {:hex, :artificery, "0.4.2", "3ded6e29e13113af52811c72f414d1e88f711410cac1b619ab3a2666bbd7efd4", [:mix], [], "hexpm"},
   "base64url": {:hex, :base64url, "0.0.1", "36a90125f5948e3afd7be97662a1504b934dd5dac78451ca6e9abf85a10286be", [:rebar], [], "hexpm"},
-  "cache_tab": {:hex, :cache_tab, "1.0.13", "e09857af9b7ba89428227d3801256852cb0d51a4de47e4edcb160d96cc96f8eb", [:rebar3], [{:p1_utils, "1.0.11", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
-  "distillery": {:hex, :distillery, "1.5.2", "eec18b2d37b55b0bcb670cf2bcf64228ed38ce8b046bb30a9b636a6f5a4c0080", [:mix], [], "hexpm"},
-  "earmark": {:hex, :earmark, "1.2.4", "99b637c62a4d65a20a9fb674b8cffb8baa771c04605a80c911c4418c69b75439", [:mix], [], "hexpm"},
-  "eimp": {:hex, :eimp, "1.0.3", "e40108d622d672cf6003d279d98fc46a98df182dbe8756857896ffd28883090d", [:rebar3], [{:p1_utils, "1.0.11", [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.22", "3e387312614762fb84d3f77ba4f17650faf52510482521300b3d98ecdcbec21d", [:rebar3], [{:fast_tls, "1.0.21", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.11", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stun, "1.0.21", [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.21", "7005fe030c0472643314c9c31e7627bb296dcb96a9ce0b5dd8ccb34273f4c1ff", [:rebar3], [{:p1_utils, "1.0.11", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
-  "fast_xml": {:hex, :fast_xml, "1.1.29", "c6356d28f0f76ffefc68b5eb65916f0b8ca513bab71db8ad95bd8577c47e30e2", [:rebar3], [{:p1_utils, "1.0.11", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
-  "fast_yaml": {:hex, :fast_yaml, "1.0.13", "adcb8db20bb96d4e56b63b48c75d47ca15a6bd409da0200ffbd32db382131e22", [:rebar3], [{:p1_utils, "1.0.11", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
+  "cache_tab": {:hex, :cache_tab, "1.0.22", "ad16577e7f26709cacdcb86e6a4960c8d158cab9d189cdf49cc1e2dc33106a70", [:rebar3], [{:p1_utils, "1.0.18", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
+  "distillery": {:hex, :distillery, "2.1.1", "f9332afc2eec8a1a2b86f22429e068ef35f84a93ea1718265e740d90dd367814", [:mix], [{:artificery, "~> 0.2", [hex: :artificery, repo: "hexpm", optional: false]}], "hexpm"},
+  "earmark": {:hex, :earmark, "1.4.3", "364ca2e9710f6bff494117dbbd53880d84bebb692dafc3a78eb50aa3183f2bfd", [:mix], [], "hexpm"},
+  "eimp": {:hex, :eimp, "1.0.14", "fc297f0c7e2700457a95a60c7010a5f1dcb768a083b6d53f49cd94ab95a28f22", [:rebar3], [{:p1_utils, "1.0.18", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
+  "epam": {:hex, :epam, "1.0.6", "6e57e1f5a330fa02a08ee0d4b16d9161f95177351e48c6dfede2f89b7e2f589f", [:rebar3], [], "hexpm"},
+  "eredis": {:hex, :eredis, "1.2.0", "0b8e9cfc2c00fa1374cd107ea63b49be08d933df2cf175e6a89b73dd9c380de4", [:rebar3], [], "hexpm"},
+  "esip": {:hex, :esip, "1.0.32", "b6d5d9eb8342b86509de02ac79e6a9a772dab011e936092441d4e92a7986ca29", [:rebar3], [{:fast_tls, "1.1.4", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.18", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stun, "1.0.31", [hex: :stun, repo: "hexpm", optional: false]}], "hexpm"},
+  "ex_doc": {:hex, :ex_doc, "0.21.3", "857ec876b35a587c5d9148a2512e952e24c24345552259464b98bfbb883c7b42", [:mix], [{:earmark, "~> 1.4", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
+  "ezlib": {:hex, :ezlib, "1.0.7", "c8adffd32e66831df77955d163d705cdcf0a3d66762e6f68f8123012e714bf05", [:rebar3], [], "hexpm"},
+  "fast_tls": {:hex, :fast_tls, "1.1.4", "a0320baf14be72fc9f99211543e411bb98077bf72c42e2d86fc4e2c10d60c258", [:rebar3], [{:p1_utils, "1.0.18", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
+  "fast_xml": {:hex, :fast_xml, "1.1.39", "687080c0190a8c45d564a3576201f1a89f31ae413dd700a2def0821736f98d4d", [:rebar3], [{:p1_utils, "1.0.18", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
+  "fast_yaml": {:hex, :fast_yaml, "1.0.23", "0c74d6274c232609467bf55563066840c265e70081ee0c23215d1f3ca2624dfc", [:rebar3], [{:p1_utils, "1.0.18", [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.7", "f81eb6b8c977b1fd078515937fdce64292d64c6102353fbbfe57db580f4689d1", [:rebar3], [{:p1_utils, "1.0.11", [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"},
+  "idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"},
+  "jiffy": {:hex, :jiffy, "1.0.1", "4f25639772ca41202f41ba9c8f6ca0933554283dd4742c90651e03471c55e341", [:rebar3], [], "hexpm"},
+  "jose": {:hex, :jose, "1.9.0", "4167c5f6d06ffaebffd15cdb8da61a108445ef5e85ab8f5a7ad926fdf3ada154", [:mix, :rebar3], [{:base64url, "~> 0.0.1", [hex: :base64url, repo: "hexpm", optional: false]}], "hexpm"},
+  "lager": {:hex, :lager, "3.6.10", "6172b43ab720ac33914ccd0aeb21fdbdf88213847707d4b91e6af57b2ae5c4d2", [: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.9", "64c5c0bd8bcca3a180b44196265c8ed7594e16bcc845d0698ec6b4e577f48188", [:rebar3], [], "hexpm"},
-  "moka": {:git, "https://github.com/processone/moka.git", "3eed3a6dd7dedb70a6cd18f86c7561a18626eb3b", [tag: "1.0.5c"]},
-  "p1_mysql": {:hex, :p1_mysql, "1.0.5", "2a9644d27050a6aa9e7eb70a0620043f93655212b15f3620dc12f2fbd1a8c43a", [:rebar3], [], "hexpm"},
-  "p1_oauth2": {:hex, :p1_oauth2, "0.6.2", "cc381038920e3d34ef32aa10ba7eb637bdff38a946748c4fd99329ff484a3889", [:rebar3], [], "hexpm"},
-  "p1_pgsql": {:hex, :p1_pgsql, "1.1.5", "1e1bef6e6d906e10552a608b9fe5ef39b3099caf0f44c07d3d9e18ac4dee34d1", [:rebar3], [], "hexpm"},
-  "p1_utils": {:hex, :p1_utils, "1.0.11", "a471f80644d4b464fa67572affddda7e95df5d4b099624b8907f5726e8a1769c", [: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"]},
+  "makeup": {:hex, :makeup, "1.0.0", "671df94cf5a594b739ce03b0d0316aa64312cee2574b6a44becb83cd90fb05dc", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
+  "makeup_elixir": {:hex, :makeup_elixir, "0.14.0", "cf8b7c66ad1cff4c14679698d532f0b5d45a3968ffbcbfd590339cb57742f1ae", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"},
+  "mqtree": {:hex, :mqtree, "1.0.7", "0d8f6101eb2bb6a6e27f0e5a60cfad04b27dd552e75f30294e565605ce7cd0d2", [:rebar3], [{:p1_utils, "1.0.18", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
+  "nimble_parsec": {:hex, :nimble_parsec, "0.5.3", "def21c10a9ed70ce22754fdeea0810dafd53c2db3219a0cd54cf5526377af1c6", [:mix], [], "hexpm"},
+  "p1_acme": {:hex, :p1_acme, "1.0.4", "2d118dbc38e7bc8eda34f4c5bf7afa6bce1345affc022bba514f42e194818820", [:rebar3], [{:idna, "~>6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:jiffy, "~>1.0.1", [hex: :jiffy, repo: "hexpm", optional: false]}, {:jose, "~>1.9.0", [hex: :jose, repo: "hexpm", optional: false]}, {:yconf, "~>1.0.3", [hex: :yconf, repo: "hexpm", optional: false]}], "hexpm"},
+  "p1_mysql": {:hex, :p1_mysql, "1.0.13", "6a17bfd7a33d035673d633572e93370bdd2fcf4077362ed13b1a8fd8176a1643", [:rebar3], [], "hexpm"},
+  "p1_oauth2": {:hex, :p1_oauth2, "0.6.6", "b17053bd7a34621f9a1a7327285a3e37abd38eb1d176afccc8cfc39882ff0a44", [:rebar3], [], "hexpm"},
+  "p1_pgsql": {:hex, :p1_pgsql, "1.1.9", "07ff9b037954dec06b4e30e33a82ac69a5a513e2860d2e59b7f6f4af23493c45", [:rebar3], [], "hexpm"},
+  "p1_utils": {:hex, :p1_utils, "1.0.18", "3fe224de5b2e190d730a3c5da9d6e8540c96484cf4b4692921d1e28f0c32b01c", [:rebar3], [], "hexpm"},
+  "pkix": {:hex, :pkix, "1.0.5", "407c02c70191d0791cd9b422ac2380df5f7f8304ec26a6d3b06e0e02be688fca", [:rebar3], [], "hexpm"},
   "sqlite3": {:hex, :sqlite3, "1.1.6", "4ea71af0b45908b5f02c9b09e4c87177039ef404f20accb35049cd8924cc417c", [:rebar3], [], "hexpm"},
-  "stringprep": {:hex, :stringprep, "1.0.11", "002e6972ab36c35f3dd88c11725014e62608c45a00399c083681879973fa8026", [:rebar3], [{:p1_utils, "1.0.11", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
-  "stun": {:hex, :stun, "1.0.21", "087fb20497081927690ef9d70b5bd6f9f4bea256ad758c500842722c0b6bb6ab", [:rebar3], [{:fast_tls, "1.0.21", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.11", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
-  "xmpp": {:hex, :xmpp, "1.1.20", "33ddcc698518061f5051b98a6f731eef9342799f0c276a9debdfffe85c32fe6d", [:rebar3], [{:fast_xml, "1.1.29", [hex: :fast_xml, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.11", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stringprep, "1.0.11", [hex: :stringprep, repo: "hexpm", optional: false]}], "hexpm"},
+  "stringprep": {:hex, :stringprep, "1.0.19", "79761de42960a625fb0cd6d31686f6118aef30540a7abb884b92f72861b6adde", [:rebar3], [{:p1_utils, "1.0.18", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
+  "stun": {:hex, :stun, "1.0.31", "577d845d4b77b155bad234598c2056f6e182f178468727de083bedf275dc83a1", [:rebar3], [{:fast_tls, "1.1.4", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.18", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm"},
+  "unicode_util_compat": {:hex, :unicode_util_compat, "0.4.1", "d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd", [:rebar3], [], "hexpm"},
+  "xmpp": {:hex, :xmpp, "1.4.5", "b226baa9ad960e8de041289b94bbcb6148a7980acc0c1ec58dfc8f24acded3ad", [:rebar3], [{:ezlib, "1.0.7", [hex: :ezlib, repo: "hexpm", optional: false]}, {:fast_tls, "1.1.4", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:fast_xml, "1.1.39", [hex: :fast_xml, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.18", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stringprep, "1.0.19", [hex: :stringprep, repo: "hexpm", optional: false]}], "hexpm"},
+  "yconf": {:hex, :yconf, "1.0.3", "7f71d0fe0e95ecb0f4004acee7b7db46c13e38c216d0bd03ef2a595a898d21a3", [:rebar3], [{:fast_yaml, "1.0.23", [hex: :fast_yaml, repo: "hexpm", optional: false]}], "hexpm"},
 }

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/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,20 +1,19 @@
-%% -*- coding: latin-1 -*-
+%% -*- coding: utf-8 -*-
+{" (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 l'assumpte: "}.
+{"A password is required to enter this room","Es necessita contrasenya per a entrar en aquesta sala"}.
 {"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"}.
+{"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"}.
+{"All Users","Tots els usuaris"}.
 {"Allow users to change the subject","Permetre que els usuaris canviin 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"}.
@@ -22,20 +21,31 @@
 {"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"}.
 {"Announcements","Anuncis"}.
-{"A password is required to enter this room","Es necessita contrasenya per a entrar en aquesta sala"}.
 {"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í"}.
 {"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"}.
-{"CAPTCHA web page","Pàgina web del CAPTCHA"}.
+{"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"}.
 {"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,26 +54,28 @@
 {"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 of room ~ts","Configuració de la sala ~ts"}.
 {"Configuration","Configuració"}.
-{"Configuration of room ~s","Configuració de la sala ~s"}.
 {"Connected Resources:","Recursos connectats:"}.
-{"Connections parameters","Paràmetres de connexió"}.
 {"Country","Pais"}.
-{"CPU Time:","Temps de CPU"}.
-{"Database","Base de dades"}.
+{"CPU Time:","Temps de CPU:"}.
+{"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"}.
 {"Description:","Descripció:"}.
 {"Disc only copy","Còpia sols en disc"}.
@@ -71,140 +83,186 @@
 {"Don't tell your password to anybody, not even the administrators of the Jabber server.","No li donis la teva contrasenya a ningú, ni tan sols als administradors del servidor Jabber."}.
 {"Dump Backup to Text File at ","Exporta còpia de seguretat a fitxer de text en "}.
 {"Dump to Text File","Exportar a fitxer de text"}.
+{"Duplicated groups are not allowed by RFC6121","No estan permesos els grups duplicats al RFC6121"}.
 {"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"}.
 {"Enable logging","Habilitar el registre de la conversa"}.
-{"Encoding for server ~b","Codificació pel servidor ~b"}.
+{"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"}.
 {"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\"}]."}.
 {"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 '~ts'","Ha fallat el processat de la opció '~ts'"}.
 {"Family Name","Cognom"}.
 {"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 Jabber User","Emplena camps per a buscar usuaris Jabber que concorden"}.
 {"Friday","Divendres"}.
+{"From ~ts","De ~ts"}.
 {"From","De"}.
-{"From ~s","De ~s"}.
 {"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"}.
+{"Given Name","Nom propi"}.
 {"Group ","Grup "}.
 {"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 error messages to the room. The participant (~ts) has sent an error message (~ts) and got kicked from the room","No està permés enviar missatges d'error a la sala. El participant (~ts) ha enviat un missatge d'error (~ts) i ha sigut expulsat de la sala"}.
 {"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"}.
+{"It is not allowed to send private messages","No està permés enviar missatges privats"}.
 {"Jabber Account Registration","Registre de compte Jabber"}.
 {"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"}.
 {"Last Activity","Última activitat"}.
 {"Last login","Últim login"}.
 {"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"}.
+{"leaves the room","surt de la sala"}.
 {"List of rooms","Llista de sales"}.
 {"Low level update script","Script d'actualització de baix nivell"}.
 {"Make participants list public","Crear una llista de participants pública"}.
 {"Make room CAPTCHA protected","Crear una sala protegida per CAPTCHA"}.
-{"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ç"}.
 {"Maximum Number of Occupants","Número màxim d'ocupants"}.
 {"May","Maig"}.
+{"Members not added (inexistent vhost): ","Membres no afegits (perque 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."}.
 {"Memory","Memòria"}.
 {"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"}.
 {"Middle Name","Segon nom"}.
 {"Moderator privileges required","Es necessita tenir privilegis de moderador"}.
 {"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","Nom"}.
+{"Name:","Nom:"}.
+{"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 ~ts does not exist in the room","El sobrenom ~ts 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ó"}.
+{"Node already exists","El node ja existeix"}.
+{"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"}.
 {"November","Novembre"}.
 {"Number of online users","Número d'usuaris connectats"}.
 {"Number of registered users","Número d'Usuaris Registrats"}.
@@ -213,9 +271,11 @@
 {"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 <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"}.
@@ -223,113 +283,125 @@
 {"Only occupants are allowed to send messages to the conference","Sols els ocupants poden enviar missatges a la sala"}.
 {"Only occupants are allowed to send queries to the conference","Sols els ocupants poden enviar sol·licituds a la sala"}.
 {"Only service administrators are allowed to send service messages","Sols els administradors del servei tenen permís per a enviar missatges de servei"}.
-{"Options","Opcions"}.
 {"Organization Name","Nom de la organizació"}.
 {"Organization Unit","Unitat de la organizació"}.
-{"Outgoing s2s Connections:","Connexions d'eixida s2s"}.
+{"Outgoing s2s Connections:","Connexions 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:"}.
 {"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"}.
 {"Pending","Pendent"}.
 {"Period: ","Període: "}.
-{"Permanent rooms","Sales permanents"}.
+{"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","Processar l'atribut 'ask' no està permès per RFC6121"}.
+{"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, "}.
 {"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"}.
+{"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?"}.
 {"Recipient is not in the conference room","El receptor no està en la sala de conferència"}.
 {"Register a Jabber account","Registrar un compte Jabber"}.
-{"Registered nicknames","Sobrenoms registrats"}.
-{"Registered Users:","Usuaris registrats:"}.
 {"Registered Users","Usuaris registrats"}.
+{"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"}.
 {"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"}.
 {"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 description","Descripció de la sala"}.
 {"Room Occupants","Nombre d'ocupants"}.
+{"Room terminates","La sala està terminant"}.
 {"Room title","Títol de la sala"}.
-{"Roster","Llista de contactes"}.
-{"Roster of ","Llista de contactes de "}.
+{"Roster of ~ts","Llista de contactes de ~ts"}.
 {"Roster size","Tamany 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"}.
 {"Saturday","Dissabte"}.
 {"Script check","Comprovar script"}.
-{"Search Results for ","Resultat de la búsqueda"}.
+{"Search Results for ","Resultats de la búsqueda "}.
 {"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:"}.
+{"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"}.
+{"SOCKS5 Bytestreams","SOCKS5 Bytestreams"}.
 {"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"}.
 {"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:"}.
+{"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","Assumpte"}.
 {"Submit","Enviar"}.
 {"Submitted","Enviat"}.
+{"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"}.
+{"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 deleted","El compte no ha sigut esborrat"}.
 {"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 feature requested is not supported by the conference","La característica sol·licitada no està suportada per la sala de conferència"}.
+{"The password contains unacceptable characters","La contrasenya conté caràcters inacceptables"}.
 {"The password is too weak","La contrasenya és massa simple"}.
+{"the password is","la contrasenya és"}.
 {"The password of your Jabber account was successfully changed.","La contrasenya del teu compte Jabber s'ha canviat correctament."}.
+{"The password was not changed","La contrasenya no ha sigut canviada"}.
+{"The passwords are different","Les contrasenyes son diferents"}.
+{"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 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 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: "}.
@@ -337,56 +409,90 @@
 {"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Aquesta pàgina permet crear un compte Jabber en aquest servidor Jabber. El teu JID (Jabber IDentifier; Identificador Jabber) tindrà aquesta forma: usuari@servidor. Si us plau, llegeix amb cura les instruccions per emplenar correctament els camps."}.
 {"This page allows to unregister a Jabber account in this Jabber server.","Aquesta pàgina permet anul·lar el registre d'un compte Jabber en aquest servidor Jabber."}.
 {"This room is not anonymous","Aquesta sala no és anònima"}.
+{"This service can not process the address: ~ts","Este servei no pot processar la direcció: ~ts"}.
 {"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 ~ts","Per a registrar-te, visita ~ts"}.
+{"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 (~ts). The address will be unblocked at ~ts UTC","Massa autenticacions (~p) han fallat des d'aquesta adreça IP (~ts). L'adreça serà desbloquejada en ~ts 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"}.
 {"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 invites you to the room ~ts","~ts et convida a la sala ~ts"}.
+{"~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"}.
+{"Unexpected action","Acció inesperada"}.
+{"Unexpected error condition: ~p","Condició d'error inesperada: ~p"}.
 {"Unregister a Jabber account","Anul·lar el registre d'un compte Jabber"}.
 {"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:"}.
+{"User already exists","El usuari ja existeix"}.
+{"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 '~ts' should be boolean","El valor de '~ts' deuria ser booleà"}.
+{"Value of '~ts' should be datetime string","El valor de '~ts' deuria ser una data"}.
+{"Value of '~ts' should be integer","El valor de '~ts' 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"}.
+{"Virtual Hosting","Hosts virtuals"}.
 {"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"}.
 {"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"}.
+{"Wrong parameters in the web formulary","Paràmetres incorrectes en el formulari web"}.
+{"Wrong xmlns","El xmlns ès incorrecte"}.
+{"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 a Jabber client.","Podràs canviar la teva contrasenya més endavant utilitzant un client Jabber."}.
 {"You have been banned from this room","Has sigut bloquejat en aquesta sala"}.
+{"You 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 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 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 subscription request and/or messages to ~ts have been blocked. To unblock your subscription request, visit ~ts","La teua petició de subscripció i/o missatges a ~ts han sigut bloquejats. Per a desbloquejar-los, visita ~ts"}.
+{"You're not allowed to create nodes","No tens permís per a crear nodes"}.

priv/msgs/cs.msg

@@ -1,20 +1,17 @@
-%% -*- coding: latin-1 -*-
+%% -*- coding: utf-8 -*-
+{" has set the subject to: "," změnil(a) téma na: "}.
+{"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 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,43 +19,45 @@
 {"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é"}.
 {"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í"}.
-{"CAPTCHA web page","Webová stránka CAPTCHA"}.
+{"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"}.
 {"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"}.
+{"Conference room does not exist","Místnost neexistuje"}.
 {"Configuration","Konfigurace"}.
-{"Configuration of room ~s","Konfigurace místnosti ~s"}.
 {"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"}.
@@ -71,9 +70,9 @@
 {"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"}.
+{"Duplicated groups are not allowed by RFC6121","Duplicitní skupiny nejsou povoleny dle RFC6121"}.
 {"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 +82,47 @@
 {"Elements","Položek"}.
 {"Email","E-mail"}.
 {"Enable logging","Zaznamenávat konverzace"}.
-{"Encoding for server ~b","Kódování pro server ~b"}.
+{"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\"}]."}.
 {"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"}.
 {"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"}.
+{"Given Name","Křestní jméno"}.
 {"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 +131,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 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"}.
+{"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 Account Registration","Registrace účtu Jabberu"}.
 {"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 +159,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,6 +168,7 @@
 {"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"}.
 {"Maximum Number of Occupants","Počet účastníků"}.
 {"May",". května"}.
@@ -182,120 +177,139 @@
 {"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"}.
 {"Moderator privileges required","Potřebujete práva moderátora"}.
 {"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"}.
+{"Multiple <item/> elements are not allowed by RFC6121","Vícenásobný element <item/> není povolen dle RFC6121"}.
 {"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 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"}.
 {"November",". listopadu"}.
 {"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 <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:"}.
 {"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í"}.
+{"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"}.
+{"Possessing 'ask' attribute is not allowed by RFC6121","Atribut 'ask' není povolen dle RFC6121"}.
 {"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é"}.
+{"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"}.
+{"Recipient is not in the conference room","Příjemce se nenachází v místnosti"}.
 {"Register a Jabber account","Zaregistrujte si účet Jabberu"}.
-{"Registered nicknames","Registrované přezdívky"}.
 {"Registered Users","Registrovaní uživatelé"}.
-{"Registered Users:","Registrovaní živatelé:"}.
+{"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"}.
 {"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 size","Velikost seznamu kontaktů"}.
+{"Roster","Seznam 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 +317,9 @@
 {"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"}.
 {"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ě"}.
@@ -322,71 +329,88 @@
 {"Submit","Odeslat"}.
 {"Submitted","Odeslané"}.
 {"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 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 is","heslo je"}.
 {"The password of your Jabber account was successfully changed.","Heslo vašeho účtu Jabberu bylo úspěšně změněno."}.
+{"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 changing the password: ","Při změně hesla došlo k chybě: "}.
-{"There was an error creating the account: ","Při vytváření účtu došlo k chybě."}.
+{"There was an error 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"}.
+{"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 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í"}.
+{"Unexpected action","Neočekávaná akce"}.
 {"Unregister a Jabber account","Zrušte registraci účtu Jabberu"}.
 {"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)","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 '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é"}.
 {"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."}.
 {"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"}.
+{"You're not allowed to create nodes","Nemáte povoleno vytvářet uzly"}.

priv/msgs/de.msg

@@ -1,12 +1,8 @@
-%% -*- coding: latin-1 -*-
+%% -*- coding: utf-8 -*-
+{" has set the subject to: "," hat das Thema geändert auf: "}.
+{"A password is required to enter this room","Sie brauchen ein Passwort um diesen Raum zu betreten"}.
 {"Accept","Akzeptieren"}.
-{"Access Configuration","Zugangskonfiguration"}.
-{"Access Control List Configuration","Konfiguration der Zugangskontrolllisten"}.
-{"Access control lists","Zugangskontroll-Listen (ACL)"}.
-{"Access Control Lists","Zugangskontroll-Listen (ACL)"}.
 {"Access denied by service policy","Zugang aufgrund der Dienstrichtlinien verweigert"}.
-{"Access rules","Zugangsregeln"}.
-{"Access Rules","Zugangsregeln"}.
 {"Action on user","Aktion auf Benutzer"}.
 {"Add Jabber ID","Jabber-ID hinzufügen"}.
 {"Add New","Neue(n) hinzufügen"}.
@@ -15,6 +11,7 @@
 {"Administration","Verwaltung"}.
 {"Administrator privileges required","Administratorenrechte benötigt"}.
 {"All activity","Alle Aktivitäten"}.
+{"All Users","Alle Benutzer"}.
 {"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"}.
@@ -22,20 +19,24 @@
 {"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"}.
 {"Announcements","Ankündigungen"}.
-{"A password is required to enter this room","Sie brauchen ein Passwort um diesen Raum zu betreten"}.
 {"April","April"}.
 {"August","August"}.
-{"Backup","Datensicherung"}.
+{"Automatic node creation is not enabled","Automatische Knoten-Erstellung ist nicht aktiviert"}.
 {"Backup Management","Datensicherungsverwaltung"}.
 {"Backup of ~p","Sicherung von ~p"}.
 {"Backup to File at ","Datensicherung in die Datei "}.
+{"Backup","Datensicherung"}.
 {"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 werden benötigt"}.
+{"Bytestream already activated","Bytestream bereits aktiviert"}.
+{"Cannot remove active list","Kann aktive Liste nicht entfernen"}.
+{"Cannot remove default list","Kann Standardliste nicht entfernen"}.
 {"Change Password","Passwort ändern"}.
 {"Change User Password","Benutzer-Passwort ä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"}.
 {"Characters not allowed:","Nicht erlaubte Zeichen:"}.
 {"Chatroom configuration modified","Chatraum-Konfiguration geändert"}.
 {"Chatroom is created","Chatraum wurde erstellt"}.
@@ -43,39 +44,37 @@
 {"Chatroom is started","Chatraum wurde gestartet"}.
 {"Chatroom is stopped","Chatraum wurde beendet"}.
 {"Chatrooms","Chaträume"}.
-{"Choose a username and password to register with this server","Wählen sie zum Registrieren einen Benutzernamen und ein Passwort"}.
-{"Choose modules to stop","Wähle zu stoppende Module"}.
+{"Choose 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 dieses Abonnement akzeptiert werden soll."}.
 {"City","Stadt"}.
 {"Commands","Befehle"}.
 {"Conference room does not exist","Konferenzraum existiert nicht"}.
 {"Configuration","Konfiguration"}.
-{"Configuration of room ~s","Konfiguration für Raum ~s"}.
 {"Connected Resources:","Verbundene Ressourcen:"}.
-{"Connections parameters","Verbindungsparameter"}.
 {"Country","Land"}.
 {"CPU Time:","CPU-Zeit:"}.
-{"Database","Datenbank"}.
+{"Database failure","Datenbankfehler"}.
 {"Database Tables at ~p","Datenbanktabellen auf ~p"}.
 {"Database Tables Configuration at ","Datenbanktabellen-Konfiguration auf "}.
+{"Database","Datenbank"}.
 {"December","Dezember"}.
 {"Default users as participants","Benutzer werden standardmäßig vollwertige Teilnehmer"}.
-{"Delete message of the day","Lösche Nachricht des Tages"}.
 {"Delete message of the day on all hosts","Lösche Nachricht des Tages auf allen Hosts"}.
+{"Delete message of the day","Lösche Nachricht des Tages"}.
 {"Delete Selected","Markierte löschen"}.
 {"Delete User","Benutzer löschen"}.
 {"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."}.
+{"Don't tell your password to anybody, not even the administrators of the Jabber server.","Geben Sie niemandem Ihr Passwort, auch nicht den Administratoren des Jabber-Servers."}.
 {"Dump Backup to Text File at ","Ausgabe der Sicherung in diese Textdatei "}.
 {"Dump to Text File","Ausgabe in Textdatei"}.
+{"Duplicated groups are not allowed by RFC6121","Doppelte Gruppen sind laut RFC6121 nicht erlaubt"}.
 {"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"}.
+{"Either approve or decline the voice request.","Anfrage für Sprachrechte entweder bestätigen oder ablehnen."}.
 {"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"}.
@@ -83,29 +82,29 @@
 {"Elements","Elemente"}.
 {"Email","E-Mail"}.
 {"Enable logging","Protokollierung aktivieren"}.
-{"Encoding for server ~b","Kodierung für Server ~b"}.
+{"Enabling push without 'node' attribute is not supported","push ohne 'node'-Attribut zu aktivieren wird nicht unterstützt"}.
 {"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"}.
+{"Enter nickname you want to register","Geben Sie den zu registrierenden Benutzernamen ein"}.
+{"Enter path to backup file","Geben Sie den Pfad zur Datensicherungsdatei 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"}.
+{"Erlang Jabber Server","Erlang Jabber-Server"}.
 {"Error","Fehler"}.
-{"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Beispiel: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
-{"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:"}.
+{"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","Fehler beim Auslesen der JID aus der Anfragenbestätigung für Sprachrechte"}.
+{"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"}.
 {"Family Name","Nachname"}.
 {"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"}.
 {"Friday","Freitag"}.
-{"From ~s","Von ~s"}.
 {"From","Von"}.
 {"Full Name","Vollständiger Name"}.
 {"Get Number of Online Users","Anzahl der angemeldeten Benutzer abrufen"}.
@@ -113,48 +112,46 @@
 {"Get User Last Login Time","letzte Anmeldezeit abrufen"}.
 {"Get User Password","Benutzer-Passwort abrufen"}.
 {"Get User Statistics","Benutzer-Statistiken abrufen"}.
+{"Given Name","Vorname"}.
 {"Group ","Gruppe "}.
 {"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 gekickt"}.
+{"has been kicked because of an affiliation change","wurde wegen Änderung des Mitgliederstatus gekickt"}.
+{"has been kicked because the room has been changed to members-only","wurde gekickt weil der Raum auf Nur-Mitglieder umgestellt wurde"}.
+{"has been kicked","wurde gekickt"}.
+{"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."}.
+{"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."}.
 {"Import Directory","Verzeichnis importieren"}.
 {"Import File","Datei importieren"}.
-{"Import user data from jabberd14 spool file:","Importiere Benutzer von jabberd14 Spool Datei:"}.
+{"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 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"}.
+{"Improper domain part of 'from' attribute","Falscher Domain-Teil 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"}.
+{"Invalid 'from' attribute in forwarded message","Ungültiges 'from'-Attribut in weitergeleiteter Nachricht"}.
+{"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 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"}.
+{"It is not allowed to send private messages","Es ist nicht erlaubt private Nachrichten zu senden"}.
+{"Jabber Account Registration","Jabber-Konto-Anmeldung"}.
+{"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"}.
+{"joins the room","betritt den Raum"}.
 {"July","Juli"}.
 {"June","Juni"}.
 {"Last Activity","Letzte Aktivität"}.
@@ -162,114 +159,134 @@
 {"Last month","Letzter Monat"}.
 {"Last year","Letztes Jahr"}.
 {"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"}.
+{"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"}.
 {"March","März"}.
 {"Maximum Number of Occupants","Maximale Anzahl von Teilnehmern"}.
 {"May","Mai"}.
-{"Membership is required to enter this room","Um diesen Raum zu betreten müssen sie Mitglied sein"}.
+{"Membership is required to enter this room","Um diesen Raum zu betreten müssen Sie Mitglied sein"}.
 {"Members:","Mitglieder:"}.
-{"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","Merken sie sich ihr Passwort, oder schreiben sie es auf einen Zettel den sie sicher verwahren. Bei Jabber gibt es keine automatische Möglichkeit, das Passwort wiederherzustellen."}.
+{"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","Merken Sie sich Ihr Passwort, oder schreiben Sie es auf einen Zettel den Sie sicher verwahren. Bei Jabber gibt es keine automatische Möglichkeit, das Passwort wiederherzustellen."}.
 {"Memory","Speicher"}.
 {"Message body","Nachrichtentext"}.
+{"Message not found in forwarded payload","Nachricht nicht in weitergeleiteten Nutzdaten gefunden"}.
 {"Middle Name","Zweiter Vorname"}.
 {"Moderator privileges required","Moderatorrechte benötigt"}.
 {"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:","Name:"}.
 {"Name","Vorname"}.
+{"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","Benutzername"}.
+{"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 data form found","Kein Datenformular gefunden"}.
 {"No Data","Keine Daten"}.
+{"No features available","Keine Eigenschaften verfügbar"}.
+{"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 Elemente 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' in Datenformular gefunden"}.
+{"No 'password' found in this query","Kein 'password' in dieser Anfrage gefunden"}.
+{"No 'path' found in data form","Kein 'path' in 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 Element gefunden"}.
+{"No 'to' attribute found in the invitation","Kein 'to'-Attribut in der Einladung gefunden"}.
+{"Node already exists","Knoten existiert bereits"}.
+{"Node index not found","Knotenindex nicht gefunden"}.
 {"Node not found","Knoten nicht gefunden"}.
 {"Node ~p","Knoten ~p"}.
+{"Nodeprep has failed","Nodeprep schlug fehl"}.
 {"Nodes","Knoten"}.
 {"None","Keine"}.
 {"Not Found","Nicht gefunden"}.
+{"Not subscribed","Nicht abonniert"}.
 {"November","November"}.
 {"Number of online users","Anzahl der angemeldeten Benutzer"}.
 {"Number of registered users","Anzahl der registrierten Benutzer"}.
 {"October","Oktober"}.
-{"Offline Messages:","Offline-Nachrichten:"}.
 {"Offline Messages","Offline-Nachrichten"}.
+{"Offline Messages:","Offline-Nachrichten:"}.
 {"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 <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 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 messages to the conference","Nur Teilnehmer dürfen Nachrichten an die Konferenz schicken"}.
 {"Only occupants are allowed to send queries to the conference","Nur Teilnehmer sind berechtigt Anfragen an die Konferenz zu senden"}.
 {"Only service administrators are allowed to send service messages","Nur Service-Administratoren sind berechtigt, Servicenachrichten zu versenden"}.
-{"Options","Optionen"}.
 {"Organization Name","Name der Organisation"}.
 {"Organization Unit","Abteilung"}.
-{"Outgoing s2s Connections:","Ausgehende s2s-Verbindungen:"}.
 {"Outgoing s2s Connections","Ausgehende s2s-Verbindungen"}.
+{"Outgoing s2s Connections:","Ausgehende s2s-Verbindungen:"}.
 {"Owner privileges required","Besitzerrechte benötigt"}.
 {"Packet","Paket"}.
-{"Password ~b","Passwort ~b"}.
-{"Password:","Passwort:"}.
-{"Password","Passwort"}.
-{"Password Verification:","Passwort bestätigen:"}.
 {"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"}.
+{"Pending","Ausstehend"}.
 {"Period: ","Zeitraum: "}.
-{"Permanent rooms","Permanente Chaträume"}.
+{"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 die SQL-Datenbank separat 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"}.
 {"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"}.
 {"private, ","privat, "}.
-{"Protocol","Protokoll"}.
 {"Publish-Subscribe","Publish-Subscribe"}.
 {"PubSub subscriber request","PubSub-Abonnenten-Anfrage"}.
 {"Queries to the conference members are not allowed in this room","Anfragen an die Teilnehmer sind in diesem Raum nicht erlaubt"}.
+{"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"}.
+{"Register a Jabber account","Jabber-Konto registrieren"}.
 {"Register","Anmelden"}.
-{"Registered nicknames","Registrierte Benutzernamen"}.
-{"Registered Users:","Registrierte Benutzer:"}.
 {"Registered Users","Registrierte Benutzer"}.
-{"Registration in mod_irc for ","Registrierung in mod_irc für "}.
+{"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"}.
 {"Resources","Ressourcen"}.
-{"Restart","Neustart"}.
 {"Restart Service","Dienst neustarten"}.
+{"Restart","Neustart"}.
 {"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:"}.
@@ -277,15 +294,13 @@
 {"Restore","Wiederherstellung"}.
 {"Room Configuration","Raum-Konfiguration"}.
 {"Room creation is denied by service policy","Anlegen des Raumes aufgrund der Dienstrichtlinien verweigert"}.
-{"Room description","Raum Beschreibung"}.
+{"Room description","Raumbeschreibung"}.
 {"Room Occupants","Teilnehmer in diesem Raum"}.
 {"Room title","Raumname"}.
-{"Roster","Kontaktliste"}.
-{"Roster of ","Kontaktliste von "}.
 {"Roster size","Kontaktlistengröße"}.
+{"Roster","Kontaktliste"}.
 {"RPC Call Error","Fehler bei RPC-Aufruf"}.
 {"Running Nodes","Aktive Knoten"}.
-{"~s access rule configuration","~s Zugangsregel-Konfiguration"}.
 {"Saturday","Samstag"}.
 {"Script check","Script-Überprüfung"}.
 {"Search Results for ","Suchergebnisse für "}.
@@ -295,24 +310,16 @@
 {"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"}.
 {"September","September"}.
-{"Server ~b","Server ~b"}.
 {"Server:","Server:"}.
 {"Set message of the day and send to online users","Setze Nachricht des Tages und sende sie an alle angemeldeten Benutzer"}.
 {"Set message of the day on all hosts and send to online users","Setze Nachricht des Tages auf allen Hosts und sende sie an alle angemeldeten Benutzer"}.
 {"Shared Roster Groups","Gruppen der gemeinsamen Kontaktliste"}.
-{"Show Integral Table","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"}.
+{"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-Clients speichern Ihr Passwort auf dem Computer. Aus Sicherheitsgründen sollten Sie das nur auf Ihrem persönlichen Computer tun."}.
 {"Statistics of ~p","Statistiken von ~p"}.
 {"Statistics","Statistiken"}.
-{"Stop Modules at ","Stoppe Module auf "}.
-{"Stop Modules","Module stoppen"}.
 {"Stopped Nodes","Angehaltene Knoten"}.
 {"Stop","Stoppen"}.
 {"Storage Type","Speichertyp"}.
@@ -322,28 +329,38 @@
 {"Submit","Senden"}.
 {"Submitted","Gesendet"}.
 {"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 already in use by another occupant","Dieser Benutzername wird bereits von einem anderen Teilnehmer genutzt"}.
 {"That nickname is registered by another person","Dieser Benutzername wurde bereits von jemand anderem registriert"}.
-{"The CAPTCHA is valid.","Die Verifizierung ist gültig."}.
-{"The CAPTCHA verification has failed","Die CAPTCHA Verifizierung schlug fehl"}.
+{"The CAPTCHA is valid.","Das CAPTCHA ist gültig."}.
+{"The CAPTCHA verification has failed","Die CAPTCHA-Verifizierung schlug fehl"}.
+{"The feature requested is not supported by the conference","Die gewünschte Eigenschaft wird von der Konferenz nicht unterstützt"}.
+{"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."}.
+{"The password of your Jabber account was successfully changed.","Das Passwort von Ihrem Jabber-Konto wurde geändert."}.
+{"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 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."}.
 {"There was an error changing the password: ","Es trat ein Fehler beim Ändern des Passworts auf: "}.
 {"There was an error creating the account: ","Es trat ein Fehler beim Erstellen des Kontos auf: "}.
 {"There was an error deleting the account: ","Es trat ein Fehler beim Löschen des Kontos auf: "}.
-{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Groß/Klein-Schreibung spielt hierbei keine Rolle: macbeth ist gleich MacBeth und Macbeth."}.
-{"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Diese Seite erlaubt das anlegen eines Jabber Kontos auf diesem Jabber Server. Ihre JID (Jabber IDentifier) setzt sich folgend zusammen: benutzername@server. Bitte lesen sie die Hinweise genau durch, um die Felder korrekt auszufüllen."}.
-{"This page allows to unregister a Jabber account in this Jabber server.","Diese Seite erlaubt es, ein Jabber Konto von diesem Server zu entfernen."}.
+{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Groß-/Kleinschreibung spielt hierbei keine Rolle: macbeth ist gleich MacBeth und Macbeth."}.
+{"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Diese Seite erlaubt das Anlegen eines Jabber-Kontos auf diesem Jabber-Server. Ihre JID (Jabber IDentifier) setzt sich folgend zusammen: benutzername@server. Bitte lesen sie die Hinweise genau durch, um die Felder korrekt auszufüllen."}.
+{"This page allows to unregister a Jabber account in this Jabber server.","Diese Seite erlaubt es, ein Jabber-Konto von diesem Server zu entfernen."}.
 {"This room is not anonymous","Dieser Raum ist nicht anonym"}.
 {"Thursday","Donnerstag"}.
 {"Time delay","Zeitverzögerung"}.
 {"Time","Zeit"}.
 {"To","An"}.
-{"Too many CAPTCHA requests","Zu viele CAPTCHA Anfragen"}.
+{"Token TTL","Token TTL"}.
+{"Too many active bytestreams","Zu viele aktive Bytestreams"}.
+{"Too many CAPTCHA requests","Zu viele CAPTCHA-Anfragen"}.
+{"Too many <item/> elements","Zu viele <item/>-Elemente"}.
+{"Too many <list/> elements","Zu viele <list/>-Elemente"}.
 {"Too many unacked stanzas","Zu viele unbestätigte Stanzas"}.
-{"To ~s","An ~s"}.
+{"Too many users in this conference","Zu viele Benutzer in dieser Konferenz"}.
 {"Total rooms","Alle Chaträume"}.
 {"Traffic rate limit is exceeded","Datenratenlimit wurde überschritten"}.
 {"Transactions Aborted:","Abgebrochene Transaktionen:"}.
@@ -352,25 +369,32 @@
 {"Transactions Restarted:","Neu gestartete Transaktionen:"}.
 {"Tuesday","Dienstag"}.
 {"Unable to generate a CAPTCHA","Konnte CAPTCHA nicht erstellen"}.
+{"Unable to register route on existing local domain","Konnte Route auf existierender lokaler Domain nicht registrieren"}.
 {"Unauthorized","Nicht berechtigt"}.
+{"Unexpected action","Unerwartete Aktion"}.
+{"Unregister a Jabber account","Jabber-Konto entfernen"}.
 {"Unregister","Abmelden"}.
-{"Unregister a Jabber account","Jabber Konto entfernen"}.
-{"Update","Aktualisieren"}.
+{"Unsupported <index/> element","Nicht unterstütztes <index/>-Element"}.
 {"Update message of the day (don't send)","Aktualisiere Nachricht des Tages (nicht senden)"}.
 {"Update message of the day on all hosts (don't send)","Aktualisiere Nachricht des Tages auf allen Hosts (nicht senden)"}.
 {"Update ~p","Aktualisierung ~p"}.
 {"Update plan","Aktualisierungsplan"}.
 {"Update script","Aktualisierungsscript"}.
+{"Update","Aktualisieren"}.
 {"Uptime:","Betriebszeit:"}.
-{"Use of STARTTLS required","Verwendung von STARTTLS erforderlich"}.
-{"User","Benutzer"}.
+{"User already exists","Benutzer existiert bereits"}.
+{"User (jid)","Benutzer (JID)"}.
 {"User Management","Benutzerverwaltung"}.
+{"User session not found","Benutzersitzung nicht gefunden"}.
+{"User session terminated","Benutzersitzung beendet"}.
+{"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 'set' of 'type' attribute is not allowed","Wert 'set' des 'type'-Attributs ist nicht erlaubt"}.
 {"vCard User Search","vCard-Benutzer-Suche"}.
 {"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"}.
@@ -378,15 +402,15 @@
 {"Voice request","Anfrage für Sprachrechte"}.
 {"Voice requests are disabled in this conference","Anfragen für Sprachrechte sind in diesem Raum deaktiviert"}.
 {"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."}.
+{"You can later change your password using a Jabber client.","Sie können das Passwort später mit einem Jabber-Client ändern."}.
 {"You have been banned from this room","Sie wurden aus diesem Raum verbannt"}.
+{"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 \"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 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 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 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're not allowed to create nodes","Es ist Ihnen nicht erlaubt Knoten zu erstellen"}.

priv/msgs/el.msg

@@ -1,19 +1,17 @@
-%% -*- coding: latin-1 -*-
-{"Access Configuration","Διαμόρφωση Πρόσβασης"}.
-{"Access Control List Configuration","Διαχείριση στις Λίστες Ελέγχου Πρόσβασης"}.
-{"Access control lists","Λίστες Ελέγχου Πρόσβασης"}.
-{"Access Control Lists","Λίστες Ελέγχου Πρόσβασης"}.
+%% -*- coding: utf-8 -*-
+{" has set the subject to: "," έχει θέσει το θέμα σε: "}.
+{"A password is required to enter this room","Απαιτείται κωδικός πρόσβασης για είσοδο σε αυτή την αίθουσα"}.
+{"Accept","Αποδοχή"}.
 {"Access denied by service policy","Άρνηση πρόσβασης, λόγω τακτικής παροχής υπηρεσιών"}.
-{"Access rules","Κανόνες Πρόσβασης"}.
-{"Access Rules","Κανόνες Πρόσβασης"}.
 {"Action on user","Eνέργεια για το χρήστη"}.
 {"Add Jabber ID","Προσθήκη Jabber Ταυτότητας"}.
 {"Add New","Προσθήκη νέου"}.
 {"Add User","Προσθήκη Χρήστη"}.
-{"Administration of ","Διαχείριση του"}.
+{"Administration of ","Διαχείριση του "}.
 {"Administration","Διαχείριση"}.
 {"Administrator privileges required","Aπαιτούνται προνόμια διαχειριστή"}.
 {"All activity","Όλες οι δραστηριότητες"}.
+{"All Users","Όλοι οι χρήστες"}.
 {"Allow users to change the subject","Επιτρέψετε στους χρήστες να αλλάζουν το θέμα"}.
 {"Allow users to query other users","Επιτρέπστε στους χρήστες να ερωτούν άλλους χρήστες"}.
 {"Allow users to send invites","Επιτρέψετε στους χρήστες να αποστέλλουν προσκλήσεις"}.
@@ -21,19 +19,24 @@
 {"Allow visitors to change nickname","Επιτρέψετε στους επισκέπτες να αλλάζου ψευδώνυμο"}.
 {"Allow visitors to send private messages to","Επιτρέψετε στους χρήστες να αποστέλλουν ιδιωτικά μηνύματα σε"}.
 {"Allow visitors to send status text in presence updates","Επιτρέψτε στους επισκέπτες να αποστέλλουν κατάσταση στις ενημερώσεις παρουσίας"}.
-{"All Users","Όλοι οι χρήστες"}.
 {"Announcements","Ανακοινώσεις"}.
-{"A password is required to enter this room","Απαιτείται κωδικός πρόσβασης για είσοδο σε αυτή την αίθουσα"}.
 {"April","Απρίλιος"}.
 {"August","Αύγουστος"}.
+{"Automatic node creation is not enabled","Η αυτόματη δημιουργία κόμβων δεν είναι ενεργοποιημένη"}.
 {"Backup Management","Διαχείριση Αντιγράφου Ασφαλείας"}.
+{"Backup of ~p","Αντιγράφο Ασφαλείας του ~p"}.
 {"Backup to File at ","Αποθήκευση Αντιγράφου Ασφαλείας σε Αρχείο στο "}.
 {"Backup","Αποθήκευση Αντιγράφου Ασφαλείας"}.
 {"Bad format","Ακατάλληλη μορφή"}.
 {"Birthday","Γενέθλια"}.
-{"CAPTCHA web page","Ιστοσελίδα CAPTCHA "}.
+{"Both the username and the resource are required","Τόσο το όνομα χρήστη όσο και ο πόρος είναι απαραίτητα"}.
+{"Bytestream already activated","Το Bytestream έχει ήδη ενεργοποιηθε"}.
+{"Cannot remove active list","Δεν είναι δυνατή η κατάργηση της ενεργής λίστας"}.
+{"Cannot remove default list","Δεν μπορείτε να καταργήσετε την προεπιλεγμένη λίστα"}.
 {"Change Password","Αλλαγή κωδικού"}.
 {"Change User Password","Αλλαγή Κωδικού Πρόσβασης Χρήστη"}.
+{"Changing password is not allowed","Η αλλαγή του κωδικού πρόσβασης δεν επιτρέπεται"}.
+{"Changing role/affiliation is not allowed","Η αλλαγή ρόλου/ομάδας δεν επιτρέπεται"}.
 {"Characters not allowed:","Χαρακτήρες δεν επιτρέπονται:"}.
 {"Chatroom configuration modified","Διαμόρφωση Αίθουσaς σύνεδριασης τροποποιηθηκε"}.
 {"Chatroom is created","Η αίθουσα σύνεδριασης  δημιουργήθηκε"}.
@@ -42,18 +45,17 @@
 {"Chatroom is stopped","Η αίθουσα σύνεδριασης έχει σταματήσει"}.
 {"Chatrooms","Αίθουσες σύνεδριασης"}.
 {"Choose a username and password to register with this server","Επιλέξτε ένα όνομα χρήστη και κωδικό πρόσβασης για να εγγραφείτε σε αυτό τον διακομιστή"}.
-{"Choose modules to stop","Επιλέξτε modules για να σταματήσουν"}.
 {"Choose storage type of tables","Επιλέξτε τύπο αποθήκευσης των πινάκων"}.
 {"Choose whether to approve this entity's subscription.","Επιλέξτε αν θα εγκρίθεί η εγγραφή αυτής της οντότητας."}.
 {"City","Πόλη"}.
 {"Commands","Εντολές"}.
 {"Conference room does not exist","Αίθουσα σύνεδριασης δεν υπάρχει"}.
-{"Configuration of room ~s","Διαμόρφωση Αίθουσας σύνεδριασης ~s"}.
 {"Configuration","Διαμόρφωση"}.
 {"Connected Resources:","Συνδεδεμένοι Πόροι:"}.
-{"Connections parameters","Παράμετροι Συνδέσης"}.
 {"Country","Χώρα"}.
 {"CPU Time:","Ώρα CPU:"}.
+{"Database failure","Αποτυχία βάσης δεδομένων"}.
+{"Database Tables at ~p","Πίνακες βάσης δεδομένων στο ~p"}.
 {"Database Tables Configuration at ","Διαμόρφωση Πίνακων βάσης δεδομένων στο "}.
 {"Database","Βάση δεδομένων"}.
 {"December","Δεκέμβριος"}.
@@ -68,10 +70,11 @@
 {"Don't tell your password to anybody, not even the administrators of the Jabber server.","Μην πείτε τον κωδικό πρόσβασής σας σε κανέναν, ακόμη και στους διαχειριστές του διακομιστή Jabber."}.
 {"Dump Backup to Text File at ","Αποθήκευση Αντιγράφου Ασφαλείας σε αρχείο κειμένου στο "}.
 {"Dump to Text File","Αποθήκευση σε αρχείο κειμένου"}.
+{"Duplicated groups are not allowed by RFC6121","Δεν επιτρέπονται διπλότυπες ομάδες από το RFC6121"}.
 {"Edit Properties","Επεξεργασία ιδιοτήτων"}.
 {"Either approve or decline the voice request.","Είτε εγκρίνετε ή απορρίψτε το αίτημα φωνής."}.
-{"ejabberd IRC module","ejabberd IRC module"}.
 {"ejabberd MUC module","ejabberd MUC module"}.
+{"ejabberd Multicast service","υπηρεσία ejabberd Multicast"}.
 {"ejabberd Publish-Subscribe module","ejabberd module Δημοσίευσης-Εγγραφής"}.
 {"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 Bytestreams module"}.
 {"ejabberd vCard module","ejabberd vCard module"}.
@@ -79,28 +82,29 @@
 {"Elements","Στοιχεία"}.
 {"Email","Email"}.
 {"Enable logging","Ενεργοποίηση καταγραφής"}.
-{"Encoding for server ~b","Κωδικοποίηση για διακομιστή ~b"}.
+{"Enabling push without 'node' attribute is not supported","Η ενεργοποίηση της ώθησης χωρίς το χαρακτηριστικό 'κόμβος' δεν υποστηρίζεται"}.
 {"End User Session","Τερματισμός Συνεδρίας Χρήστη"}.
-{"Enter list of {Module, [Options]}","Εισάγετε κατάλογο των (Module, [Επιλογές])"}.
 {"Enter nickname you want to register","Πληκτρολογήστε το ψευδώνυμο που θέλετε να εγγραφείτε"}.
 {"Enter path to backup file","Εισάγετε τοποθεσία αρχείου αντιγράφου ασφαλείας"}.
 {"Enter path to jabberd14 spool dir","Εισάγετε κατάλογο αρχείων σειράς jabberd14"}.
 {"Enter path to jabberd14 spool file","Εισάγετε τοποθεσία αρχείου σειράς jabberd14"}.
 {"Enter path to text file","Εισάγετε Τοποθεσία Αρχείου Κειμένου"}.
 {"Enter the text you see","Πληκτρολογήστε το κείμενο που βλέπετε"}.
-{"Enter username and encodings you wish to use for connecting to IRC servers.  Press 'Next' to get more fields to fill in.  Press 'Complete' to save settings.","Πληκτρολογήστε το όνομα χρήστη και κωδικοποιήσεις που θέλετε να χρησιμοποιήσετε για τη σύνδεση με διακομιστές IRC. Πατήστε 'Next' για να πάρετε περισσότερα πεδία να συμπληρώσετε. Πατήστε 'Complete' για να αποθηκεύσετε ρυθμίσεις."}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Εισάγετε το όνομα χρήστη, κωδικοποιήσεις, τις θύρες και τους κωδικούς πρόσβασης που θέλετε να χρησιμοποιήσετε για σύνδεση με IRC διακομιστή"}.
 {"Erlang Jabber Server","Erlang Jabber Διακομιστής"}.
 {"Error","Σφάλμα"}.
-{"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Παράδειγμα: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
+{"Export all tables as SQL queries to a file:","Εξαγωγή όλων των πινάκων ως ερωτημάτων SQL σε ένα αρχείο:"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Εξαγωγή δεδομένων όλων των χρηστών του διακομιστή σε PIEFXIS αρχεία (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Εξαγωγή δεδομένων των χρηστών κεντρικού υπολογιστή σε PIEFXIS αρχεία (XEP-0227):"}.
+{"External component failure","Βλάβη εξωτερικού στοιχείου"}.
+{"External component timeout","Τέλος χρονικού όριου εξωτερικού στοιχείου"}.
+{"Failed to activate bytestream","Απέτυχε η ενεργοποίηση του bytestream"}.
 {"Failed to extract JID from your voice request approval","Απέτυχε η εξαγωγή JID από την έγκριση του αιτήματος φωνής σας"}.
+{"Failed to map delegated namespace to external component","Αποτυχία ταξιθέτησης μεταγεγραμμένου χώρου ονομάτων σε εξωτερικό στοιχείο"}.
+{"Failed to parse HTTP response","Αποτυχία ανάλυσης της απόκρισης HTTP"}.
 {"Family Name","Επώνυμο"}.
 {"February","Φεβρουάριος"}.
-{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","Συμπληρώστε τη φόρμα για να αναζητήσετε οποιαδήποτε Jabber χρήστη που ταιριάζει (Προσθέστε * στο τέλος τού πεδίου για να ταιριάξει σε μεγαλύτερες γραμματοσηρές)"}.
+{"File larger than ~w bytes","Αρχείο μεγαλύτερο από ~w bytes"}.
 {"Friday","Παρασκευή"}.
-{"From ~s","Από ~s"}.
 {"From","Από"}.
 {"Full Name","Ονοματεπώνυμο"}.
 {"Get Number of Online Users","Έκθεση αριθμού συνδεδεμένων χρηστών"}.
@@ -108,17 +112,17 @@
 {"Get User Last Login Time","Έκθεση Τελευταίας Ώρας Σύνδεσης Χρήστη"}.
 {"Get User Password","Έκθεση Κωδικού Πρόσβασης Χρήστη"}.
 {"Get User Statistics","Έκθεση Στατιστικών Χρήστη"}.
+{"Given Name","Ονομα"}.
+{"Group ","Ομάδα "}.
 {"Groups","Ομάδες"}.
-{"Group ","Ομάδα"}.
 {"has been banned","έχει απαγορευθεί"}.
-{"has been kicked because of an affiliation change","Έχει αποβληθεί λόγω αλλαγής υπαγωγής"}.
 {"has been kicked because of a system shutdown","αποβλήθηκε λόγω τερματισμού συστήματος"}.
+{"has been kicked because of an affiliation change","έχει αποβληθεί λόγω αλλαγής υπαγωγής"}.
 {"has been kicked because the room has been changed to members-only","αποβλήθηκε επειδή η αίθουσα αλλάξε γιά μέλη μόνο"}.
-{"has been kicked","αποβλήθηκε "}.
-{" has set the subject to: "," έχει θέσει το θέμα σε: "}.
+{"has been kicked","αποβλήθηκε"}.
+{"Host unknown","Ο κεντρικός διακομιστής είναι άγνωστος"}.
 {"Host","Κεντρικός Υπολογιστής"}.
 {"If you don't see the CAPTCHA image here, visit the web page.","Εάν δεν βλέπετε την εικόνα CAPTCHA εδώ, επισκεφθείτε την ιστοσελίδα."}.
-{"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Εάν θέλετε να καθορίσετε διαφορετικές θύρες, κωδικούς πρόσβασης, κωδικοποιήσεις για IRC διακομιστές, εισάγετε πληροφορίες στη μορφή '{\"irc διακομιστής\", \"κωδικοποιήσεις\", θύρα, \"κωδικός πρόσβασης\"}'.  Προεπιλεγμενα αυτή η υπηρεσία χρησιμοποιεί \"~s\" κωδικοποιήση, θύρα ~p, κενό κωδικό πρόσβασης."}.
 {"Import Directory","Εισαγωγή κατάλογου αρχείων"}.
 {"Import File","Εισαγωγή αρχείων"}.
 {"Import user data from jabberd14 spool file:","Εισαγωγή δεδομένων χρήστη από το αρχείο σειράς jabberd14:"}.
@@ -127,16 +131,19 @@
 {"Import users data from jabberd14 spool directory:","Εισαγωγή δεδομένων χρηστών από κατάλογο αρχείων σειράς jabberd14:"}.
 {"Import Users from Dir at ","Εισαγωγή χρηστών από κατάλογο αρχείων στο "}.
 {"Import Users From jabberd14 Spool Files","Εισαγωγή Χρηστών από αρχεία σειράς jabberd14"}.
+{"Improper domain part of 'from' attribute","Ανάρμοστο τμήμα τομέα του χαρακτηριστικού 'from'"}.
 {"Improper message type","Ακατάλληλο είδος μηνύματος"}.
+{"Incoming s2s Connections:","Εισερχόμενες συνδέσεις s2s:"}.
+{"Incorrect CAPTCHA submit","Λάθος υποβολή CAPTCHA"}.
+{"Incorrect data form","Εσφαλμένη φόρμα δεδομένων"}.
 {"Incorrect password","Εσφαλμένος κωδικός πρόσβασης"}.
+{"Incorrect value of 'action' attribute","Λανθασμένη τιμή του χαρακτηριστικού 'action'"}.
+{"Incorrect value of 'action' in data form","Λανθασμένη τιμή 'action' στη φόρμα δεδομένων"}.
+{"Incorrect value of 'path' in data form","Λανθασμένη τιμή 'path' στη φόρμα δεδομένων"}.
+{"Insufficient privilege","Ανεπαρκές προνόμια"}.
+{"Invalid 'from' attribute in forwarded message","Μη έγκυρο χαρακτηριστικό 'από' στο προωθούμενο μήνυμα"}.
+{"Invitations are not allowed in this conference","Οι προσκλήσεις δεν επιτρέπονται σε αυτή τη διάσκεψη"}.
 {"IP addresses","Διευθύνσεις IP"}.
-{"IP","IP"}.
-{"IRC channel (don't put the first #)","IRC κανάλι (μην τεθεί το πρώτο #)"}.
-{"IRC server","Διακομιστής IRC"}.
-{"IRC settings","IRC Ρυθμίσεις"}.
-{"IRC Transport","IRC Διαβιβάσεις"}.
-{"IRC username","IRC όνομα χρήστη"}.
-{"IRC Username","IRC Όνομα χρήστη"}.
 {"is now known as","είναι τώρα γνωστή ως"}.
 {"It is not allowed to send private messages of type \"groupchat\"","Δεν επιτρέπεται να στείλει προσωπικά μηνύματα του τύπου \"groupchat\""}.
 {"It is not allowed to send private messages to the conference","Δεν επιτρέπεται να στείλει προσωπικά μηνύματα για τη διάσκεψη"}.
@@ -144,10 +151,7 @@
 {"Jabber Account Registration","Εγγραφή λογαριασμού Jabber"}.
 {"Jabber ID","Ταυτότητα Jabber"}.
 {"January","Ιανουάριος"}.
-{"Join IRC channel","Είσοδος  στο IRC κανάλι"}.
 {"joins the room","συνδέετε στην αίθουσα"}.
-{"Join the IRC channel here.","Είσοδος  στο κανάλι IRC εδώ."}.
-{"Join the IRC channel in this Jabber ID: ~s","Είσοδος στο κανάλι IRC αυτής της Jabber Ταυτότητας: ~s"}.
 {"July","Ιούλιος"}.
 {"June","Ιούνιος"}.
 {"Last Activity","Τελευταία Δραστηριότητα"}.
@@ -155,10 +159,8 @@
 {"Last month","Περασμένο μήνα"}.
 {"Last year","Πέρυσι"}.
 {"leaves the room","εγκαταλείπει την αίθουσα"}.
-{"Listened Ports at ","Παρακολουθούμενες Θύρες στο "}.
-{"Listened Ports","Παρακολουθούμενες Θύρες"}.
-{"List of modules to start","Λίστα των Module για Εκκίνηση"}.
-{"Low level update script","Προγράμα ενημέρωσης χαμηλού επίπεδου "}.
+{"List of rooms","Κατάλογος αιθουσών"}.
+{"Low level update script","Προγράμα ενημέρωσης χαμηλού επίπεδου"}.
 {"Make participants list public","Κάντε κοινό τον κατάλογο συμμετεχόντων"}.
 {"Make room CAPTCHA protected","Κάντε την αίθουσα CAPTCHA προστατεύονομενη"}.
 {"Make room members-only","Κάντε την αίθουσα μόνο για μέλη"}.
@@ -166,6 +168,7 @@
 {"Make room password protected","Κάντε την αίθουσα προστατεύομενη με κωδικό πρόσβασης"}.
 {"Make room persistent","Κάντε αίθουσα μόνιμη"}.
 {"Make room public searchable","Κάντε την δημόσια αναζήτηση δυνατή για αυτή την αίθουσα"}.
+{"Malformed username","Λανθασμένη μορφή ονόματος χρήστη"}.
 {"March","Μάρτιος"}.
 {"Maximum Number of Occupants","Μέγιστος αριθμός συμετεχόντων"}.
 {"May","Μάιος"}.
@@ -174,79 +177,108 @@
 {"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","Απομνημονεύστε τον κωδικό πρόσβασής σας, ή γράψετε τον σε ένα χαρτί που είχε τοποθετηθεί σε ασφαλές μέρος. Στο Jabber δεν υπάρχει αυτοματοποιημένος τρόπος για να ανακτήσετε τον κωδικό σας αν τον ξεχάσετε."}.
 {"Memory","Μνήμη"}.
 {"Message body","Περιεχόμενο μηνυμάτως"}.
+{"Message not found in forwarded payload","Δεν βρέθηκε μήνυμα στο προωθημένο ωφέλιμο φορτίο"}.
 {"Middle Name","Πατρώνυμο"}.
 {"Moderator privileges required","Aπαιτούνται προνόμια συντονιστή"}.
 {"Modified modules","Τροποποιημένα modules"}.
-{"Module","Module"}.
-{"Modules","Modules"}.
+{"Module failed to handle the query","Το μodule απέτυχε να χειριστεί το ερώτημα"}.
 {"Monday","Δευτέρα"}.
-{"Name:","Όνομα:"}.
+{"Multicast","Multicast"}.
+{"Multiple <item/> elements are not allowed by RFC6121","Πολλαπλά στοιχεία <item/> δεν επιτρέπονται από το RFC6121"}.
+{"Multi-User Chat","Συνομιλία με πολλούς χρήστες"}.
 {"Name","Όνομα"}.
+{"Name:","Όνομα:"}.
+{"Neither 'jid' nor 'nick' attribute found","Δεν βρέθηκε κανένα χαρακτηριστικό 'jid' ούτε 'nick'"}.
+{"Neither 'role' nor 'affiliation' attribute found","Δεν βρέθηκε ούτε χαρακτηριστικό 'role' ούτε 'affiliation'"}.
 {"Never","Ποτέ"}.
 {"New Password:","Νέος κωδικός πρόσβασης:"}.
 {"Nickname Registration at ","Εγγραφή με Ψευδώνυμο στο "}.
-{"Nickname ~s does not exist in the room","Ψευδώνυμο ~s δεν υπάρχει σε αυτή την αίθουσα"}.
 {"Nickname","Ψευδώνυμο"}.
+{"No 'affiliation' attribute found","Δεν βρέθηκε χαρακτηριστικό 'affiliation'"}.
+{"No available resource found","Δεν βρέθηκε διαθέσιμος πόρος"}.
 {"No body provided for announce message","Δεν προμηθεύτικε περιεχόμενο ανακοινώσης"}.
+{"No data form found","Δεν βρέθηκε φόρμα δεδομένων"}.
 {"No Data","Κανένα στοιχείο"}.
+{"No features available","Δεν υπάρχουν διαθέσιμες λειτουργίες"}.
+{"No hook has processed this command","Κανένα άγκιστρο δεν έχει επεξεργαστεί αυτήν την εντολή"}.
+{"No info about last activity found","Δεν βρέθηκαν πληροφορίες για την τελευταία δραστηριότητα"}.
+{"No 'item' element found","Δεν βρέθηκε στοιχείο 'item'"}.
+{"No items found in this query","Δεν βρέθηκαν στοιχεία σε αυτό το ερώτημα"}.
+{"No limit","Χωρίς όριο"}.
+{"No module is handling this query","Καμνένα module δεν χειρίζεται αυτό το ερώτημα"}.
+{"No node specified","Δεν καθορίστηκε κόμβος"}.
+{"No 'password' found in data form","Δεν υπάρχει 'password' στη φόρμα δεδομένων"}.
+{"No 'password' found in this query","Δεν βρέθηκε \"password\" σε αυτό το ερώτημα"}.
+{"No 'path' found in data form","Δεν υπάρχει 'path' στη φόρμα δεδομένων"}.
+{"No pending subscriptions found","Δεν βρέθηκαν εκκρεμείς συνδρομές"}.
+{"No privacy list with this name found","Δεν βρέθηκε κατάλογος απορρήτου με αυτό το όνομα"}.
+{"No private data found in this query","Δεν βρέθηκαν ιδιωτικά δεδομένα σε αυτό το ερώτημα"}.
+{"No running node found","Δεν βρέθηκε ενεργός κόμβος"}.
+{"No services available","Δεν υπάρχουν διαθέσιμες υπηρεσίες"}.
+{"No statistics found for this item","Δεν βρέθηκαν στατιστικά στοιχεία για αυτό το στοιχείο"}.
+{"No 'to' attribute found in the invitation","Δεν υπάρχει χαρακτηριστικό 'to' που βρέθηκε στην πρόσκληση"}.
+{"Node already exists","Ο κόμβος υπάρχει ήδη"}.
+{"Node index not found","Ο δείκτης κόμβου δεν βρέθηκε"}.
 {"Node not found","Κόμβος δεν βρέθηκε"}.
+{"Node ~p","Κόμβος ~p"}.
+{"Nodeprep has failed","Το Nodeprep απέτυχε"}.
 {"Nodes","Κόμβοι"}.
 {"None","Κανένα"}.
 {"Not Found","Δεν Βρέθηκε"}.
+{"Not subscribed","Δεν έχετε εγγραφεί"}.
 {"November","Νοέμβριος"}.
 {"Number of online users","Αριθμός συνδεδεμένων χρηστών"}.
 {"Number of registered users","Αριθμός εγγεγραμμένων χρηστών"}.
 {"October","Οκτώβριος"}.
-{"Offline Messages:","Χωρίς Σύνδεση Μηνύματα:"}.
 {"Offline Messages","Χωρίς Σύνδεση Μηνύματα"}.
+{"Offline Messages:","Χωρίς Σύνδεση Μηνύματα:"}.
 {"OK","Όλλα Καλά"}.
 {"Old Password:","Παλαιός κωδικός πρόσβασης:"}.
 {"Online Users:","Online Χρήστες:"}.
 {"Online Users","Συνδεμένοι χρήστες"}.
 {"Online","Συνδεδεμένο"}.
+{"Only <enable/> or <disable/> tags are allowed","Επιτρέπονται μόνο tags <enable /> ή <disable />"}.
+{"Only <list/> element is allowed in this query","Στο ερώτημα αυτό επιτρέπεται μόνο το στοιχείο <list />"}.
+{"Only members may query archives of this room","Μόνο μέλη μπορούν να δούνε τα αρχεία αυτής της αίθουσας"}.
 {"Only moderators and participants are allowed to change the subject in this room","Μόνο οι συντονιστές και οι συμμετέχοντες μπορούν να αλλάξουν το θέμα αυτής της αίθουσας"}.
 {"Only moderators are allowed to change the subject in this room","Μόνο οι συντονιστές μπορούν να αλλάξουν το θέμα αυτής της αίθουσας"}.
 {"Only moderators can approve voice requests","Μόνο οι συντονιστές μπορούν να εγκρίνουν τις αιτήσεις φωνής"}.
 {"Only occupants are allowed to send messages to the conference","Μόνο οι συμμετέχωντες  μπορούν να στέλνουν μηνύματα στο συνέδριο"}.
 {"Only occupants are allowed to send queries to the conference","Μόνο οι συμετεχόντες  μπορούν να στείλουν ερωτήματα στη διάσκεψη"}.
 {"Only service administrators are allowed to send service messages","Μόνο οι διαχειριστές των υπηρεσιών επιτρέπεται να στείλουν υπηρεσιακά μηνύματα"}.
-{"Options","Επιλογές"}.
 {"Organization Name","Όνομα Οργανισμού"}.
 {"Organization Unit","Μονάδα Οργανισμού"}.
-{"Outgoing s2s Connections:","Εξερχόμενες S2S Συνδέσεις:"}.
 {"Outgoing s2s Connections","Εξερχόμενες S2S Συνδέσεις"}.
+{"Outgoing s2s Connections:","Εξερχόμενες S2S Συνδέσεις:"}.
 {"Owner privileges required","Aπαιτούνται προνόμια ιδιοκτήτη"}.
 {"Packet","Πακέτο"}.
-{"Password ~b","Κωδικός πρόσβασης ~b"}.
-{"Password Verification:","Επαλήθευση κωδικού πρόσβασης:"}.
 {"Password Verification","Επαλήθευση κωδικού πρόσβασης"}.
-{"Password","Κωδικός Πρόσβασης"}.
+{"Password Verification:","Επαλήθευση κωδικού πρόσβασης:"}.
 {"Password:","Κωδικός πρόσβασης:"}.
+{"Password","Κωδικός Πρόσβασης"}.
 {"Path to Dir","Τοποθεσία κατάλογου αρχείων"}.
 {"Path to File","Τοποθεσία Αρχείου"}.
 {"Pending","Εκκρεμεί"}.
 {"Period: ","Περίοδος: "}.
+{"Ping query is incorrect","Το Ping είναι λανθασμένο"}.
 {"Ping","Πινγκ"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Παρακαλώ σημειώστε ότι οι επιλογές αυτές θα αποθήκευσουν Αντιγράφο Ασφαλείας μόνο της ενσωματωμένης βάσης δεδομένων Mnesia. Εάν χρησιμοποιείτε το module ODBC, θα πρέπει επίσης να κάνετε χωριστά Αντιγράφο Ασφαλείας της SQL βάση δεδομένων σας ."}.
 {"Please, wait for a while before sending new voice request","Παρακαλώ, περιμένετε για λίγο πριν την αποστολή νέου αιτήματος φωνής"}.
-{"Pong","Πονγκ"}.
-{"Port ~b","Θύρα ~b"}.
-{"Port","Θύρα"}.
-{"private, ","ιδιωτικό,"}.
-{"Protocol","Πρωτόκολλο"}.
+{"Pong","Pong"}.
+{"Possessing 'ask' attribute is not allowed by RFC6121","Η ιδιότητα 'ask' δεν επιτρέπεται από το RFC6121"}.
+{"private, ","ιδιωτικό, "}.
 {"Publish-Subscribe","Δημοσίευση-Εγγραφή"}.
 {"PubSub subscriber request","Αίτηση συνδρομητή Δημοσίευσης-Εγγραφής"}.
 {"Queries to the conference members are not allowed in this room","Ερωτήματα πρώς τα μέλη της διασκέψεως δεν επιτρέπονται σε αυτήν την αίθουσα"}.
+{"Query to another users is forbidden","Το ερώτημα σε άλλους χρήστες είναι απαγορευμένο"}.
 {"RAM and disc copy","Αντίγραφο μόνο σε RAM καί δίσκο"}.
 {"RAM copy","Αντίγραφο σε RAM"}.
-{"Raw","Ακατέργαστο"}.
 {"Really delete message of the day?","Πραγματικά να διαγράψετε το μήνυμα της ημέρας;"}.
 {"Recipient is not in the conference room","Παραλήπτης δεν είναι στην αίθουσα συνεδριάσεων"}.
 {"Register a Jabber account","Καταχωρήστε έναν λογαριασμό Jabber"}.
-{"Registered Users:","Εγγεγραμμένοι Χρήστες:"}.
 {"Registered Users","Εγγεγραμμένοι Χρήστες"}.
+{"Registered Users:","Εγγεγραμμένοι Χρήστες:"}.
 {"Register","Καταχωρήστε"}.
-{"Registration in mod_irc for ","Εγγραφή στο mod_irc για "}.
 {"Remote copy","Απομεμακρυσμένο αντίγραφο"}.
 {"Remove All Offline Messages","Αφαίρεση Όλων των Χωρίς Σύνδεση Μηνύματων"}.
 {"Remove User","Αφαίρεση χρήστη"}.
@@ -264,23 +296,20 @@
 {"Room creation is denied by service policy","Άρνηση δημιουργίας αίθουσας , λόγω τακτικής παροχής υπηρεσιών"}.
 {"Room description","Περιγραφή Αίθουσας"}.
 {"Room Occupants","Συμετεχόντες Αίθουσας σύνεδριασης"}.
-{"Room title","Τίτλος Αίθουσας "}.
-{"Roster of ","Καταλόγος Επαφών τού"}.
+{"Room title","Τίτλος Αίθουσας"}.
 {"Roster size","Μέγεθος Καταλόγου Επαφών"}.
 {"Roster","Καταλόγος Επαφών"}.
 {"RPC Call Error","Σφάλμα RPC Κλήσης"}.
 {"Running Nodes","Ενεργοί Κόμβοι"}.
-{"~s access rule configuration","~s διαμόρφωση κανόνα πρόσβασης"}.
 {"Saturday","Σάββατο"}.
 {"Script check","Script ελέγχου"}.
 {"Search Results for ","Αποτελέσματα αναζήτησης για "}.
-{"Search users in ","Αναζήτηση χρηστών στο"}.
+{"Search users in ","Αναζήτηση χρηστών στο "}.
 {"Send announcement to all online users on all hosts","Αποστολή ανακοίνωσης σε όλους τους συνδεδεμένους χρήστες σε όλους τους κεντρικούς υπολογιστές"}.
 {"Send announcement to all online users","Αποστολή ανακοίνωσης σε όλους τους συνδεδεμένους χρήστες"}.
 {"Send announcement to all users on all hosts","Αποστολή ανακοίνωσης σε όλους τους χρήστες σε όλους τους κεντρικούς υπολογιστές"}.
 {"Send announcement to all users","Αποστολή ανακοίνωσης σε όλους τους χρήστες"}.
 {"September","Σεπτέμβριος"}.
-{"Server ~b","Διακομιστής  ~b"}.
 {"Server:","Διακομιστής:"}.
 {"Set message of the day and send to online users","Ορίστε μήνυμα ημέρας και αποστολή στους συνδεδεμένους χρήστες"}.
 {"Set message of the day on all hosts and send to online users","Ορίστε μήνυμα ημέρας και άμεση αποστολή στους συνδεδεμένους χρήστες σε όλους τους κεντρικούς υπολογιστές"}.
@@ -288,16 +317,9 @@
 {"Show Integral Table","Δείτε Ολοκληρωτικό Πίνακα"}.
 {"Show Ordinary Table","Δείτε Κοινό Πίνακα"}.
 {"Shut Down Service","Κλείσιμο Υπηρεσίας"}.
-{"~s invites you to the room ~s","~s σας προσκαλεί στην αίθουσα ~s"}.
 {"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Μερικοί πελάτες Jabber μπορεί να αποθηκεύσουν τον κωδικό πρόσβασής σας στον υπολογιστή σας. Χρησιμοποιήστε αυτό το χαρακτηριστικό μόνο εάν εμπιστεύεστε την ασφάλεια του υπολογιστή σας."}.
-{"~s's Offline Messages Queue","Η Σειρά Χωρίς Σύνδεση Μηνύματων τού ~s"}.
-{"Start Modules at ","Εκκίνηση Modules στο "}.
-{"Start Modules","Εκκίνηση Modules"}.
-{"Start","Εκκίνηση"}.
 {"Statistics of ~p","Στατιστικές του ~p"}.
 {"Statistics","Στατιστικές"}.
-{"Stop Modules at ","Παύση Modules στο "}.
-{"Stop Modules","ΠαύσηModules"}.
 {"Stopped Nodes","Σταματημένοι Κόμβοι"}.
 {"Stop","Σταμάτημα"}.
 {"Storage Type","Τύπος Αποθήκευσης"}.
@@ -306,18 +328,24 @@
 {"Subject","Θέμα"}.
 {"Submitted","Υποβλήθηκε"}.
 {"Submit","Υποβοβολή"}.
+{"Subscriptions are not allowed","Οι συνδρομές δεν επιτρέπονται"}.
 {"Subscription","Συνδρομή"}.
 {"Sunday","Κυριακή"}.
 {"That nickname is already in use by another occupant","Αυτό το ψευδώνυμο είναι ήδη σε χρήση από άλλον συμμετέχων"}.
 {"That nickname is registered by another person","Αυτό το ψευδώνυμο είναι καταχωρημένο από άλλο πρόσωπο"}.
 {"The CAPTCHA is valid.","Το CAPTCHA είναι έγκυρο."}.
 {"The CAPTCHA verification has failed","Η επαλήθευση της εικόνας CAPTCHA απέτυχε"}.
+{"The feature requested is not supported by the conference","Η λειτουργία που ζητήθηκε δεν υποστηρίζεται από τη διάσκεψη"}.
+{"The password contains unacceptable characters","Ο κωδικός πρόσβασης περιέχει μη αποδεκτούς χαρακτήρες"}.
 {"The password is too weak","Ο κωδικός πρόσβασης είναι πολύ ασθενές"}.
 {"the password is","ο κωδικός πρόσβασης είναι"}.
 {"The password of your Jabber account was successfully changed.","Ο κωδικός  πρόσβασης του Jabber λογαριασμού σας έχει αλλάξει επιτυχώς."}.
-{"There was an error changing the password: ","Υπήρξε ένα σφάλμα κατά την αλλαγή του κωδικού πρόσβασης:"}.
-{"There was an error creating the account: ","Υπήρξε ένα σφάλμα κατά τη δημιουργία του λογαριασμού:"}.
-{"There was an error deleting the account: ","Υπήρξε ένα σφάλμα κατά τη διαγραφή του λογαριασμού:"}.
+{"The query is only allowed from local users","Το ερώτημα επιτρέπεται μόνο από τοπικούς χρήστες"}.
+{"The query must not contain <item/> elements","Το ερώτημα δεν πρέπει να περιέχει στοιχείο <item/>"}.
+{"The stanza MUST contain only one <active/> element, one <default/> element, or one <list/> element","Η stanza ΠΡΕΠΕΙ να περιέχει μόνο ένα στοιχείο <active />, ένα στοιχείο <default /> ή ένα στοιχείο <list />"}.
+{"There was an error changing the password: ","Υπήρξε ένα σφάλμα κατά την αλλαγή του κωδικού πρόσβασης: "}.
+{"There was an error creating the account: ","Υπήρξε ένα σφάλμα κατά τη δημιουργία του λογαριασμού: "}.
+{"There was an error deleting the account: ","Υπήρξε ένα σφάλμα κατά τη διαγραφή του λογαριασμού: "}.
 {"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Ανεξαρτήτως με πεζά ή κεφαλαία: 'μιαλεξη' είναι το ίδιο με 'ΜιαΛέξη' και 'Μιαλέξη'."}.
 {"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Αυτή η σελίδα σας επιτρέπει να δημιουργήσετε ένα λογαριασμό Jabber σε αυτόν το διακομιστή Jabber. JID σας (Jabber Identifier) θα είναι της μορφής: όνομα_χρήστη@διακομιστής_Jabber. Παρακαλώ διαβάστε προσεκτικά τις οδηγίες για να συμπληρώσετε σωστά τα πεδία."}.
 {"This page allows to unregister a Jabber account in this Jabber server.","Η σελίδα αυτή δίνει τη δυνατότητα να καταργήσετε την καταχώρηση ενός λογαριασμό Jabber σε αυτόν το διακομιστή Jabber."}.
@@ -325,8 +353,14 @@
 {"Thursday","Πέμπτη"}.
 {"Time delay","Χρόνος καθυστέρησης"}.
 {"Time","Χρόνος"}.
+{"Token TTL","Token TTL"}.
+{"Too many active bytestreams","Πάρα πολλά ενεργά bytestreams"}.
 {"Too many CAPTCHA requests","Πάρα πολλά αιτήματα CAPTCHA"}.
-{"To ~s","Πρώς ~s"}.
+{"Too many <item/> elements","Πάρα πολλά στοιχεία <item/>"}.
+{"Too many <list/> elements","Πάρα πολλά στοιχεία <list/>"}.
+{"Too many unacked stanzas","Πάρα πολλές μη αναγνωρισμένες stanzas"}.
+{"Too many users in this conference","Πάρα πολλοί χρήστες σε αυτή τη διάσκεψη"}.
+{"Total rooms","Συνολικές Αίθουσες σύνεδριασης"}.
 {"To","Πρώς"}.
 {"Traffic rate limit is exceeded","Υπέρφορτωση"}.
 {"Transactions Aborted:","Αποτυχημένες συναλλαγές:"}.
@@ -335,25 +369,34 @@
 {"Transactions Restarted:","Επανειλημμένες συναλλαγές:"}.
 {"Tuesday","Τρίτη"}.
 {"Unable to generate a CAPTCHA","Αδήνατο να δημιουργηθεί CAPTCHA"}.
+{"Unable to register route on existing local domain","Δεν είναι δυνατή η καταχώρηση της διαδρομής σε υπάρχοντα τοπικό τομέα"}.
 {"Unauthorized","Χορίς Εξουσιοδότηση"}.
+{"Unexpected action","Απροσδόκητη ενέργεια"}.
 {"Unregister a Jabber account","Καταργήστε την εγγραφή ενός λογαριασμού Jabber"}.
 {"Unregister","Καταργήση εγγραφής"}.
+{"Unsupported <index/> element","Μη υποστηριζόμενο στοιχείο <index />"}.
 {"Update message of the day (don't send)","Ενημέρωση μηνύματως ημέρας (χωρίς άμεση αποστολή)"}.
 {"Update message of the day on all hosts (don't send)","Ενημέρωση μηνύματως ημέρας σε όλους τους κεντρικούς υπολογιστές (χωρίς άμεση αποστολή)"}.
 {"Update plan","Σχέδιο ενημέρωσης"}.
+{"Update ~p","Ενημέρωση ~p"}.
 {"Update script","Προγράμα ενημέρωσης"}.
 {"Update","Ενημέρωση"}.
 {"Uptime:","Uptime:"}.
-{"Use of STARTTLS required","Απαιτείται χρήση STARTTLS "}.
+{"User already exists","Ο χρήστης υπάρχει ήδη"}.
+{"User (jid)","Χρήστη (jid)"}.
 {"User Management","Διαχείριση χρηστών"}.
-{"Username:","Όνομα χρήστη"}.
+{"User session not found","Η συνάντηση χρήστη δεν βρέθηκε"}.
+{"User session terminated","Η σύνδεση χρήστη τερματίστηκε"}.
+{"Username:","Όνομα χρήστη:"}.
 {"Users are not allowed to register accounts so quickly","Οι χρήστες δεν επιτρέπεται να εγγραφούν λογαριασμούς τόσο γρήγορα"}.
 {"Users Last Activity","Τελευταία Δραστηριότητα Χρήστη"}.
 {"Users","Χρήστες"}.
 {"User","Χρήστης"}.
 {"Validate","Επαληθεύστε"}.
+{"Value 'get' of 'type' attribute is not allowed","Η τιμή 'get' του 'type' δεν επιτρέπεται"}.
+{"Value 'set' of 'type' attribute is not allowed","Δεν επιτρέπεται η παράμετρος 'set' του 'type'"}.
 {"vCard User Search","vCard Αναζήτηση χρηστών"}.
-{"Virtual Hosts","εικονικοί κεντρικοί υπολογιστές"}.
+{"Virtual Hosts","Eεικονικοί κεντρικοί υπολογιστές"}.
 {"Visitors are not allowed to change their nicknames in this room","Οι επισκέπτες δεν επιτρέπεται να αλλάξουν τα ψευδώνυμα τους σε αυτή την αίθουσα"}.
 {"Visitors are not allowed to send messages to all occupants","Οι επισκέπτες δεν επιτρέπεται να στείλουν μηνύματα σε όλους τους συμμετέχωντες"}.
 {"Voice requests are disabled in this conference","Τα αιτήματα φωνής είναι απενεργοποιημένα, σε αυτό το συνέδριο"}.
@@ -361,13 +404,13 @@
 {"Wednesday","Τετάρτη"}.
 {"You can later change your password using a Jabber client.","Μπορείτε αργότερα να αλλάξετε τον κωδικό πρόσβασής σας χρησιμοποιώντας έναν πελάτη Jabber."}.
 {"You have been banned from this room","Σας έχει απαγορευθεί η είσοδος σε αυτή την αίθουσα"}.
-{"You must fill in field \"Nickname\" in the form","Θα πρέπει να συμπληρώσετε το πεδίο \"Ψευδώνυμο\" στη φόρμα"}.
+{"You have joined too many conferences","Είσθε σε πάρα πολλά συνέδρια"}.
+{"You must fill in field \"Nickname\" in the form","Θα πρέπει να συμπληρώσετε το πεδίο \"Nickname\" στη φόρμα"}.
 {"You need a client that supports x:data and CAPTCHA to register","Χρειάζεστε ένα x:data και CAPTCHA ικανό πελάτη για εγγραφή"}.
 {"You need a client that supports x:data to register the nickname","Χρειάζεστε ένα x:data ικανό πελάτη για εγγραφή με ψευδώνυμο"}.
-{"You need an x:data capable client to configure mod_irc settings","Χρειάζεστε ένα x:data ικανό πελάτη για να ρυθμίσετε το mod_irc"}.
 {"You need an x:data capable client to search","Χρειάζεστε ένα  x:data ικανό πελάτη για αναζήτηση"}.
 {"Your active privacy list has denied the routing of this stanza.","Ο ενεργός κατάλογος απορρήτου, έχει αρνηθεί τη δρομολόγηση αυτής της στροφής (stanza)."}.
 {"Your contact offline message queue is full. The message has been discarded.","Η μνήμη χωρίς σύνδεση μήνυματών είναι πλήρης. Το μήνυμα έχει απορριφθεί."}.
 {"Your Jabber account was successfully created.","Ο Jabber λογαριασμός σας δημιουργήθηκε με επιτυχία."}.
 {"Your Jabber account was successfully deleted.","Ο Jabber λογαριασμός σας διαγράφηκε με επιτυχία."}.
-{"Your messages to ~s are being blocked. To unblock them, visit ~s","Τα μηνύματά σας πρως ~s είναι αποκλεισμένα. Για αποδεσμεύση, επισκεφθείτε ~s"}.
+{"You're not allowed to create nodes","Δεν σου επιτρέπεται η δημιουργία κόμβων"}.

priv/msgs/eo.msg

@@ -1,19 +1,16 @@
-%% -*- coding: latin-1 -*-
-{"Access Configuration","Agordo de atingo"}.
-{"Access Control List Configuration","Agordo de atingokontrolo"}.
-{"Access control lists","Atingokontrol-listoj"}.
-{"Access Control Lists","Atingokontrol-listoj"}.
+%% -*- coding: utf-8 -*-
+{" has set the subject to: "," ŝanĝis la temon al: "}.
+{"A password is required to enter this room","Pasvorto estas bezonata por eniri ĉi tiun babilejon"}.
 {"Access denied by service policy","Atingo rifuzita de serv-politiko"}.
-{"Access rules","Atingo-reguloj"}.
-{"Access Rules","Atingo-reguloj"}.
 {"Action on user","Ago je uzanto"}.
 {"Add Jabber ID","Aldonu Jabber ID"}.
 {"Add New","Aldonu novan"}.
 {"Add User","Aldonu Uzanton"}.
-{"Administration","Administro"}.
 {"Administration of ","Mastrumado de "}.
+{"Administration","Administro"}.
 {"Administrator privileges required","Administrantaj rajtoj bezonata"}.
 {"All activity","Ĉiu aktiveco"}.
+{"All Users","Ĉiuj Uzantoj"}.
 {"Allow users to change the subject","Permesu uzantojn ŝanĝi la temon"}.
 {"Allow users to query other users","Permesu uzantojn informpeti aliajn uzantojn"}.
 {"Allow users to send invites","Permesu uzantojn sendi invitojn"}.
@@ -21,18 +18,15 @@
 {"Allow visitors to change nickname","Permesu al vizitantoj ŝanĝi siajn kaŝnomojn"}.
 {"Allow visitors to send private messages to","Permesu uzantojn sendi privatajn mesaĝojn al"}.
 {"Allow visitors to send status text in presence updates","Permesu al vizitantoj sendi statmesaĝon en ĉeest-sciigoj"}.
-{"All Users","Ĉiuj Uzantoj"}.
 {"Announcements","Anoncoj"}.
-{"A password is required to enter this room","Pasvorto estas bezonata por eniri ĉi tiun babilejon"}.
 {"April","Aprilo"}.
 {"August","Aŭgusto"}.
-{"Backup","Faru Sekurkopion"}.
 {"Backup Management","Mastrumado de sekurkopioj"}.
 {"Backup of ~p","Sekurkopio de ~p"}.
 {"Backup to File at ","Faru sekurkopion je "}.
+{"Backup","Faru Sekurkopion"}.
 {"Bad format","Malĝusta formo"}.
 {"Birthday","Naskiĝtago"}.
-{"CAPTCHA web page","CAPTCHA teksaĵ-paĝo"}.
 {"Change Password","Ŝanĝu pasvorton"}.
 {"Change User Password","Ŝanĝu pasvorton de uzanto"}.
 {"Characters not allowed:","Karaktroj ne permesata:"}.
@@ -43,25 +37,22 @@
 {"Chatroom is stopped","Babilejo haltita"}.
 {"Chatrooms","Babilejoj"}.
 {"Choose a username and password to register with this server","Elektu uzantnomon kaj pasvorton por registri je ĉi tiu servilo"}.
-{"Choose modules to stop","Elektu modulojn por fini"}.
 {"Choose storage type of tables","Elektu konserv-tipon de tabeloj"}.
 {"Choose whether to approve this entity's subscription.","Elektu ĉu permesi la abonon de ĉi tiu ento"}.
 {"City","Urbo"}.
 {"Commands","Ordonoj"}.
 {"Conference room does not exist","Babilejo ne ekzistas"}.
 {"Configuration","Agordo"}.
-{"Configuration of room ~s","Agordo de babilejo ~s"}.
 {"Connected Resources:","Konektataj risurcoj:"}.
-{"Connections parameters","Konekto-parametroj"}.
 {"Country","Lando"}.
 {"CPU Time:","CPU-tempo"}.
-{"Database","Datumbazo"}.
 {"Database Tables at ~p","Datumbaz-tabeloj je ~p"}.
 {"Database Tables Configuration at ","Agordo de datumbaz-tabeloj je "}.
+{"Database","Datumbazo"}.
 {"December","Decembro"}.
 {"Default users as participants","Kutime farigu uzantojn kiel partpoprenantoj"}.
-{"Delete message of the day","Forigu mesaĝo de la tago"}.
 {"Delete message of the day on all hosts","Forigu mesaĝo de la tago je ĉiu gastigo"}.
+{"Delete message of the day","Forigu mesaĝo de la tago"}.
 {"Delete Selected","Forigu elektata(j)n"}.
 {"Delete User","Forigu Uzanton"}.
 {"Description:","Priskribo:"}.
@@ -72,7 +63,6 @@
 {"Dump to Text File","Skribu en plata tekst-dosiero"}.
 {"Edit Properties","Redaktu atributojn"}.
 {"Either approve or decline the voice request.","Ĉu aprobu, aŭ malaprobu la voĉ-peton."}.
-{"ejabberd IRC module","ejabberd IRC-modulo"}.
 {"ejabberd MUC module","ejabberd MUC-modulo"}.
 {"ejabberd Multicast service","ejabberd Multicast-servo"}.
 {"ejabberd Publish-Subscribe module","ejabberd Public-Abonada modulo"}.
@@ -82,30 +72,23 @@
 {"Elements","Eroj"}.
 {"Email","Retpoŝto"}.
 {"Enable logging","Ŝaltu protokoladon"}.
-{"Encoding for server ~b","Enkodigo por servilo ~b"}.
 {"End User Session","Haltigu Uzant-seancon"}.
-{"Enter list of {Module, [Options]}","Enmetu liston de {Modulo, [Elektebloj]}"}.
 {"Enter nickname you want to register","Enmetu kaŝnomon kiun vi volas registri"}.
 {"Enter path to backup file","Enmetu vojon por sekurkopio"}.
 {"Enter path to jabberd14 spool dir","Enmetu vojon al jabberd14-uzantdosierujo"}.
 {"Enter path to jabberd14 spool file","Enmetu vojon al jabberd14-uzantdosiero"}.
 {"Enter path to text file","Enmetu vojon al plata teksto"}.
 {"Enter the text you see","Enmetu montrita teksto"}.
-{"Enter username and encodings you wish to use for connecting to IRC servers.  Press 'Next' to get more fields to fill in.  Press 'Complete' to save settings.","Enmetu uzantnomon kaj enkodigojn kiujn vi volas uzi por konektoj al IRC-serviloj. Elektu 'Sekvonto' por ekhavi pliajn kampojn. Elektu 'Kompletigu' por savi agordojn."}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Enmetu uzantnomon,j enkodigojn, pordojn kaj pasvortojn kiujn vi volas uzi por konektoj al IRC-serviloj"}.
 {"Erlang Jabber Server","Erlang-a Jabber-Servilo"}.
 {"Error","Eraro"}.
-{"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Ekzemplo: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"sekreto\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.iutestservilo.net\", \"utf-8\"}]."}.
 {"Export all tables as SQL queries to a file:","Eksportu ĉiuj tabeloj kiel SQL-informmendo al dosierujo:"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Eksportu datumojn de ĉiuj uzantoj en servilo al PIEFXIS dosieroj (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Eksportu datumoj de uzantoj en gastigo al PIEFXIS dosieroj (XEP-0227):"}.
 {"Failed to extract JID from your voice request approval","Malsukcesis ekstrakti JID-on de via voĉ-pet-aprobo"}.
 {"Family Name","Lasta Nomo"}.
 {"February","Februaro"}.
-{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","Kompletigu la formon por serĉi rekonata Jabber-uzanto (Aldonu * je la fino de la kampo por rekoni subĉenon"}.
 {"Friday","Vendredo"}.
 {"From","De"}.
-{"From ~s","De ~s"}.
 {"Full Name","Plena Nomo"}.
 {"Get Number of Online Users","Montru nombron de konektataj uzantoj"}.
 {"Get Number of Registered Users","Montru nombron de registritaj uzantoj"}.
@@ -115,14 +98,12 @@
 {"Group ","Grupo "}.
 {"Groups","Grupoj"}.
 {"has been banned","estas forbarita"}.
-{"has been kicked because of an affiliation change","estas forpelita pro aparteneca ŝanĝo"}.
 {"has been kicked because of a system shutdown","estas forpelita pro sistem-haltigo"}.
+{"has been kicked because of an affiliation change","estas forpelita pro aparteneca ŝanĝo"}.
 {"has been kicked because the room has been changed to members-only","estas forpelita ĉar la babilejo fariĝis sole por membroj"}.
 {"has been kicked","estas forpelita"}.
-{" has set the subject to: "," ŝanĝis la temon al: "}.
 {"Host","Gastigo"}.
 {"If you don't see the CAPTCHA image here, visit the web page.","Se vi ne vidas la CAPTCHA-imagon jene, vizitu la teksaĵ-paĝon."}.
-{"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Se vi volas specifi diversajn pordojn, pasvortojn, enkodigojn por IRC-serviloj, kompletigu la jenan liston kun la formo '{\"irc-servilo\", \"enkodigo\", porto, \"pasvorto\"}'. Se ne specifita, ĉi tiu servilo uzas la enkodigo \"~s\", porto ~p, malplena pasvorto."}.
 {"Import Directory","Importu dosierujo"}.
 {"Import File","Importu dosieron"}.
 {"Import user data from jabberd14 spool file:","Importu uzantojn de jabberd14-uzantdosieroj"}.
@@ -134,24 +115,14 @@
 {"Improper message type","Malĝusta mesaĝo-tipo"}.
 {"Incorrect password","Nekorekta pasvorto"}.
 {"IP addresses","IP-adresoj"}.
-{"IP","IP"}.
-{"IRC channel (don't put the first #)","IRC-babilejo (ne aldonu #-prefikson)"}.
-{"IRC server","IRC-servilo"}.
-{"IRC settings","IRC agordoj"}.
-{"IRC Transport","IRC-transportilo"}.
-{"IRC Username","IRC-kaŝnomo"}.
-{"IRC username","IRC-uzantnomo"}.
 {"is now known as","nun nomiĝas"}.
-{"It is not allowed to send private messages","Ne estas permesata sendi privatajn mesaĝojn"}.
 {"It is not allowed to send private messages of type \"groupchat\"","Malpermesas sendi mesaĝojn de tipo \"groupchat\""}.
 {"It is not allowed to send private messages to the conference","Nur partoprenantoj rajtas sendi privatajn mesaĝojn al la babilejo"}.
+{"It is not allowed to send private messages","Ne estas permesata sendi privatajn mesaĝojn"}.
 {"Jabber Account Registration","Ĵabber-konto registrado"}.
 {"Jabber ID","Jabber ID"}.
 {"January","Januaro"}.
-{"Join IRC channel","Eniras IRC-babilejon"}.
 {"joins the room","eniras la babilejo"}.
-{"Join the IRC channel here.","Eniru IRC-babilejon jen"}.
-{"Join the IRC channel in this Jabber ID: ~s","Eniru IRC-babilejon en ĉi Jabber-ID: ~s"}.
 {"July","Julio"}.
 {"June","Junio"}.
 {"Last Activity","Lasta aktiveco"}.
@@ -159,9 +130,6 @@
 {"Last month","Lasta monato"}.
 {"Last year","Lasta jaro"}.
 {"leaves the room","eliras la babilejo"}.
-{"Listened Ports at ","Atentataj pordoj je "}.
-{"Listened Ports","Atentataj pordoj"}.
-{"List of modules to start","Listo de moduloj por starti"}.
 {"List of rooms","Listo de babilejoj"}.
 {"Low level update script","Bazanivela ĝisdatigo-skripto"}.
 {"Make participants list public","Farigu partoprento-liston publika"}.
@@ -182,21 +150,18 @@
 {"Middle Name","Meza Nomo"}.
 {"Moderator privileges required","Moderantaj rajtoj bezonata"}.
 {"Modified modules","Ĝisdatigitaj moduloj"}.
-{"Module","Modulo"}.
-{"Modules at ~p","Moduloj je ~p"}.
-{"Modules","Moduloj"}.
 {"Monday","Lundo"}.
 {"Multicast","Multicast"}.
 {"Multi-User Chat","Grupbabilado"}.
-{"Name:","Nomo:"}.
 {"Name","Nomo"}.
+{"Name:","Nomo:"}.
 {"Never","Neniam"}.
 {"New Password:","Nova Pasvorto:"}.
-{"Nickname","Kaŝnomo"}.
 {"Nickname Registration at ","Kaŝnomo-registrado je "}.
-{"Nickname ~s does not exist in the room","Kaŝnomo ~s ne ekzistas en la babilejo"}.
+{"Nickname","Kaŝnomo"}.
 {"No body provided for announce message","Neniu teksto donita por anonc-mesaĝo"}.
 {"No Data","Neniu datumo"}.
+{"No limit","Neniu limigo"}.
 {"Node not found","Nodo ne trovita"}.
 {"Node ~p","Nodo ~p"}.
 {"Nodes","Nodoj"}.
@@ -206,66 +171,57 @@
 {"Number of online users","Nombro de konektataj uzantoj"}.
 {"Number of registered users","Nombro de registritaj uzantoj"}.
 {"October","Oktobro"}.
-{"Offline Messages:","Liverontaj mesaĝoj"}.
 {"Offline Messages","Liverontaj mesaĝoj"}.
+{"Offline Messages:","Liverontaj mesaĝoj"}.
 {"OK","Bone"}.
 {"Old Password:","Malnova Pasvorto:"}.
-{"Online","Konektata"}.
 {"Online Users:","Konektataj uzantoj:"}.
 {"Online Users","Konektataj Uzantoj"}.
+{"Online","Konektata"}.
 {"Only moderators and participants are allowed to change the subject in this room","Nur moderigantoj kaj partoprenantoj rajtas ŝanĝi la temon en ĉi tiu babilejo"}.
 {"Only moderators are allowed to change the subject in this room","Nur moderigantoj rajtas ŝanĝi la temon en ĉi tiu babilejo"}.
 {"Only moderators can approve voice requests","Nur moderigantoj povas aprobi voĉ-petojn"}.
 {"Only occupants are allowed to send messages to the conference","Nur partoprenantoj rajtas sendi mesaĝojn al la babilejo"}.
 {"Only occupants are allowed to send queries to the conference","Nur partoprenantoj rajtas sendi informmendojn al la babilejoj"}.
 {"Only service administrators are allowed to send service messages","Nur servo-administrantoj rajtas sendi serv-mesaĝojn"}.
-{"Options","Elektebloj"}.
 {"Organization Name","Organiz-nomo"}.
 {"Organization Unit","Organiz-parto"}.
-{"Outgoing s2s Connections:","Elirantaj s-al-s-konektoj:"}.
 {"Outgoing s2s Connections","Elirantaj s-al-s-konektoj"}.
+{"Outgoing s2s Connections:","Elirantaj s-al-s-konektoj:"}.
 {"Owner privileges required","Mastraj rajtoj bezonata"}.
 {"Packet","Pakaĵo"}.
-{"Password ~b","Pasvorto ~b"}.
-{"Password:","Pasvorto:"}.
-{"Password","Pasvorto"}.
-{"Password Verification:","Pasvortkontrolo:"}.
 {"Password Verification","Pasvortkontrolo"}.
+{"Password Verification:","Pasvortkontrolo:"}.
+{"Password","Pasvorto"}.
+{"Password:","Pasvorto:"}.
 {"Path to Dir","Vojo al dosierujo"}.
 {"Path to File","Voje de dosiero"}.
 {"Pending","Atendanta"}.
 {"Period: ","Periodo: "}.
-{"Permanent rooms","Permanentaj babilejoj"}.
 {"Ping","Sondaĵo"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Rimarku ke ĉi tiuj elektebloj nur sekurkopias la propran Mnesia-datumbazon. Se vi uzas la ODBC-modulon, vi ankaŭ devas sekurkopii tiujn SQL-datumbazoj aparte."}.
 {"Please, wait for a while before sending new voice request","Bonvolu atendi iomete antaŭ ol sendi plian voĉ-peton"}.
 {"Pong","Resondaĵo"}.
-{"Port ~b","Pordo ~b"}.
-{"Port","Pordo"}.
 {"private, ","privata, "}.
-{"Protocol","Protokolo"}.
 {"Publish-Subscribe","Public-Abonado"}.
 {"PubSub subscriber request","PubAbo abonpeto"}.
 {"Queries to the conference members are not allowed in this room","Malpermesas informmendoj al partoprenantoj en ĉi tiu babilejo"}.
 {"RAM and disc copy","RAM- kaj disk-kopio"}.
 {"RAM copy","RAM-kopio"}.
-{"Raw","Kruda"}.
 {"Really delete message of the day?","Ĉu vere forigi mesaĝon de la tago?"}.
 {"Recipient is not in the conference room","Ricevanto ne ĉeestas en la babilejo "}.
 {"Register a Jabber account","Registru Ĵabber-konton"}.
-{"Registered nicknames","Registritaj uzantnomoj"}.
-{"Registered Users:","Registritaj uzantoj:"}.
 {"Registered Users","Registritaj uzantoj"}.
+{"Registered Users:","Registritaj uzantoj:"}.
 {"Register","Registru"}.
-{"Registration in mod_irc for ","Registraĵo en mod_irc de "}.
 {"Remote copy","Fora kopio"}.
 {"Remove All Offline Messages","Forigu ĉiujn liverontajn mesaĝojn"}.
-{"Remove","Forigu"}.
 {"Remove User","Forigu uzanton"}.
+{"Remove","Forigu"}.
 {"Replaced by new connection","Anstataŭigita je nova konekto"}.
 {"Resources","Risurcoj"}.
-{"Restart","Restartu"}.
 {"Restart Service","Restartu Servon"}.
+{"Restart","Restartu"}.
 {"Restore Backup from File at ","Restaŭrigu de dosiero el "}.
 {"Restore binary backup after next ejabberd restart (requires less memory):","Restaŭrigu duuman sekurkopion post sekvonta ejabberd-restarto"}.
 {"Restore binary backup immediately:","Restaŭrigu duuman sekurkopion tuj:"}.
@@ -276,12 +232,10 @@
 {"Room description","Babilejo-priskribo"}.
 {"Room Occupants","Nombro de ĉeestantoj"}.
 {"Room title","Babilejo-nomo"}.
-{"Roster","Kontaktlisto"}.
-{"Roster of ","Kontaktlisto de "}.
 {"Roster size","Kontaktlist-grando"}.
+{"Roster","Kontaktlisto"}.
 {"RPC Call Error","Eraro de RPC-alvoko"}.
 {"Running Nodes","Funkciantaj Nodoj"}.
-{"~s access rule configuration","Agordo de atingo-reguloj de ~s"}.
 {"Saturday","Sabato"}.
 {"Script check","Skript-kontrolo"}.
 {"Search Results for ","Serĉ-rezultoj de "}.
@@ -291,7 +245,6 @@
 {"Send announcement to all users on all hosts","Sendu anoncon al ĉiu uzanto de ĉiu gastigo"}.
 {"Send announcement to all users","Sendu anoncon al ĉiu uzanto"}.
 {"September","Septembro"}.
-{"Server ~b","Servilo ~b"}.
 {"Server:","Servilo:"}.
 {"Set message of the day and send to online users","Enmetu mesaĝon de la tago kaj sendu al konektataj uzantoj"}.
 {"Set message of the day on all hosts and send to online users","Enmetu mesaĝon de la tago je ĉiu gastigo kaj sendu al konektataj uzantoj"}.
@@ -299,17 +252,10 @@
 {"Show Integral Table","Montru integran tabelon"}.
 {"Show Ordinary Table","Montru ordinaran tabelon"}.
 {"Shut Down Service","Haltigu Servon"}.
-{"~s invites you to the room ~s","~s invitas vin al la babilejo ~s"}.
 {"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Kelkaj Ĵabber-klientoj povas memori vian pasvorton je via komputilo. Nur uzu tiun eblon se vi fidas ke via komputilo estas sekura."}.
-{"~s's Offline Messages Queue","Mesaĝo-atendovico de ~s"}.
-{"Start Modules at ","Startu modulojn je "}.
-{"Start Modules","Startu Modulojn"}.
-{"Start","Startu"}.
 {"Statistics of ~p","Statistikoj de ~p"}.
 {"Statistics","Statistikoj"}.
 {"Stop","Haltigu"}.
-{"Stop Modules at ","Haltigu modulojn je "}.
-{"Stop Modules","Haltigu Modulojn"}.
 {"Stopped Nodes","Neaktivaj Nodoj"}.
 {"Storage Type","Konserv-tipo"}.
 {"Store binary backup:","Konservu duuman sekurkopion:"}.
@@ -323,8 +269,8 @@
 {"That nickname is registered by another person","Kaŝnomo estas registrita de alia persono"}.
 {"The CAPTCHA is valid.","La CAPTCHA ĝustas"}.
 {"The CAPTCHA verification has failed","La CAPTCHA-kontrolado malsukcesis"}.
-{"the password is","la pasvorto estas"}.
 {"The password is too weak","La pasvorto estas ne sufiĉe forta"}.
+{"the password is","la pasvorto estas"}.
 {"The password of your Jabber account was successfully changed.","La pasvorto de via Ĵabber-konto estas sukcese ŝanĝata."}.
 {"There was an error changing the password: ","Estis eraro dum ŝanĝi de la pasvortro:"}.
 {"There was an error creating the account: ","Estis eraro dum kreado de la konto:"}.
@@ -339,7 +285,6 @@
 {"To","Ĝis"}.
 {"Too many CAPTCHA requests","Tro multaj CAPTCHA-petoj"}.
 {"Too many unacked stanzas","Tro da neagnoskitaj stancoj"}.
-{"To ~s","Al ~s"}.
 {"Total rooms","Babilejoj"}.
 {"Traffic rate limit is exceeded","Trafikrapida limigo superita"}.
 {"Transactions Aborted:","Transakcioj nuligitaj"}.
@@ -351,20 +296,18 @@
 {"Unauthorized","Nepermesita"}.
 {"Unregister a Jabber account","Malregistru Ĵabber-konton"}.
 {"Unregister","Malregistru"}.
-{"Update","Ĝisdatigu"}.
 {"Update message of the day (don't send)","Ŝanĝu mesaĝon de la tago (ne sendu)"}.
 {"Update message of the day on all hosts (don't send)","Ŝanĝu mesaĝon de la tago je ĉiu gastigo (ne sendu)"}.
 {"Update ~p","Ĝisdatigu ~p-n"}.
 {"Update plan","Ĝisdatigo-plano"}.
 {"Update script","Ĝisdatigo-skripto"}.
+{"Update","Ĝisdatigu"}.
 {"Uptime:","Daŭro de funkciado"}.
-{"Use of STARTTLS required","Uzo de STARTTLS bezonata"}.
 {"User Management","Uzanto-administrado"}.
 {"Username:","Uzantnomo"}.
 {"Users are not allowed to register accounts so quickly","Ne estas permesata al uzantoj registri tiel rapide"}.
 {"Users Last Activity","Lasta aktiveco de uzanto"}.
 {"Users","Uzantoj"}.
-{"User ~s","Uzanto ~s"}.
 {"User","Uzanto"}.
 {"Validate","Validigu"}.
 {"vCard User Search","Serĉado de vizitkartoj"}.
@@ -379,10 +322,8 @@
 {"You must fill in field \"Nickname\" in the form","Vi devas kompletigi la \"Kaŝnomo\" kampon"}.
 {"You need a client that supports x:data and CAPTCHA to register","Vi bezonas klienton subtenante x:data-funkcio kaj CAPTCHA por registri kaŝnomon"}.
 {"You need a client that supports x:data to register the nickname","Vi bezonas klienton subtenante x:data-funkcio por registri kaŝnomon"}.
-{"You need an x:data capable client to configure mod_irc settings","Vi bezonas klienton kun x:data-funkcio por agordi mod_irc"}.
 {"You need an x:data capable client to search","Vi bezonas klienton kun x:data-funkcio por serĉado"}.
 {"Your active privacy list has denied the routing of this stanza.","Via aktiva privatec-listo malpermesas enkursigi ĉi-tiun pakaĵon"}.
 {"Your contact offline message queue is full. The message has been discarded.","Mesaĝo-atendovico de la senkonekta kontakto estas plena. La mesaĝo estas forĵetita"}.
 {"Your Jabber account was successfully created.","Via Ĵabber-konto estis sukcese kreata."}.
 {"Your Jabber account was successfully deleted.","Via Ĵabber-konto estas sukcese forigita."}.
-{"Your messages to ~s are being blocked. To unblock them, visit ~s","Viaj mesaĝoj al ~s estas blokata. Por malbloki ilin, iru al ~s"}.

priv/msgs/es.msg

@@ -1,20 +1,19 @@
-%% -*- coding: latin-1 -*-
+%% -*- coding: utf-8 -*-
+{" (Add * to the end of field to match substring)","(Añade * al final del campo para buscar subcadenas)"}.
+{" has set the subject to: "," ha puesto el asunto: "}.
+{"A password is required to enter this room"," (Añade * al final del campo para buscar subcadenas)"}.
 {"Accept","Aceptar"}.
-{"Access Configuration","Configuración de accesos"}.
-{"Access Control List Configuration","Configuración de la Lista de Control de Acceso"}.
-{"Access control lists","Listas de Control de Acceso"}.
-{"Access Control Lists","Listas de Control de Acceso"}.
 {"Access denied by service policy","Acceso denegado por la política del servicio"}.
-{"Access rules","Reglas de acceso"}.
-{"Access Rules","Reglas de Acceso"}.
+{"Account doesn't exist","La cuenta no existe"}.
 {"Action on user","Acción en el usuario"}.
 {"Add Jabber ID","Añadir Jabber ID"}.
 {"Add New","Añadir nuevo"}.
 {"Add User","Añadir usuario"}.
-{"Administration","Administración"}.
 {"Administration of ","Administración de "}.
+{"Administration","Administración"}.
 {"Administrator privileges required","Se necesita privilegios de administrador"}.
 {"All activity","Toda la actividad"}.
+{"All Users","Todos los usuarios"}.
 {"Allow users to change the subject","Permitir a los usuarios cambiar el asunto"}.
 {"Allow users to query other users","Permitir a los usuarios consultar a otros usuarios"}.
 {"Allow users to send invites","Permitir a los usuarios enviar invitaciones"}.
@@ -22,20 +21,31 @@
 {"Allow visitors to change nickname","Permitir a los visitantes cambiarse el apodo"}.
 {"Allow visitors to send private messages to","Permitir a los visitantes enviar mensajes privados a"}.
 {"Allow visitors to send status text in presence updates","Permitir a los visitantes enviar texto de estado en las actualizaciones de presencia"}.
-{"All Users","Todos los usuarios"}.
 {"Announcements","Anuncios"}.
-{"A password is required to enter this room","Se necesita contraseña para entrar en esta sala"}.
 {"April","abril"}.
+{"Attribute 'channel' is required for this request","El atributo 'channel' es necesario para esta petición"}.
+{"Attribute 'id' is mandatory for MIX messages","El atributo 'id' es necesario para mensajes MIX"}.
+{"Attribute 'jid' is not allowed here","El atributo 'jid' no está permitido aqui"}.
+{"Attribute 'node' is not allowed here","El atributo 'node' no está permitido aqui"}.
 {"August","agosto"}.
-{"Backup","Guardar copia de seguridad"}.
+{"Automatic node creation is not enabled","La creación automática de nodo no está activada"}.
 {"Backup Management","Gestión de copia de seguridad"}.
 {"Backup of ~p","Copia de seguridad de ~p"}.
 {"Backup to File at ","Guardar copia de seguridad en fichero en "}.
+{"Backup","Guardar copia de seguridad"}.
 {"Bad format","Mal formato"}.
 {"Birthday","Cumpleaños"}.
-{"CAPTCHA web page","Página web de CAPTCHA"}.
+{"Both the username and the resource are required","Se requiere tanto el nombre de usuario como el recurso"}.
+{"Bytestream already activated","Bytestream ya está activado"}.
+{"Cannot remove active list","No se puede borrar la lista activa"}.
+{"Cannot remove default list","No se puede borrar la lista por defecto"}.
 {"Change Password","Cambiar contraseña"}.
 {"Change User Password","Cambiar contraseña de usuario"}.
+{"Changing password is not allowed","No está permitido cambiar la contraseña"}.
+{"Changing role/affiliation is not allowed","No está permitido cambiar el rol/afiliación"}.
+{"Channel already exists","El canal ya existe"}.
+{"Channel does not exist","El canal no existe"}.
+{"Channels","Canales"}.
 {"Characters not allowed:","Caracteres no permitidos:"}.
 {"Chatroom configuration modified","Configuración de la sala modificada"}.
 {"Chatroom is created","Se ha creado la sala"}.
@@ -44,26 +54,28 @@
 {"Chatroom is stopped","Se ha detenido la sala"}.
 {"Chatrooms","Salas de charla"}.
 {"Choose a username and password to register with this server","Escoge un nombre de usuario y contraseña para registrarte en este servidor"}.
-{"Choose modules to stop","Selecciona módulos a detener"}.
 {"Choose storage type of tables","Selecciona tipo de almacenamiento de las tablas"}.
 {"Choose whether to approve this entity's subscription.","Decidir si aprobar la subscripción de esta entidad."}.
 {"City","Ciudad"}.
+{"Client acknowledged more stanzas than sent by server","El cliente ha reconocido más paquetes de los que el servidor ha enviado"}.
 {"Commands","Comandos"}.
 {"Conference room does not exist","La sala de conferencias no existe"}.
+{"Configuration of room ~ts","Configuración para la sala ~ts"}.
 {"Configuration","Configuración"}.
-{"Configuration of room ~s","Configuración para la sala ~s"}.
 {"Connected Resources:","Recursos conectados:"}.
-{"Connections parameters","Parámetros de conexiones"}.
 {"Country","País"}.
 {"CPU Time:","Tiempo consumido de CPU:"}.
-{"Database","Base de datos"}.
+{"Database failure","Error en la base de datos"}.
 {"Database Tables at ~p","Tablas de la base de datos en ~p"}.
 {"Database Tables Configuration at ","Configuración de tablas de la base de datos en "}.
+{"Database","Base de datos"}.
 {"December","diciembre"}.
 {"Default users as participants","Los usuarios son participantes por defecto"}.
-{"Delete message of the day","Borrar mensaje del dia"}.
+{"Delete content","Borrar contenido"}.
 {"Delete message of the day on all hosts","Borrar el mensaje del día en todos los dominios"}.
-{"Delete Selected","Eliminar los seleccionados"}.
+{"Delete message of the day","Borrar mensaje del dia"}.
+{"Delete Selected","Borrar los seleccionados"}.
+{"Delete table","Borrar tabla"}.
 {"Delete User","Borrar usuario"}.
 {"Description:","Descripción:"}.
 {"Disc only copy","Copia en disco solamente"}.
@@ -71,59 +83,67 @@
 {"Don't tell your password to anybody, not even the administrators of the Jabber server.","No le digas tu contraseña a nadie, ni siquiera a los administradores del servidor Jabber."}.
 {"Dump Backup to Text File at ","Exporta copia de seguridad a fichero de texto en "}.
 {"Dump to Text File","Exportar a fichero de texto"}.
+{"Duplicated groups are not allowed by RFC6121","Los grupos duplicados no están permitidos por RFC6121"}.
 {"Edit Properties","Editar propiedades"}.
 {"Either approve or decline the voice request.","Aprueba o rechaza la petición de voz."}.
-{"ejabberd IRC module","Módulo de IRC para ejabberd"}.
+{"ejabberd HTTP Upload service","Servicio HTTP Upload de ejabberd"}.
 {"ejabberd MUC module","Módulo de MUC para ejabberd"}.
 {"ejabberd Multicast service","Servicio Multicast de ejabberd"}.
 {"ejabberd Publish-Subscribe module","Módulo de Publicar-Subscribir de ejabberd"}.
 {"ejabberd SOCKS5 Bytestreams module","Módulo SOCKS5 Bytestreams para ejabberd"}.
 {"ejabberd vCard module","Módulo vCard para ejabberd"}.
 {"ejabberd Web Admin","ejabberd Web Admin"}.
+{"ejabberd","ejabberd"}.
 {"Elements","Elementos"}.
 {"Email","correo"}.
 {"Enable logging","Guardar históricos"}.
-{"Encoding for server ~b","Codificación del servidor ~b"}.
+{"Enabling push without 'node' attribute is not supported","No está soportado activar Push sin el atributo 'node'"}.
 {"End User Session","Cerrar sesión de usuario"}.
-{"Enter list of {Module, [Options]}","Introduce lista de {módulo, [opciones]}"}.
 {"Enter nickname you want to register","Introduce el apodo que quieras registrar"}.
 {"Enter path to backup file","Introduce ruta al fichero de copia de seguridad"}.
 {"Enter path to jabberd14 spool dir","Introduce la ruta al directorio de jabberd14 spools"}.
 {"Enter path to jabberd14 spool file","Introduce ruta al fichero jabberd14 spool"}.
 {"Enter path to text file","Introduce ruta al fichero de texto"}.
 {"Enter the text you see","Teclea el texto que ves"}.
-{"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.","Introduce el nombre de usuario y codificaciones de carácteres que quieras usar al conectar en los servidores de IRC. Pulsa Siguiente para conseguir más campos en el formulario. Pulsa Completar para guardar las opciones."}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Introduce el nombre de usuario, codificaciones de carácteres, puertos y contraseñas que quieras usar al conectar en los servidores de IRC"}.
 {"Erlang Jabber Server","Servidor Jabber en Erlang"}.
 {"Error","Error"}.
-{"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Ejemplo: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
 {"Export all tables as SQL queries to a file:","Exportar todas las tablas a un fichero SQL:"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Exportar datos de todos los usuarios del servidor a ficheros PIEFXIS (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Exportar datos de los usuarios de un dominio a ficheros PIEFXIS (XEP-0227):"}.
+{"External component failure","Fallo en el componente externo"}.
+{"External component timeout","Demasiado retraso (timeout) en el componente externo"}.
+{"Failed to activate bytestream","Falló la activación de bytestream"}.
 {"Failed to extract JID from your voice request approval","Fallo al extraer el Jabber ID de tu aprobación de petición de voz"}.
+{"Failed to map delegated namespace to external component","Falló el mapeo de espacio de nombres delegado al componente externo"}.
+{"Failed to parse HTTP response","Falló la comprensión de la respuesta HTTP"}.
+{"Failed to process option '~ts'","Falló el procesado de la opción '~ts'"}.
 {"Family Name","Apellido"}.
 {"February","febrero"}.
-{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","Rellena el formulario para buscar usuarios Jabber. Añade * al final de un campo para buscar subcadenas."}.
+{"File larger than ~w bytes","El fichero es más grande que ~w bytes"}.
+{"Fill in the form to search for any matching Jabber User","Rellena campos para buscar usuarios Jabber que concuerden"}.
 {"Friday","viernes"}.
+{"From ~ts","De ~ts"}.
 {"From","De"}.
-{"From ~s","De ~s"}.
 {"Full Name","Nombre completo"}.
 {"Get Number of Online Users","Ver número de usuarios conectados"}.
 {"Get Number of Registered Users","Ver número de usuarios registrados"}.
+{"Get Pending","Obtener pendientes"}.
 {"Get User Last Login Time","Ver fecha de la última conexión de usuario"}.
 {"Get User Password","Ver contraseña de usuario"}.
 {"Get User Statistics","Ver estadísticas de usuario"}.
+{"Given Name","Nombre"}.
 {"Group ","Grupo "}.
 {"Groups","Grupos"}.
 {"has been banned","ha sido bloqueado"}.
-{"has been kicked because of an affiliation change","ha sido expulsado por un cambio de su afiliación"}.
 {"has been kicked because of a system shutdown","ha sido expulsado porque el sistema se va a detener"}.
+{"has been kicked because of an affiliation change","ha sido expulsado por un cambio de su afiliación"}.
 {"has been kicked because the room has been changed to members-only","ha sido expulsado porque la sala es ahora solo para miembros"}.
 {"has been kicked","ha sido expulsado"}.
-{" has set the subject to: "," ha puesto el asunto: "}.
+{"Host unknown","Dominio desconocido"}.
 {"Host","Dominio"}.
+{"HTTP File Upload","Subir fichero por HTTP"}.
+{"Idle connection","Conexión sin uso"}.
 {"If you don't see the CAPTCHA image here, visit the web page.","Si no ves la imagen CAPTCHA aquí, visita la página web."}.
-{"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Si quieres especificar distintos codificaciones de carácteres, contraseñas o puertos para cada servidor IRC rellena esta lista con valores en el formato '{\"servidor irc\", \"codificación\", \"puerto\", \"contrasela\"}'.  Este servicio usa por defecto la codificación \"~s\", puerto ~p, sin contraseña."}.
 {"Import Directory","Importar directorio"}.
 {"Import File","Importar fichero"}.
 {"Import user data from jabberd14 spool file:","Importar usuario de fichero spool de jabberd14:"}.
@@ -132,29 +152,33 @@
 {"Import users data from jabberd14 spool directory:","Importar usuarios del directorio spool de jabberd14:"}.
 {"Import Users from Dir at ","Importar usuarios desde el directorio en "}.
 {"Import Users From jabberd14 Spool Files","Importar usuarios de ficheros spool de jabberd-1.4"}.
+{"Improper domain part of 'from' attribute","Parte de dominio impropia en el atributo 'from'"}.
 {"Improper message type","Tipo de mensaje incorrecto"}.
 {"Incoming s2s Connections:","Conexiones S2S entrantes:"}.
+{"Incorrect CAPTCHA submit","El CAPTCHA proporcionado es incorrecto"}.
+{"Incorrect data form","Formulario de datos incorrecto"}.
 {"Incorrect password","Contraseña incorrecta"}.
+{"Incorrect value of 'action' attribute","Valor incorrecto del atributo 'action'"}.
+{"Incorrect value of 'action' in data form","Valor incorrecto de 'action' en el formulario de datos"}.
+{"Incorrect value of 'path' in data form","Valor incorrecto de 'path' en el formulario de datos"}.
+{"Insufficient privilege","Privilegio insuficiente"}.
+{"Internal server error","Error interno en el servidor"}.
+{"Invalid 'from' attribute in forwarded message","Atributo 'from' no válido en el mensaje reenviado"}.
+{"Invalid node name","Nombre de nodo no válido"}.
+{"Invalid 'previd' value","Valor de 'previd' no válido"}.
+{"Invitations are not allowed in this conference","Las invitaciones no están permitidas en esta sala"}.
 {"IP addresses","Direcciones IP"}.
-{"IP","IP"}.
-{"IRC channel (don't put the first #)","Canal IRC (no pongas el # del principio)"}.
-{"IRC server","Servidor IRC"}.
-{"IRC settings","Opciones de IRC"}.
-{"IRC Transport","Transporte de IRC"}.
-{"IRC username","Nombre de usuario en IRC"}.
-{"IRC Username","Nombre de usuario en IRC"}.
 {"is now known as","se cambia el nombre a"}.
-{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","No está permitido enviar mensajes de error a la sala. Este participante (~s) ha enviado un mensaje de error (~s) y fue expulsado de la sala"}.
-{"It is not allowed to send private messages","No está permitido enviar mensajes privados"}.
+{"It is not allowed to send error messages to the room. The participant (~ts) has sent an error message (~ts) and got kicked from the room","No está permitido enviar mensajes de error a la sala. Este participante (~ts) ha enviado un mensaje de error (~ts) y fue expulsado de la sala"}.
 {"It is not allowed to send private messages of type \"groupchat\"","No está permitido enviar mensajes privados del tipo \"groupchat\""}.
 {"It is not allowed to send private messages to the conference","Impedir el envio de mensajes privados a la sala"}.
+{"It is not allowed to send private messages","No está permitido enviar mensajes privados"}.
 {"Jabber Account Registration","Registro de Cuenta Jabber"}.
 {"Jabber ID","Jabber ID"}.
 {"January","enero"}.
-{"Join IRC channel","Entrar en canal IRC"}.
+{"JID normalization denied by service policy","Se ha denegado la normalización del JID por política del servicio"}.
+{"JID normalization failed","Ha fallado la normalización del JID"}.
 {"joins the room","entra en la sala"}.
-{"Join the IRC channel here.","Entrar en el canal de IRC aquí"}.
-{"Join the IRC channel in this Jabber ID: ~s","Entra en el canal de IRC en esta dirección Jabber: ~s"}.
 {"July","julio"}.
 {"June","junio"}.
 {"Last Activity","Última actividad"}.
@@ -162,9 +186,6 @@
 {"Last month","Último mes"}.
 {"Last year","Último año"}.
 {"leaves the room","sale de la sala"}.
-{"Listened Ports at ","Puertos de escucha en "}.
-{"Listened Ports","Puertos de escucha"}.
-{"List of modules to start","Lista de módulos a iniciar"}.
 {"List of rooms","Lista de salas"}.
 {"Low level update script","Script de actualización a bajo nivel"}.
 {"Make participants list public","La lista de participantes es pública"}.
@@ -174,48 +195,87 @@
 {"Make room password protected","Proteger la sala con contraseña"}.
 {"Make room persistent","Sala permanente"}.
 {"Make room public searchable","Sala públicamente visible"}.
+{"Malformed username","Nombre de usuario mal formado"}.
+{"MAM preference modification denied by service policy","Se ha denegado modificar la preferencia MAM por política del servicio"}.
 {"March","marzo"}.
 {"Maximum Number of Occupants","Número máximo de ocupantes"}.
 {"May","mayo"}.
+{"Members not added (inexistent vhost): ","Miembros no añadidos (el vhost no existe): "}.
 {"Membership is required to enter this room","Necesitas ser miembro de esta sala para poder entrar"}.
 {"Members:","Miembros:"}.
 {"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","Memoriza tu contraseña, o apúntala en un papel en un lugar seguro. En Jabber no hay un método automatizado para recuperar la contraseña si la olvidas."}.
 {"Memory","Memoria"}.
 {"Message body","Cuerpo del mensaje"}.
+{"Message not found in forwarded payload","Mensaje no encontrado en el contenido reenviado"}.
+{"Messages from strangers are rejected","Los mensajes de extraños son rechazados"}.
 {"Middle Name","Segundo nombre"}.
 {"Moderator privileges required","Se necesita privilegios de moderador"}.
 {"Modified modules","Módulos modificados"}.
-{"Module","Módulo"}.
-{"Modules at ~p","Módulos en ~p"}.
-{"Modules","Módulos"}.
+{"Module failed to handle the query","El módulo falló al gestionar la petición"}.
 {"Monday","lunes"}.
 {"Multicast","Multicast"}.
+{"Multiple <item/> elements are not allowed by RFC6121","No se permiten múltiples elementos <item/> en RFC6121"}.
 {"Multi-User Chat","Salas de Charla"}.
-{"Name:","Nombre:"}.
 {"Name","Nombre"}.
+{"Name:","Nombre:"}.
+{"Neither 'jid' nor 'nick' attribute found","No se encontraron los atributos 'jid' ni 'nick'"}.
+{"Neither 'role' nor 'affiliation' attribute found","No se encontraron los atributos 'role' ni 'affiliation'"}.
 {"Never","Nunca"}.
 {"New Password:","Nueva contraseña:"}.
-{"Nickname","Apodo"}.
+{"Nickname can't be empty","El apodo no puede estar vacío"}.
 {"Nickname Registration at ","Registro del apodo en "}.
-{"Nickname ~s does not exist in the room","El apodo ~s no existe en la sala"}.
+{"Nickname ~ts does not exist in the room","El apodo ~ts no existe en la sala"}.
+{"Nickname","Apodo"}.
+{"No address elements found","No se encontraron elementos de dirección ('address')"}.
+{"No addresses element found","No se encontró elemento de direcciones ('addresses')"}.
+{"No 'affiliation' attribute found","No se encontró el atributo 'affiliation'"}.
+{"No available resource found","No se encontró un recurso conectado"}.
 {"No body provided for announce message","No se ha proporcionado cuerpo de mensaje para el anuncio"}.
+{"No child elements found","No se encontraron subelementos"}.
+{"No data form found","No se encontró formulario de datos"}.
 {"No Data","Sin datos"}.
+{"No features available","No hay características disponibles"}.
+{"No <forwarded/> element found","No se ha encontrado elemento <forwarded/>"}.
+{"No hook has processed this command","Ningún evento ha procesado este comando"}.
+{"No info about last activity found","No hay información respeto a la última actividad"}.
+{"No 'item' element found","No se encontró el elemento 'item'"}.
+{"No items found in this query","No se han encontrado elementos en esta petición"}.
+{"No limit","Sin límite"}.
+{"No module is handling this query","Ningún modulo está gestionando esta petición"}.
+{"No node specified","No se ha especificado ningún nodo"}.
+{"No 'password' found in data form","No se encontró 'password' en el formulario de datos"}.
+{"No 'password' found in this query","No se encontró 'password' en esta petición"}.
+{"No 'path' found in data form","No se encontró 'path' en este formulario de datos"}.
+{"No pending subscriptions found","No se han encontrado suscripciones pendientes"}.
+{"No privacy list with this name found","No se ha encontrado una lista de privacidad con este nombre"}.
+{"No private data found in this query","No se ha encontrado ningún elemento de dato privado en esta petición"}.
+{"No running node found","No se ha encontrado ningún nodo activo"}.
+{"No services available","No hay servicios disponibles"}.
+{"No statistics found for this item","No se han encontrado estadísticas para este elemento"}.
+{"No 'to' attribute found in the invitation","No se encontró el atributo 'to' en la invitación"}.
+{"Node already exists","El nodo ya existe"}.
+{"Node index not found","No se ha encontrado índice de nodo"}.
 {"Node not found","Nodo no encontrado"}.
 {"Node ~p","Nodo ~p"}.
+{"Nodeprep has failed","Ha fallado el procesado del nombre de nodo (nodeprep)"}.
 {"Nodes","Nodos"}.
 {"None","Ninguno"}.
+{"Not allowed","No permitido"}.
 {"Not Found","No encontrado"}.
+{"Not subscribed","No suscrito"}.
 {"November","noviembre"}.
 {"Number of online users","Número de usuarios conectados"}.
 {"Number of registered users","Número de usuarios registrados"}.
 {"October","octubre"}.
-{"Offline Messages:","Mensajes diferidos:"}.
 {"Offline Messages","Mensajes diferidos"}.
+{"Offline Messages:","Mensajes diferidos:"}.
 {"OK","Aceptar"}.
 {"Old Password:","Contraseña antigua:"}.
-{"Online","Conectado"}.
-{"Online Users:","Usuarios conectados:"}.
 {"Online Users","Usuarios conectados"}.
+{"Online Users:","Usuarios conectados:"}.
+{"Online","Conectado"}.
+{"Only <enable/> or <disable/> tags are allowed","Solo se permiten las etiquetas <enable/> o <disable/>"}.
+{"Only <list/> element is allowed in this query","Solo se permite el elemento <list/> en esta petición"}.
 {"Only members may query archives of this room","Solo miembros pueden consultar el archivo de mensajes de la sala"}.
 {"Only moderators and participants are allowed to change the subject in this room","Solo los moderadores y participantes pueden cambiar el asunto de esta sala"}.
 {"Only moderators are allowed to change the subject in this room","Solo los moderadores pueden cambiar el asunto de esta sala"}.
@@ -223,53 +283,56 @@
 {"Only occupants are allowed to send messages to the conference","Solo los ocupantes pueden enviar mensajes a la sala"}.
 {"Only occupants are allowed to send queries to the conference","Solo los ocupantes pueden enviar solicitudes a la sala"}.
 {"Only service administrators are allowed to send service messages","Solo los administradores del servicio tienen permiso para enviar mensajes de servicio"}.
-{"Options","Opciones"}.
 {"Organization Name","Nombre de la organización"}.
 {"Organization Unit","Unidad de la organización"}.
-{"Outgoing s2s Connections:","Conexiones S2S salientes:"}.
 {"Outgoing s2s Connections","Conexiones S2S salientes"}.
+{"Outgoing s2s Connections:","Conexiones S2S salientes:"}.
 {"Owner privileges required","Se requieren privilegios de propietario de la sala"}.
+{"Packet relay is denied by service policy","Se ha denegado el reenvío del paquete por política del servicio"}.
 {"Packet","Paquete"}.
-{"Password ~b","Contraseña ~b"}.
-{"Password:","Contraseña:"}.
-{"Password","Contraseña"}.
-{"Password Verification:","Verificación de la contraseña:"}.
 {"Password Verification","Verificación de la contraseña"}.
+{"Password Verification:","Verificación de la contraseña:"}.
+{"Password","Contraseña"}.
+{"Password:","Contraseña:"}.
 {"Path to Dir","Ruta al directorio"}.
 {"Path to File","Ruta al fichero"}.
 {"Pending","Pendiente"}.
 {"Period: ","Periodo: "}.
-{"Permanent rooms","Salas permanentes"}.
+{"Ping query is incorrect","La petición 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.","Ten en cuenta que estas opciones solo harán copia de seguridad de la base de datos Mnesia embebida. Si estás usando ODBC tendrás que hacer también copia de seguridad de tu base de datos SQL."}.
 {"Please, wait for a while before sending new voice request","Por favor, espera un poco antes de enviar otra petición de voz"}.
 {"Pong","Pong"}.
-{"Port ~b","Puerto ~b"}.
-{"Port","Puerto"}.
+{"Possessing 'ask' attribute is not allowed by RFC6121","Poseer el atributo 'ask' no está permitido por RFC6121"}.
+{"Previous session not found","La sesión previa no ha sido encontrada"}.
+{"Previous session PID has been killed","El proceso de la sesión previa ha sido cerrado"}.
+{"Previous session PID has exited","El proceso de la sesión previa ha terminado"}.
+{"Previous session PID is dead","El proceso de la sesión previa está muerto"}.
+{"Previous session timed out","La sesión previa ha caducado"}.
 {"private, ","privado"}.
-{"Protocol","Protocolo"}.
 {"Publish-Subscribe","Servicio de Publicar-Subscribir"}.
 {"PubSub subscriber request","Petición de subscriptor de PubSub"}.
+{"Push record not found","No se encontró registro Push"}.
 {"Queries to the conference members are not allowed in this room","En esta sala no se permiten solicitudes a los miembros de la sala"}.
+{"Query to another users is forbidden","Enviar solicitudes a otros usuarios está prohibido"}.
 {"RAM and disc copy","Copia en RAM y disco"}.
 {"RAM copy","Copia en RAM"}.
-{"Raw","Crudo"}.
 {"Really delete message of the day?","¿Está seguro de quere borrar el mensaje del dia?"}.
 {"Recipient is not in the conference room","El receptor no está en la sala de conferencia"}.
 {"Register a Jabber account","Registrar una cuenta Jabber"}.
-{"Registered nicknames","Apodos registrados"}.
-{"Registered Users:","Usuarios registrados:"}.
 {"Registered Users","Usuarios registrados"}.
+{"Registered Users:","Usuarios registrados:"}.
 {"Register","Registrar"}.
-{"Registration in mod_irc for ","Registro en mod_irc para"}.
 {"Remote copy","Copia remota"}.
 {"Remove All Offline Messages","Borrar todos los mensajes diferidos"}.
-{"Remove","Borrar"}.
 {"Remove User","Eliminar usuario"}.
+{"Remove","Borrar"}.
 {"Replaced by new connection","Reemplazado por una nueva conexión"}.
+{"Request has timed out","La petición ha caducado"}.
+{"Request is ignored","La petición ha sido ignorada"}.
 {"Resources","Recursos"}.
-{"Restart","Reiniciar"}.
 {"Restart Service","Reiniciar el servicio"}.
+{"Restart","Reiniciar"}.
 {"Restore Backup from File at ","Restaura copia de seguridad desde el fichero en "}.
 {"Restore binary backup after next ejabberd restart (requires less memory):","Restaurar copia de seguridad binaria en el siguiente reinicio de ejabberd (requiere menos memoria que si instantánea):"}.
 {"Restore binary backup immediately:","Restaurar inmediatamente copia de seguridad binaria:"}.
@@ -279,57 +342,66 @@
 {"Room creation is denied by service policy","Se te ha denegado crear la sala por política del servicio"}.
 {"Room description","Descripción de la sala"}.
 {"Room Occupants","Ocupantes de la sala"}.
+{"Room terminates","Cerrando la sala"}.
 {"Room title","Título de la sala"}.
-{"Roster","Lista de contactos"}.
-{"Roster of ","Lista de contactos de "}.
+{"Roster of ~ts","Lista de contactos de ~ts"}.
 {"Roster size","Tamaño de la lista de contactos"}.
+{"Roster","Lista de contactos"}.
 {"RPC Call Error","Error en la llamada RPC"}.
 {"Running Nodes","Nodos funcionando"}.
-{"~s access rule configuration","Configuración de las Regla de Acceso ~s"}.
 {"Saturday","sábado"}.
 {"Script check","Comprobación de script"}.
 {"Search Results for ","Buscar resultados por "}.
 {"Search users in ","Buscar usuarios en "}.
-{"Send announcement to all online users","Enviar anuncio a todos los usuarios conectados"}.
+{"Select All","Seleccionar todo"}.
 {"Send announcement to all online users on all hosts","Enviar anuncio a todos los usuarios conectados en todos los dominios"}.
-{"Send announcement to all users","Enviar anuncio a todos los usuarios"}.
+{"Send announcement to all online users","Enviar anuncio a todos los usuarios conectados"}.
 {"Send announcement to all users on all hosts","Enviar anuncio a todos los usuarios en todos los dominios"}.
+{"Send announcement to all users","Enviar anuncio a todos los usuarios"}.
 {"September","septiembre"}.
-{"Server ~b","Servidor ~b"}.
 {"Server:","Servidor:"}.
+{"Session state copying timed out","El copiado del estado de la sesión ha caducado"}.
 {"Set message of the day and send to online users","Poner mensaje del dia y enviar a todos los usuarios conectados"}.
 {"Set message of the day on all hosts and send to online users","Poner mensaje del día en todos los dominios y enviar a los usuarios conectados"}.
 {"Shared Roster Groups","Grupos Compartidos"}.
 {"Show Integral Table","Mostrar Tabla Integral"}.
 {"Show Ordinary Table","Mostrar Tabla Ordinaria"}.
 {"Shut Down Service","Detener el servicio"}.
-{"~s invites you to the room ~s","~s te invita a la sala ~s"}.
+{"SOCKS5 Bytestreams","SOCKS5 Bytestreams"}.
 {"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Algunos clientes Jabber pueden recordar tu contraseña en la máquina. Usa esa opción solo si confías en que la máquina que usas es segura."}.
-{"~s's Offline Messages Queue","Cola de mensajes diferidos de ~s"}.
-{"Start","Iniciar"}.
-{"Start Modules at ","Iniciar módulos en "}.
-{"Start Modules","Iniciar módulos"}.
-{"Statistics","Estadísticas"}.
 {"Statistics of ~p","Estadísticas de ~p"}.
+{"Statistics","Estadísticas"}.
 {"Stop","Detener"}.
-{"Stop Modules at ","Detener módulos en "}.
-{"Stop Modules","Detener módulos"}.
 {"Stopped Nodes","Nodos detenidos"}.
 {"Storage Type","Tipo de almacenamiento"}.
 {"Store binary backup:","Guardar copia de seguridad binaria:"}.
 {"Store plain text backup:","Guardar copia de seguridad en texto plano:"}.
+{"Stream management is already enabled","Ya está activada la administración de la conexión"}.
+{"Stream management is not enabled","No está activada la administración de la conexión"}.
 {"Subject","Asunto"}.
 {"Submit","Enviar"}.
 {"Submitted","Enviado"}.
+{"Subscriptions are not allowed","Las subscripciones no están permitidas"}.
 {"Subscription","Subscripción"}.
 {"Sunday","domingo"}.
 {"That nickname is already in use by another occupant","Ese apodo ya está siendo usado por otro ocupante"}.
 {"That nickname is registered by another person","El apodo ya está registrado por otra persona"}.
+{"The account already exists","La cuenta ya existe"}.
+{"The account was not deleted","La cuenta no fue eliminada"}.
 {"The CAPTCHA is valid.","El CAPTCHA es válido."}.
 {"The CAPTCHA verification has failed","La verificación de CAPTCHA ha fallado"}.
-{"the password is","la contraseña es"}.
+{"The captcha you entered is wrong","El CAPTCHA que has introducido es erróneo"}.
+{"The feature requested is not supported by the conference","La característica solicitada no está soportada por la sala de conferencia"}.
+{"The password contains unacceptable characters","La contraseña contiene caracteres inaceptables"}.
 {"The password is too weak","La contraseña es demasiado débil"}.
+{"the password is","la contraseña es"}.
 {"The password of your Jabber account was successfully changed.","La contraseña de tu cuenta Jabber se ha cambiado correctamente."}.
+{"The password was not changed","La contraseña no fue cambiada"}.
+{"The passwords are different","Las contraseñas son diferentes"}.
+{"The query is only allowed from local users","La solicitud está permitida solo para usuarios locales"}.
+{"The query must not contain <item/> elements","La solicitud no debe contener elementos <item/>"}.
+{"The stanza MUST contain only one <active/> element, one <default/> element, or one <list/> element","El paquete DEBE contener solo un elemento <active/>, un elemento <default/>, o un elemento <list/>"}.
+{"The username is not valid","El nombre de usuario no es válido"}.
 {"There was an error changing the password: ","Hubo un error cambiando la contraseña."}.
 {"There was an error creating the account: ","Hubo uno error al crear la cuenta:"}.
 {"There was an error deleting the account: ","Hubo un error borrando la cuenta."}.
@@ -337,56 +409,90 @@
 {"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Esta página te permite crear una cuenta Jabber este servidor Jabber. Tu JID (Jabber IDentificador) será de la forma: nombredeusuario@servidor. Por favor lee detenidamente las instrucciones para rellenar correctamente los campos."}.
 {"This page allows to unregister a Jabber account in this Jabber server.","Esta página te permite borrar tu cuenta Jabber en este servidor Jabber."}.
 {"This room is not anonymous","Sala no anónima"}.
+{"This service can not process the address: ~ts","Este servicio no puede procesar la dirección: ~ts"}.
 {"Thursday","jueves"}.
 {"Time delay","Retraso temporal"}.
+{"Timed out waiting for stream resumption","Ha pasado demasiado tiempo esperando que la conexión se restablezca"}.
 {"Time","Fecha"}.
+{"To register, visit ~ts","Para registrarte, visita ~ts"}.
+{"To ~ts","A ~ts"}.
+{"Token TTL","Token TTL"}.
+{"Too many active bytestreams","Demasiados bytestreams activos"}.
 {"Too many CAPTCHA requests","Demasiadas peticiones de CAPTCHA"}.
+{"Too many child elements","Demasiados subelementos"}.
+{"Too many <item/> elements","Demasiados elementos <item/>"}.
+{"Too many <list/> elements","Demasiados elementos <list/>"}.
+{"Too many (~p) failed authentications from this IP address (~ts). The address will be unblocked at ~ts UTC","Demasiadas (~p) autenticaciones fallidas de esta dirección IP (~ts). La dirección será desbloqueada en ~ts UTC"}.
+{"Too many receiver fields were specified","Se han especificado demasiados campos de destinatario"}.
 {"Too many unacked stanzas","Demasiados mensajes sin haber reconocido  recibirlos"}.
+{"Too many users in this conference","Demasiados usuarios en esta sala"}.
 {"To","Para"}.
-{"To ~s","A ~s"}.
 {"Total rooms","Salas totales"}.
 {"Traffic rate limit is exceeded","Se ha exedido el límite de tráfico"}.
 {"Transactions Aborted:","Transacciones abortadas:"}.
 {"Transactions Committed:","Transacciones finalizadas:"}.
 {"Transactions Logged:","Transacciones registradas:"}.
 {"Transactions Restarted:","Transacciones reiniciadas:"}.
+{"~ts invites you to the room ~ts","~ts te invita a la sala ~ts"}.
+{"~ts's Offline Messages Queue","Cola de mensajes diferidos de ~ts"}.
 {"Tuesday","martes"}.
 {"Unable to generate a CAPTCHA","No se pudo generar un CAPTCHA"}.
+{"Unable to register route on existing local domain","No se ha podido registrar la ruta en este dominio local existente"}.
 {"Unauthorized","No autorizado"}.
+{"Unexpected action","Acción inesperada"}.
+{"Unexpected error condition: ~p","Condición de error inesperada: ~p"}.
 {"Unregister a Jabber account","Borrar una cuenta Jabber"}.
 {"Unregister","Borrar"}.
-{"Update","Actualizar"}.
+{"Unselect All","Deseleccionar todo"}.
+{"Unsupported <index/> element","Elemento <index/> no soportado"}.
+{"Unsupported version","Versión no soportada"}.
 {"Update message of the day (don't send)","Actualizar mensaje del dia, pero no enviarlo"}.
 {"Update message of the day on all hosts (don't send)","Actualizar el mensaje del día en todos los dominos (pero no enviarlo)"}.
 {"Update ~p","Actualizar ~p"}.
 {"Update plan","Plan de actualización"}.
 {"Update script","Script de actualización"}.
+{"Update","Actualizar"}.
 {"Uptime:","Tiempo desde el inicio:"}.
-{"Use of STARTTLS required","Es obligatorio usar STARTTLS"}.
+{"User already exists","El usuario ya existe"}.
+{"User (jid)","Usuario (jid)"}.
 {"User Management","Administración de usuarios"}.
+{"User removed","Usuario eliminado"}.
+{"User session not found","Sesión de usuario no encontrada"}.
+{"User session terminated","Sesión de usuario terminada"}.
+{"User ~ts","Usuario ~ts"}.
 {"Username:","Nombre de usuario:"}.
 {"Users are not allowed to register accounts so quickly","Los usuarios no tienen permitido crear cuentas con tanta rapidez"}.
 {"Users Last Activity","Última actividad de los usuarios"}.
-{"User ~s","Usuario ~s"}.
 {"Users","Usuarios"}.
 {"User","Usuario"}.
 {"Validate","Validar"}.
+{"Value 'get' of 'type' attribute is not allowed","El valor 'get' del atributo 'type' no está permitido"}.
+{"Value of '~ts' should be boolean","El valor de '~ts' debería ser booleano"}.
+{"Value of '~ts' should be datetime string","El valor de '~ts' debería ser una fecha"}.
+{"Value of '~ts' should be integer","El valor de '~ts' debería ser un entero"}.
+{"Value 'set' of 'type' attribute is not allowed","El valor 'set' del atributo 'type' no está permitido"}.
 {"vCard User Search","Buscar vCard de usuario"}.
+{"Virtual Hosting","Dominios Virtuales"}.
 {"Virtual Hosts","Dominios Virtuales"}.
 {"Visitors are not allowed to change their nicknames in this room","Los visitantes no tienen permitido cambiar sus apodos en esta sala"}.
 {"Visitors are not allowed to send messages to all occupants","Los visitantes no pueden enviar mensajes a todos los ocupantes"}.
 {"Voice request","Petición de voz"}.
 {"Voice requests are disabled in this conference","Las peticiones de voz están desactivadas en esta sala"}.
 {"Wednesday","miércoles"}.
+{"Wrong parameters in the web formulary","Parámetros incorrectos en el formulario web"}.
+{"Wrong xmlns","xmlns incorrecto"}.
+{"You are being removed from the room because of a system shutdown","Estás siendo expulsado de la sala porque el sistema se va a detener"}.
+{"You are not joined to the channel","No has entrado en el canal"}.
 {"You can later change your password using a Jabber client.","Puedes cambiar tu contraseña después, usando un cliente Jabber."}.
 {"You have been banned from this room","Has sido bloqueado en esta sala"}.
+{"You have joined too many conferences","Has entrado en demasiadas salas de conferencia"}.
 {"You must fill in field \"Nickname\" in the form","Debes rellenar el campo \"Apodo\" en el formulario"}.
 {"You need a client that supports x:data and CAPTCHA to register","Necesitas un cliente con soporte de x:data y CAPTCHA para registrarte"}.
 {"You need a client that supports x:data to register the nickname","Necesitas un cliente con soporte de x:data para poder registrar el apodo"}.
-{"You need an x:data capable client to configure mod_irc settings","Necesitas un cliente con soporte de x:data para configurar las opciones de mod_irc"}.
 {"You need an x:data capable client to search","Necesitas un cliente con soporte de x:data para poder buscar"}.
-{"Your active privacy list has denied the routing of this stanza.","Tu lista de privacidad activa ha denegado el encío de este paquete."}.
+{"Your active privacy list has denied the routing of this stanza.","Tu lista de privacidad activa ha denegado el envío de este paquete."}.
 {"Your contact offline message queue is full. The message has been discarded.","Tu cola de mensajes diferidos de contactos está llena. El mensaje se ha descartado."}.
 {"Your Jabber account was successfully created.","Tu cuenta Jabber se ha creado correctamente."}.
 {"Your Jabber account was successfully deleted.","Tu cuenta Jabber se ha borrado correctamente."}.
-{"Your messages to ~s are being blocked. To unblock them, visit ~s","Tus mensajes a ~s están siendo bloqueados. Para desbloquearlos, visita ~s"}.
+{"Your subscription request and/or messages to ~ts have been blocked. To unblock your subscription request, visit ~ts","Tu petición de suscripción y/o mensajes a ~ts ha sido bloqueado. Para desbloquear tu petición de suscripción visita ~ts"}.
+{"You're not allowed to create nodes","No tienes permitido crear nodos"}.

priv/msgs/fr.msg

@@ -1,78 +1,78 @@
-%% -*- coding: latin-1 -*-
-{"Access Configuration","Configuration d'accès"}.
-{"Access Control List Configuration","Configuration des droits (ACL)"}.
-{"Access control lists","Droits (ACL)"}.
-{"Access Control Lists","Droits (ACL)"}.
+%% -*- coding: utf-8 -*-
+{" has set the subject to: "," a changé le sujet: "}.
+{"A password is required to enter this room","Un mot de passe est nécessaire pour accéder à ce salon"}.
+{"Accept","Accepter"}.
 {"Access denied by service policy","L'accès au service est refusé"}.
-{"Access rules","Règles d'accès"}.
-{"Access Rules","Règles d'accès"}.
 {"Action on user","Action sur l'utilisateur"}.
 {"Add Jabber ID","Ajouter un Jabber ID"}.
 {"Add New","Ajouter"}.
 {"Add User","Ajouter un utilisateur"}.
-{"Administration","Administration"}.
 {"Administration of ","Administration de "}.
+{"Administration","Administration"}.
 {"Administrator privileges required","Les droits d'administrateur sont nécessaires"}.
 {"All activity","Toute activité"}.
+{"All Users","Tous les utilisateurs"}.
 {"Allow users to change the subject","Autoriser les utilisateurs à changer le sujet"}.
-{"Allow users to query other users","Permettre aux utilisateurs d'envoyer des requêtes aux autres utilisateurs"}.
-{"Allow users to send invites","Permettre aux utilisateurs d'envoyer des invitations"}.
+{"Allow users to query other users","Autoriser les utilisateurs à envoyer des requêtes aux autres utilisateurs"}.
+{"Allow users to send invites","Autoriser les utilisateurs à envoyer des invitations"}.
 {"Allow users to send private messages","Autoriser les utilisateurs à envoyer des messages privés"}.
 {"Allow visitors to change nickname","Autoriser les visiteurs à changer de pseudo"}.
 {"Allow visitors to send private messages to","Autoriser les visiteurs à envoyer des messages privés"}.
 {"Allow visitors to send status text in presence updates","Autoriser les visiteurs à envoyer un message d'état avec leur présence"}.
-{"All Users","Tous les utilisateurs"}.
 {"Announcements","Annonces"}.
-{"A password is required to enter this room","Un mot de passe est nécessaire pour accèder à ce salon"}.
 {"April","Avril"}.
 {"August","Août"}.
+{"Automatic node creation is not enabled","La creation implicite de nœud n'est pas disponible"}.
 {"Backup Management","Gestion des sauvegardes"}.
 {"Backup of ~p","Sauvegarde de ~p"}.
+{"Backup to File at ","Sauvegarde fichier sur "}.
 {"Backup","Sauvegarde"}.
-{"Backup to File at ","Sauvegarde sur fichier sur "}.
 {"Bad format","Mauvais format"}.
 {"Birthday","Date d'anniversaire"}.
-{"CAPTCHA web page","Page web de CAPTCHA"}.
+{"Both the username and the resource are required","Le nom d'utilisateur et sa ressource sont nécessaires"}.
+{"Bytestream already activated","Le flux SOCKS5 est déjà activé"}.
+{"Cannot remove active list","La liste active ne peut être supprimée"}.
+{"Cannot remove default list","La liste par défaut ne peut être supprimée"}.
 {"Change Password","Modifier le mot de passe"}.
 {"Change User Password","Changer le mot de passe de l'utilisateur"}.
-{"Characters not allowed:","Caractères non-autorisés :"}.
+{"Changing password is not allowed","La modification du mot de passe n'est pas autorisée"}.
+{"Changing role/affiliation is not allowed","La modification role/affiliation n'est pas autorisée"}.
+{"Characters not allowed:","Caractères non-autorisés:"}.
 {"Chatroom configuration modified","Configuration du salon modifiée"}.
 {"Chatroom is created","Le salon de discussion est créé"}.
 {"Chatroom is destroyed","Le salon de discussion est détruit"}.
 {"Chatroom is started","Le salon de discussion a démarré"}.
 {"Chatroom is stopped","Le salon de discussion est stoppé"}.
 {"Chatrooms","Salons de discussion"}.
-{"Choose a username and password to register with this server","Choisissez un nom d'utilisateur et un mot de passe pour s'enregistrer sur ce serveur"}.
-{"Choose modules to stop","Sélectionnez les modules à arrêter"}.
+{"Choose a username and password to register with this server","Choisissez un nom d'utilisateur et un mot de passe pour ce serveur"}.
 {"Choose storage type of tables","Choisissez un type de stockage pour les tables"}.
 {"Choose whether to approve this entity's subscription.","Accepter cet abonnement ?"}.
 {"City","Ville"}.
 {"Commands","Commandes"}.
-{"Conference room does not exist","La salle de conférence n'existe pas"}.
+{"Conference room does not exist","Le salon de discussion n'existe pas"}.
 {"Configuration","Configuration"}.
-{"Configuration of room ~s","Configuration pour le salon ~s"}.
 {"Connected Resources:","Ressources connectées:"}.
-{"Connections parameters","Paramètres de connexion"}.
 {"Country","Pays"}.
-{"CPU Time:","Temps CPU :"}.
-{"Database","Base de données"}.
+{"CPU Time:","Temps CPU:"}.
+{"Database failure","Echec sur la base de données"}.
 {"Database Tables at ~p","Tables de base de données sur ~p"}.
 {"Database Tables Configuration at ","Configuration des tables de base de données sur "}.
+{"Database","Base de données"}.
 {"December","Décembre"}.
-{"Default users as participants","Les utilisateurs sont par défaut participant"}.
+{"Default users as participants","Les utilisateurs sont participant par défaut"}.
 {"Delete message of the day on all hosts","Supprimer le message du jour sur tous les domaines"}.
 {"Delete message of the day","Supprimer le message du jour"}.
 {"Delete Selected","Suppression des éléments sélectionnés"}.
 {"Delete User","Supprimer l'utilisateur"}.
-{"Description:","Description :"}.
+{"Description:","Description:"}.
 {"Disc only copy","Copie sur disque uniquement"}.
-{"Displayed Groups:","Groupes affichés :"}.
+{"Displayed Groups:","Groupes affichés:"}.
 {"Don't tell your password to anybody, not even the administrators of the Jabber server.","Ne révélez votre mot de passe à personne, pas même l'administrateur de ce serveur."}.
 {"Dump Backup to Text File at ","Enregistrer la sauvegarde dans un fichier texte sur "}.
 {"Dump to Text File","Sauvegarder dans un fichier texte"}.
+{"Duplicated groups are not allowed by RFC6121","Les groupes ne peuvent être dupliqués (rfc6121)"}.
 {"Edit Properties","Modifier les propriétés"}.
-{"Either approve or decline the voice request.","Approuver ou refuser la demande de 'voice'"}.
-{"ejabberd IRC module","Module IRC ejabberd"}.
+{"Either approve or decline the voice request.","Accepter ou refuser la demande de voix"}.
 {"ejabberd MUC module","Module MUC ejabberd"}.
 {"ejabberd Multicast service","Service de Multidiffusion d'ejabberd"}.
 {"ejabberd Publish-Subscribe module","Module Publish-Subscribe d'ejabberd"}.
@@ -82,47 +82,48 @@
 {"Elements","Éléments"}.
 {"Email","Email"}.
 {"Enable logging","Activer l'archivage"}.
-{"Encoding for server ~b","Codage pour le serveur ~b"}.
+{"Enabling push without 'node' attribute is not supported","L'activation push ne peut se faire sans l'attribut 'node'"}.
 {"End User Session","Terminer la session de l'utilisateur"}.
-{"Enter list of {Module, [Options]}","Entrez une liste de {Module, [Options]}"}.
 {"Enter nickname you want to register","Entrez le pseudo que vous souhaitez enregistrer"}.
 {"Enter path to backup file","Entrez le chemin vers le fichier de sauvegarde"}.
-{"Enter path to jabberd14 spool dir","Entrez le chemin vers le répertoire de spool jabberd14"}.
-{"Enter path to jabberd14 spool file","Entrez le chemin vers le fichier spool jabberd14"}.
+{"Enter path to jabberd14 spool dir","Entrez le chemin vers le répertoire spool de Jabberd 1.4"}.
+{"Enter path to jabberd14 spool file","Entrez le chemin vers le fichier spool de Jabberd 1.4"}.
 {"Enter path to text file","Entrez le chemin vers le fichier texte"}.
 {"Enter the text you see","Tapez le texte que vous voyez"}.
-{"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.","Entrez le nom d'utilisateur et les encodages que vous souhaitez utiliser pour vous connecter aux serveurs IRC. Appuyez sur 'Suivant' pour pour avoir d'autres champs à remplir. Appuyez sur 'Terminer' pour sauver les paramètres."}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Entrez le nom d'utilisateur, les encodages, les ports et mots de passe que vous souhaitez utiliser pour vous connecter aux serveurs IRC"}.
 {"Erlang Jabber Server","Serveur Jabber Erlang"}.
 {"Error","Erreur"}.
-{"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Exemple: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
-{"Export all tables as SQL queries to a file:","Exporter toutes les tables en tant que requêtes SQL vers un fichier:"}.
+{"Export all tables as SQL queries to a file:","Exporter toutes les tables vers un fichier SQL:"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Exporter les données de tous les utilisateurs du serveur vers un fichier PIEFXIS (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Exporter les données utilisateurs d'un hôte vers un fichier PIEFXIS (XEP-0227):"}.
+{"External component failure","Erreur de composant externe"}.
+{"External component timeout","Dépassement de delai du composant externe"}.
+{"Failed to activate bytestream","Echec d'activation du flux SOCKS5"}.
+{"Failed to extract JID from your voice request approval","Echec d'extraction du JID dans la requête de voix"}.
+{"Failed to map delegated namespace to external component","Echec d'association d'espace de nom vers un composant externe"}.
+{"Failed to parse HTTP response","Echec de lecture de la réponse HTTP"}.
 {"Family Name","Nom de famille"}.
 {"February","Février"}.
-{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","Remplissez le formulaire pour recherche un utilisateur Jabber (Ajouter * à la fin du champ pour chercher n'importe quelle fin de chaîne"}.
+{"File larger than ~w bytes","Taille de fichier suppérieur à ~w octets"}.
 {"Friday","Vendredi"}.
 {"From","De"}.
-{"From ~s","De ~s"}.
 {"Full Name","Nom complet"}.
 {"Get Number of Online Users","Récupérer le nombre d'utilisateurs en ligne"}.
 {"Get Number of Registered Users","Récupérer le nombre d'utilisateurs enregistrés"}.
 {"Get User Last Login Time","Récupérer la dernière date de connexion de l'utilisateur"}.
 {"Get User Password","Récupérer le mot de passe de l'utilisateur"}.
 {"Get User Statistics","Récupérer les statistiques de l'utilisateur"}.
+{"Given Name","Nom"}.
 {"Group ","Groupe "}.
 {"Groups","Groupes"}.
 {"has been banned","a été banni"}.
-{"has been kicked","a été expulsé"}.
-{"has been kicked because of an affiliation change","a été éjecté à cause d'un changement d'autorisation"}.
 {"has been kicked because of a system shutdown","a été éjecté en raison de l'arrêt du système"}.
+{"has been kicked because of an affiliation change","a été éjecté à cause d'un changement d'autorisation"}.
 {"has been kicked because the room has been changed to members-only","a été éjecté car la salle est désormais réservée aux membres"}.
-{" has set the subject to: "," a changé le sujet pour: "}.
+{"has been kicked","a été expulsé"}.
+{"Host unknown","Serveur inconnu"}.
 {"Host","Serveur"}.
 {"If you don't see the CAPTCHA image here, visit the web page.","SI vous ne voyez pas l'image CAPTCHA ici, visitez la page web."}.
-{"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","Si vous voulez préciser différents ports, mots de passe, et encodages pour les serveurs IRC, remplissez cette liste avec des valeurs dans le format '{\"serveur irc\", \"encodage\", port, \"mot de passe\"}'. Par défaut ce service utilise l'encodage \"~s\", port ~p, mot de passe vide."}.
-{"Import Directory","Importer une répertoire"}.
+{"Import Directory","Importer un répertoire"}.
 {"Import File","Importer un fichier"}.
 {"Import user data from jabberd14 spool file:","Importer des utilisateurs depuis un fichier spool Jabberd 1.4:"}.
 {"Import User from File at ","Importer un utilisateur depuis le fichier sur "}.
@@ -130,27 +131,27 @@
 {"Import users data from jabberd14 spool directory:","Importer des utilisateurs depuis un fichier spool Jabberd 1.4:"}.
 {"Import Users from Dir at ","Importer des utilisateurs depuis le répertoire sur "}.
 {"Import Users From jabberd14 Spool Files","Importer des utilisateurs depuis un fichier spool Jabberd 1.4"}.
+{"Improper domain part of 'from' attribute","Le domaine de l'attribut 'from' est incorrect"}.
 {"Improper message type","Mauvais type de message"}.
+{"Incoming s2s Connections:","Connexions s2s entrantes:"}.
+{"Incorrect CAPTCHA submit","Entrée CAPTCHA incorrecte"}.
+{"Incorrect data form","Formulaire incorrect"}.
 {"Incorrect password","Mot de passe incorrect"}.
+{"Incorrect value of 'action' attribute","Valeur de l'attribut 'action' incorrecte"}.
+{"Incorrect value of 'action' in data form","Valeur de l'attribut 'action' incorrecte dans le formulaire"}.
+{"Incorrect value of 'path' in data form","Valeur de l'attribut 'path' incorrecte dans le formulaire"}.
+{"Insufficient privilege","Droits insuffisants"}.
+{"Invalid 'from' attribute in forwarded message","L'attribut 'from' du message transféré est incorrect"}.
+{"Invitations are not allowed in this conference","Les invitations ne sont pas autorisées dans ce salon"}.
 {"IP addresses","Adresses IP"}.
-{"IP","IP"}.
-{"IRC channel (don't put the first #)","Canal IRC (ne pas insérer le premier caractère #)"}.
-{"IRC server","Serveur IRC"}.
-{"IRC settings","Configuration IRC"}.
-{"IRC Transport","Passerelle IRC"}.
-{"IRC username","Nom d'utilisateur IRC"}.
-{"IRC Username","Nom d'utilisateur IRC"}.
 {"is now known as","est maintenant connu comme"}.
-{"It is not allowed to send private messages","L'envoi de messages privés n'est pas autorisé"}.
 {"It is not allowed to send private messages of type \"groupchat\"","Il n'est pas permis d'envoyer des messages privés de type \"groupchat\""}.
-{"It is not allowed to send private messages to the conference","Il n'est pas permis d'envoyer des messages \"normaux\" à la conférence"}.
+{"It is not allowed to send private messages to the conference","Il n'est pas permis d'envoyer des messages \"normaux\" au salon"}.
+{"It is not allowed to send private messages","L'envoi de messages privés n'est pas autorisé"}.
 {"Jabber Account Registration","Enregistrement du Compte Jabber"}.
 {"Jabber ID","Jabber ID"}.
 {"January","Janvier"}.
-{"Join IRC channel","Rejoindre un canal IRC"}.
 {"joins the room","rejoint le salon"}.
-{"Join the IRC channel here.","Rejoindre un canal IRC ici"}.
-{"Join the IRC channel in this Jabber ID: ~s","Rejoindre un canal IRC avec ce Jabber ID: ~s"}.
 {"July","Juillet"}.
 {"June","Juin"}.
 {"Last Activity","Dernière Activité"}.
@@ -158,9 +159,6 @@
 {"Last month","Dernier mois"}.
 {"Last year","Dernière année"}.
 {"leaves the room","quitte le salon"}.
-{"Listened Ports at ","Ports ouverts sur "}.
-{"Listened Ports","Ports ouverts"}.
-{"List of modules to start","Liste des modules à démarrer"}.
 {"List of rooms","Liste des salons"}.
 {"Low level update script","Script de mise à jour de bas-niveau"}.
 {"Make participants list public","Rendre la liste des participants publique"}.
@@ -170,99 +168,125 @@
 {"Make room password protected","Protéger le salon par mot de passe"}.
 {"Make room persistent","Rendre le salon persistant"}.
 {"Make room public searchable","Rendre le salon public"}.
+{"Malformed username","Nom d'utilisateur invalide"}.
 {"March","Mars"}.
 {"Maximum Number of Occupants","Nombre maximum d'occupants"}.
 {"May","Mai"}.
 {"Membership is required to enter this room","Vous devez être membre pour accèder à ce salon"}.
-{"Members:","Membres :"}.
+{"Members:","Membres:"}.
 {"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","Mémorisez votre mot de passe, ou écrivez-le sur un papier conservé dans un endroit secret. Dans Jabber il n'y a pas de mécanisme pour retrouver votre mot de passe si vous l'avez oublié."}.
 {"Memory","Mémoire"}.
 {"Message body","Corps du message"}.
+{"Message not found in forwarded payload","Message non trouvé dans l'enveloppe transférée"}.
 {"Middle Name","Autre nom"}.
 {"Moderator privileges required","Les droits de modérateur sont nécessaires"}.
 {"Modified modules","Modules mis à jour"}.
-{"Module","Module"}.
-{"Modules at ~p","Modules sur ~p"}.
-{"Modules","Modules"}.
+{"Module failed to handle the query","Echec de traitement de la demande"}.
 {"Monday","Lundi"}.
 {"Multicast","Multidiffusion"}.
+{"Multiple <item/> elements are not allowed by RFC6121","Les elements <item/> multiples ne sont pas autorisés (rfc6121)"}.
 {"Multi-User Chat","Discussion de groupe"}.
-{"Name:","Nom :"}.
 {"Name","Nom"}.
+{"Name:","Nom:"}.
+{"Neither 'jid' nor 'nick' attribute found","Attribut 'jid' ou 'nick' absent"}.
+{"Neither 'role' nor 'affiliation' attribute found","Attribut 'role' ou 'affiliation' absent"}.
 {"Never","Jamais"}.
 {"New Password:","Nouveau mot de passe:"}.
-{"Nickname","Pseudo"}.
 {"Nickname Registration at ","Enregistrement d'un pseudo sur "}.
-{"Nickname ~s does not exist in the room","Le pseudo ~s n'existe pas dans ce salon"}.
+{"Nickname","Pseudo"}.
+{"No 'affiliation' attribute found","Attribut 'affiliation' absent"}.
+{"No available resource found","Aucune ressource disponible"}.
 {"No body provided for announce message","Pas de corps de message pour l'annonce"}.
+{"No data form found","Formulaire non trouvé"}.
 {"No Data","Aucune information disponible"}.
-{"Node not found","Noeud non trouvé"}.
-{"Node ~p","Noeud ~p"}.
-{"Nodes","Noeuds"}.
+{"No features available","Aucune fonctionalité disponible"}.
+{"No hook has processed this command","Aucun gestionnaire n'a pris en charge cette commande"}.
+{"No info about last activity found","Aucune activité précédente trouvée"}.
+{"No 'item' element found","Aucun élément 'item' trouvé"}.
+{"No items found in this query","Aucun item trouvé dans cette requête"}.
+{"No limit","Pas de limite"}.
+{"No module is handling this query","Aucun module ne supporte cette requête"}.
+{"No node specified","Nœud non spécifié"}.
+{"No 'password' found in data form","Entrée 'password' absente du formulaire"}.
+{"No 'password' found in this query","L'élément 'password' est absent de la requête"}.
+{"No 'path' found in data form","Entrée 'path' absente du formulaire"}.
+{"No pending subscriptions found","Aucune demande d'abonnement trouvée"}.
+{"No privacy list with this name found","Liste non trouvée"}.
+{"No private data found in this query","Aucune donnée privée trouvée dans cette requête"}.
+{"No running node found","Nœud non trouvé"}.
+{"No services available","Aucun service disponible"}.
+{"No statistics found for this item","Pas de statistiques"}.
+{"No 'to' attribute found in the invitation","L'élément 'to' est absent de l'invitation"}.
+{"Node already exists","Ce nœud existe déjà"}.
+{"Node index not found","Index de nœud non trouvé"}.
+{"Node not found","Nœud non trouvé"}.
+{"Node ~p","Nœud ~p"}.
+{"Nodeprep has failed","Echec de formattage"}.
+{"Nodes","Nœuds"}.
 {"None","Aucun"}.
 {"Not Found","Nœud non trouvé"}.
+{"Not subscribed","Pas abonné"}.
 {"November","Novembre"}.
 {"Number of online users","Nombre d'utilisateurs en ligne"}.
 {"Number of registered users","Nombre d'utilisateurs enregistrés"}.
 {"October","Octobre"}.
-{"Offline Messages:","Messages en attente :"}.
 {"Offline Messages","Messages en attente"}.
+{"Offline Messages:","Messages en attente:"}.
 {"OK","OK"}.
 {"Old Password:","Ancien mot de passe:"}.
-{"Online","En ligne"}.
 {"Online Users:","Utilisateurs connectés:"}.
 {"Online Users","Utilisateurs en ligne"}.
+{"Online","En ligne"}.
+{"Only <enable/> or <disable/> tags are allowed","Seul le tag <enable/> ou <disable/> est autorisé"}.
+{"Only <list/> element is allowed in this query","Seul l'élément <list/> est autorisé dans cette requête"}.
+{"Only members may query archives of this room","Seuls les membres peuvent accéder aux archives de ce salon"}.
 {"Only moderators and participants are allowed to change the subject in this room","Seuls les modérateurs et les participants peuvent changer le sujet dans ce salon"}.
 {"Only moderators are allowed to change the subject in this room","Seuls les modérateurs peuvent changer le sujet dans ce salon"}.
+{"Only moderators can approve voice requests","Seuls les modérateurs peuvent accépter les requêtes voix"}.
 {"Only occupants are allowed to send messages to the conference","Seuls les occupants peuvent envoyer des messages à la conférence"}.
 {"Only occupants are allowed to send queries to the conference","Seuls les occupants sont autorisés à envoyer des requêtes à la conférence"}.
 {"Only service administrators are allowed to send service messages","Seuls les administrateurs du service sont autoriser à envoyer des messages de service"}.
-{"Options","Options"}.
 {"Organization Name","Nom de l'organisation"}.
 {"Organization Unit","Unité de l'organisation"}.
-{"Outgoing s2s Connections:","Connexions s2s sortantes:"}.
 {"Outgoing s2s Connections","Connexions s2s sortantes"}.
+{"Outgoing s2s Connections:","Connexions s2s sortantes:"}.
 {"Owner privileges required","Les droits de propriétaire sont nécessaires"}.
 {"Packet","Paquet"}.
-{"Password ~b","Mot de passe ~b"}.
-{"Password:","Mot de passe:"}.
-{"Password","Mot de passe"}.
-{"Password Verification:","Vérification du mot de passe :"}.
 {"Password Verification","Vérification du mot de passe"}.
+{"Password Verification:","Vérification du mot de passe:"}.
+{"Password","Mot de passe"}.
+{"Password:","Mot de passe:"}.
 {"Path to Dir","Chemin vers le répertoire"}.
 {"Path to File","Chemin vers le fichier"}.
 {"Pending","En suspens"}.
-{"Period: ","Période :"}.
-{"Permanent rooms","Salons persistent"}.
+{"Period: ","Période: "}.
+{"Ping query is incorrect","Requête ping incorrecte"}.
 {"Ping","Ping"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Ces options sauvegardent uniquement la base de données interne Mnesia. Si vous utilisez le module ODBC vous devez sauvegarde votre base SQL séparément."}.
+{"Please, wait for a while before sending new voice request","Attendez un moment avant de re-lancer une requête de voix"}.
 {"Pong","Pong"}.
-{"Port ~b","Port ~b"}.
-{"Port","Port"}.
+{"Possessing 'ask' attribute is not allowed by RFC6121","Le traitement de l'attribut 'ack' n'est pas autorisé (rfc6121)"}.
 {"private, ","privé"}.
-{"Protocol","Protocole"}.
 {"Publish-Subscribe","Publication-Abonnement"}.
 {"PubSub subscriber request","Demande d'abonnement PubSub"}.
 {"Queries to the conference members are not allowed in this room","Les requêtes sur les membres de la conférence ne sont pas autorisé dans ce salon"}.
+{"Query to another users is forbidden","Requête vers un autre utilisateur interdite"}.
 {"RAM and disc copy","Copie en mémoire vive (RAM) et sur disque"}.
 {"RAM copy","Copie en mémoire vive (RAM)"}.
-{"Raw","Brut"}.
 {"Really delete message of the day?","Confirmer la suppression du message du jour ?"}.
 {"Recipient is not in the conference room","Le destinataire n'est pas dans la conférence"}.
 {"Register a Jabber account","Enregistrer un compte Jabber"}.
-{"Registered nicknames","Pseudos enregistrés"}.
-{"Registered Users:","Utilisateurs enregistrés:"}.
 {"Registered Users","Utilisateurs enregistrés"}.
+{"Registered Users:","Utilisateurs enregistrés:"}.
 {"Register","Enregistrer"}.
-{"Registration in mod_irc for ","Enregistrement du mod_irc pour "}.
 {"Remote copy","Copie distante"}.
 {"Remove All Offline Messages","Effacer tous les messages hors ligne"}.
-{"Remove","Enlever"}.
 {"Remove User","Supprimer l'utilisateur"}.
+{"Remove","Supprimer"}.
 {"Replaced by new connection","Remplacé par une nouvelle connexion"}.
 {"Resources","Ressources"}.
-{"Restart","Redémarrer"}.
 {"Restart Service","Redémarrer le service"}.
+{"Restart","Redémarrer"}.
 {"Restore Backup from File at ","Restaurer la sauvegarde depuis le fichier sur "}.
 {"Restore binary backup after next ejabberd restart (requires less memory):","Restauration de la sauvegarde binaire après redémarrage (nécessite moins de mémoire):"}.
 {"Restore binary backup immediately:","Restauration immédiate d'une sauvegarde binaire:"}.
@@ -270,44 +294,34 @@
 {"Restore","Restauration"}.
 {"Room Configuration","Configuration du salon"}.
 {"Room creation is denied by service policy","La création de salons est interdite par le service"}.
-{"Room description","Description :"}.
+{"Room description","Description du salon"}.
 {"Room Occupants","Occupants du salon"}.
 {"Room title","Titre du salon"}.
-{"Roster","Liste de contacts"}.
-{"Roster of ","Liste de contact de "}.
 {"Roster size","Taille de la liste de contacts"}.
+{"Roster","Liste de contacts"}.
 {"RPC Call Error","Erreur d'appel RPC"}.
 {"Running Nodes","Noeuds actifs"}.
-{"~s access rule configuration","Configuration des règles d'accès ~s"}.
 {"Saturday","Samedi"}.
 {"Script check","Validation du script"}.
 {"Search Results for ","Résultats de recherche pour "}.
 {"Search users in ","Rechercher des utilisateurs "}.
-{"Send announcement to all online users","Envoyer l'annonce à tous les utilisateurs en ligne"}.
 {"Send announcement to all online users on all hosts","Envoyer l'annonce à tous les utilisateurs en ligne sur tous les serveurs"}.
-{"Send announcement to all users","Envoyer l'annonce à tous les utilisateurs"}.
+{"Send announcement to all online users","Envoyer l'annonce à tous les utilisateurs en ligne"}.
 {"Send announcement to all users on all hosts","Envoyer une annonce à tous les utilisateurs de tous les domaines"}.
+{"Send announcement to all users","Envoyer l'annonce à tous les utilisateurs"}.
 {"September","Septembre"}.
-{"Server ~b","Serveur ~b"}.
-{"Server:","Serveur :"}.
+{"Server:","Serveur:"}.
 {"Set message of the day and send to online users","Définir le message du jour et l'envoyer aux utilisateurs en ligne"}.
 {"Set message of the day on all hosts and send to online users","Définir le message du jour pour tous domaines et l'envoyer aux utilisateurs en ligne"}.
 {"Shared Roster Groups","Groupes de liste de contacts partagée"}.
 {"Show Integral Table","Montrer la table intégralement"}.
 {"Show Ordinary Table","Montrer la table ordinaire"}.
 {"Shut Down Service","Arrêter le service"}.
-{"~s invites you to the room ~s","~s vous a invité dans la salle de discussion ~s"}.
 {"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Certains clients Jabber peuvent stocker votre mot de passe sur votre ordinateur. N'utilisez cette fonctionnalité que si vous avez confiance en la sécurité de votre ordinateur."}.
-{"~s's Offline Messages Queue","~s messages en file d'attente"}.
-{"Start","Démarrer"}.
-{"Start Modules at ","Démarrer les modules sur "}.
-{"Start Modules","Modules de démarrage"}.
 {"Statistics of ~p","Statistiques de ~p"}.
 {"Statistics","Statistiques"}.
 {"Stop","Arrêter"}.
-{"Stop Modules at ","Arrêter les modules sur "}.
-{"Stop Modules","Modules d'arrêt"}.
-{"Stopped Nodes","Noeuds arrêtés"}.
+{"Stopped Nodes","Nœuds arrêtés"}.
 {"Storage Type","Type de stockage"}.
 {"Store binary backup:","Sauvegarde binaire:"}.
 {"Store plain text backup:","Sauvegarde texte:"}.
@@ -315,17 +329,22 @@
 {"Submit","Soumettre"}.
 {"Submitted","Soumis"}.
 {"Subscription","Abonnement"}.
+{"Subscriptions are not allowed","Les abonnement ne sont pas autorisés"}.
 {"Sunday","Dimanche"}.
 {"That nickname is already in use by another occupant","Le pseudo est déjà utilisé par un autre occupant"}.
 {"That nickname is registered by another person","Le pseudo est enregistré par une autre personne"}.
 {"The CAPTCHA is valid.","Le CAPTCHA est valide"}.
 {"The CAPTCHA verification has failed","La vérification du CAPTCHA a échoué"}.
-{"the password is","le mot de passe est"}.
+{"The feature requested is not supported by the conference","La demande de fonctionalité n'est pas supportée par la conférence"}.
+{"The password contains unacceptable characters","Le mot de passe contient des caractères non-acceptables"}.
 {"The password is too weak","Le mot de passe est trop faible"}.
+{"the password is","le mot de passe est"}.
 {"The password of your Jabber account was successfully changed.","Le mot de passe de votre compte Jabber a été changé avec succès."}.
-{"There was an error changing the password: ","Il y a eu une erreur en changeant le mot de passe :"}.
-{"There was an error creating the account: ","Il y a eu une erreur en créant le compte :"}.
-{"There was an error deleting the account: ","Il y a eu une erreur en effaçant le compte :"}.
+{"The query is only allowed from local users","La requête n'est autorisé qu'aux utilisateurs locaux"}.
+{"The query must not contain <item/> elements","La requête ne doit pas contenir d'élément <item/>"}.
+{"There was an error changing the password: ","Il y a eu une erreur en changeant le mot de passe: "}.
+{"There was an error creating the account: ","Il y a eu une erreur en créant le compte: "}.
+{"There was an error deleting the account: ","Il y a eu une erreur en effaçant le compte: "}.
 {"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","C'est insensible à la casse : macbeth est identique à MacBeth et Macbeth."}.
 {"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Cette page permet de créer un compte Jabber sur ce serveur Jabber. Votre JID (Jabber IDentifier, identifiant Jabber) sera de la forme : nom@serveur. Prière de lire avec attention les instructions pour remplir correctement ces champs."}.
 {"This page allows to unregister a Jabber account in this Jabber server.","Cette page permet d'effacer un compte Jabber sur ce serveur Jabber."}.
@@ -334,50 +353,63 @@
 {"Time delay","Délais"}.
 {"Time","Heure"}.
 {"To","A"}.
+{"Token TTL","Jeton TTL"}.
+{"Too many active bytestreams","Trop de flux SOCKS5 actifs"}.
+{"Too many CAPTCHA requests","Trop de requêtes CAPTCHA"}.
+{"Too many <item/> elements","Trop d'éléments <item/>"}.
+{"Too many <list/> elements","Trop d'éléments <list/>"}.
 {"Too many unacked stanzas","Trop de stanzas sans accusé de réception (ack)"}.
-{"To ~s","A ~s"}.
+{"Too many users in this conference","Trop d'utilisateurs dans cette conférence"}.
 {"Total rooms","Nombre de salons"}.
 {"Traffic rate limit is exceeded","La limite de trafic a été dépassée"}.
-{"Transactions Aborted:","Transactions annulées :"}.
-{"Transactions Committed:","Transactions commitées :"}.
-{"Transactions Logged:","Transactions journalisées :"}.
-{"Transactions Restarted:","Transactions redémarrées :"}.
+{"Transactions Aborted:","Transactions annulées:"}.
+{"Transactions Committed:","Transactions commitées:"}.
+{"Transactions Logged:","Transactions journalisées:"}.
+{"Transactions Restarted:","Transactions redémarrées:"}.
 {"Tuesday","Mardi"}.
 {"Unable to generate a CAPTCHA","Impossible de générer le CAPTCHA"}.
+{"Unable to register route on existing local domain","Impossible d'enregistrer la route sur un domaine locale existant"}.
 {"Unauthorized","Non autorisé"}.
+{"Unexpected action","Action inattendu"}.
 {"Unregister a Jabber account","Effacer un compte Jabber"}.
-{"Unregister","Effacer"}.
+{"Unregister","Désinscrire"}.
+{"Unsupported <index/> element","Elément <index/> non supporté"}.
 {"Update message of the day (don't send)","Mise à jour du message du jour (pas d'envoi)"}.
 {"Update message of the day on all hosts (don't send)","Mettre à jour le message du jour sur tous les domaines (ne pas envoyer)"}.
-{"Update","Mettre à jour"}.
 {"Update plan","Plan de mise à jour"}.
 {"Update ~p","Mise à jour de ~p"}.
 {"Update script","Script de mise à jour"}.
+{"Update","Mettre à jour"}.
 {"Uptime:","Temps depuis le démarrage :"}.
-{"Use of STARTTLS required","L'utilisation de STARTTLS est impérative"}.
+{"User already exists","L'utilisateur existe déjà"}.
+{"User (jid)","Utilisateur (jid)"}.
 {"User Management","Gestion des utilisateurs"}.
-{"Username:","Nom d'utilisateur :"}.
+{"User session not found","Session utilisateur non trouvée"}.
+{"User session terminated","Session utilisateur terminée"}.
+{"Username:","Nom d'utilisateur:"}.
 {"Users are not allowed to register accounts so quickly","Les utilisateurs ne sont pas autorisés à enregistrer des comptes si rapidement"}.
 {"Users Last Activity","Dernière activité des utilisateurs"}.
-{"User ~s","Utilisateur ~s"}.
 {"Users","Utilisateurs"}.
 {"User","Utilisateur"}.
 {"Validate","Valider"}.
+{"Value 'get' of 'type' attribute is not allowed","La valeur de l'attribut 'type' ne peut être 'get'"}.
+{"Value 'set' of 'type' attribute is not allowed","La valeur de l'attribut 'type' ne peut être 'set'"}.
 {"vCard User Search","Recherche dans l'annnuaire"}.
 {"Virtual Hosts","Serveurs virtuels"}.
 {"Visitors are not allowed to change their nicknames in this room","Les visiteurs ne sont pas autorisés à changer de pseudo dans ce salon"}.
 {"Visitors are not allowed to send messages to all occupants","Les visiteurs ne sont pas autorisés à envoyer des messages à tout les occupants"}.
-{"Voice request","Demande de 'voice'"}.
+{"Voice request","Demande de voix"}.
+{"Voice requests are disabled in this conference","Les demandes de voix sont désactivées dans cette conférence"}.
 {"Wednesday","Mercredi"}.
 {"You can later change your password using a Jabber client.","Vous pouvez changer votre mot de passe plus tard en utilisant un client Jabber."}.
 {"You have been banned from this room","Vous avez été exclus de ce salon"}.
+{"You have joined too many conferences","Vous avec rejoint trop de conférences"}.
 {"You must fill in field \"Nickname\" in the form","Vous devez préciser le champ \"pseudo\" dans le formulaire"}.
 {"You need a client that supports x:data and CAPTCHA to register","Vous avez besoin d'un client prenant en charge x:data et CAPTCHA pour enregistrer un pseudo"}.
 {"You need a client that supports x:data to register the nickname","Vous avez besoin d'un client prenant en charge x:data pour enregistrer un pseudo"}.
-{"You need an x:data capable client to configure mod_irc settings","Vous avez besoin d'un client supportant x:data pour configurer le module IRC"}.
 {"You need an x:data capable client to search","Vous avez besoin d'un client supportant x:data pour faire une recherche"}.
 {"Your active privacy list has denied the routing of this stanza.","Votre règle de flitrage active a empêché le routage de ce stanza."}.
 {"Your contact offline message queue is full. The message has been discarded.","La file d'attente de message de votre contact est pleine. Votre message a été détruit."}.
 {"Your Jabber account was successfully created.","Votre compte Jabber a été créé avec succès."}.
 {"Your Jabber account was successfully deleted.","Votre compte Jabber a été effacé avec succès."}.
-{"Your messages to ~s are being blocked. To unblock them, visit ~s","Vos messages pour ~s sont bloqués. Pour les débloquer, veuillez visiter ~s"}.
+{"You're not allowed to create nodes","Vous n'êtes pas autorisé à créer des nœuds"}.

priv/msgs/gl.msg

@@ -1,20 +1,17 @@
-%% -*- coding: latin-1 -*-
+%% -*- coding: utf-8 -*-
+{" has set the subject to: "," puxo o asunto: "}.
+{"A password is required to enter this room","Necesítase contrasinal para entrar nesta sala"}.
 {"Accept","Aceptar"}.
-{"Access Configuration","Configuración de accesos"}.
-{"Access Control List Configuration","Configuración da Lista de Control de Acceso"}.
-{"Access control lists","Listas de Control de Acceso"}.
-{"Access Control Lists","Listas de Control de Acceso"}.
 {"Access denied by service policy","Acceso denegado pola política do servizo"}.
-{"Access rules","Regras de acceso"}.
-{"Access Rules","Regras de Acceso"}.
 {"Action on user","Acción no usuario"}.
 {"Add Jabber ID","Engadir ID Jabber"}.
 {"Add New","Engadir novo"}.
 {"Add User","Engadir usuario"}.
-{"Administration","Administración"}.
 {"Administration of ","Administración de "}.
+{"Administration","Administración"}.
 {"Administrator privileges required","Necesítase privilexios de administrador"}.
 {"All activity","Toda a actividade"}.
+{"All Users","Todos os usuarios"}.
 {"Allow users to change the subject","Permitir aos usuarios cambiar o asunto"}.
 {"Allow users to query other users","Permitir aos usuarios consultar a outros usuarios"}.
 {"Allow users to send invites","Permitir aos usuarios enviar invitacións"}.
@@ -22,20 +19,24 @@
 {"Allow visitors to change nickname","Permitir aos visitantes cambiarse o alcume"}.
 {"Allow visitors to send private messages to","Permitir aos visitantes enviar mensaxes privadas a"}.
 {"Allow visitors to send status text in presence updates","Permitir aos visitantes enviar texto de estado nas actualizacións depresenza"}.
-{"All Users","Todos os usuarios"}.
 {"Announcements","Anuncios"}.
-{"A password is required to enter this room","Necesítase contrasinal para entrar nesta sala"}.
 {"April","Abril"}.
 {"August","Agosto"}.
-{"Backup","Copia de seguridade"}.
+{"Automatic node creation is not enabled","A creación automática de nodos non está habilitada"}.
 {"Backup Management","Xestión de copia de seguridade"}.
 {"Backup of ~p","Copia de seguridade de ~p"}.
 {"Backup to File at ","Copia de seguridade de arquivos en "}.
+{"Backup","Copia de seguridade"}.
 {"Bad format","Mal formato"}.
 {"Birthday","Aniversario"}.
-{"CAPTCHA web page","CAPTCHA páxina Web"}.
+{"Both the username and the resource are required","Tanto o nome de usuario como o recurso son necesarios"}.
+{"Bytestream already activated","Bytestream xa está activado"}.
+{"Cannot remove active list","Non se pode eliminar a lista activa"}.
+{"Cannot remove default list","Non se pode eliminar a lista predeterminada"}.
 {"Change Password","Cambiar contrasinal"}.
 {"Change User Password","Cambiar contrasinal de usuario"}.
+{"Changing password is not allowed","Non se permite cambiar o contrasinal"}.
+{"Changing role/affiliation is not allowed","O cambio de rol/afiliación non está permitido"}.
 {"Characters not allowed:","Caracteres non permitidos:"}.
 {"Chatroom configuration modified","Configuración da sala modificada"}.
 {"Chatroom is created","Creouse a sala"}.
@@ -44,85 +45,84 @@
 {"Chatroom is stopped","Detívose a sala"}.
 {"Chatrooms","Salas de charla"}.
 {"Choose a username and password to register with this server","Escolle un nome de usuario e contrasinal para rexistrarche neste servidor"}.
-{"Choose modules to stop","Selecciona módulos a deter"}.
 {"Choose storage type of tables","Selecciona tipo de almacenamento das táboas"}.
 {"Choose whether to approve this entity's subscription.","Decidir se aprobar a subscripción desta entidade."}.
 {"City","Cidade"}.
 {"Commands","Comandos"}.
 {"Conference room does not exist","A sala de conferencias non existe"}.
 {"Configuration","Configuración"}.
-{"Configuration of room ~s","Configuración para a sala ~s"}.
 {"Connected Resources:","Recursos conectados:"}.
-{"Connections parameters","Parámetros de conexiones"}.
 {"Country","País"}.
-{"CPU Time:","Tempo consumido de CPU:"}.
-{"Database","Base de datos"}.
+{"CPU Time:","Tempo da CPU:"}.
+{"Database failure","Erro na base de datos"}.
 {"Database Tables at ~p","Táboas da base de datos en ~p"}.
 {"Database Tables Configuration at ","Configuración de táboas da base de datos en "}.
+{"Database","Base de datos"}.
 {"December","Decembro"}.
 {"Default users as participants","Os usuarios son participantes por defecto"}.
-{"Delete message of the day","Borrar mensaxe do dia"}.
 {"Delete message of the day on all hosts","Borrar a mensaxe do día en todos os dominios"}.
+{"Delete message of the day","Borrar mensaxe do dia"}.
 {"Delete Selected","Eliminar os seleccionados"}.
 {"Delete User","Borrar usuario"}.
 {"Description:","Descrición:"}.
 {"Disc only copy","Copia en disco soamente"}.
 {"Displayed Groups:","Mostrar grupos:"}.
+{"Don't tell your password to anybody, not even the administrators of the Jabber server.","Non digas o teu contrasinal a ninguén, nin sequera os administradores do servidor Jabber."}.
 {"Dump Backup to Text File at ","Exporta copia de seguridade a ficheiro de texto en "}.
 {"Dump to Text File","Exportar a ficheiro de texto"}.
-{"Edit Properties","Editar propiedades"}.
+{"Duplicated groups are not allowed by RFC6121","Os grupos duplicados non están permitidos por RFC6121"}.
+{"Edit Properties","Editar Propiedades"}.
 {"Either approve or decline the voice request.","Aproba ou rexeita a petición de voz."}.
-{"ejabberd IRC module","Módulo de IRC para ejabberd"}.
 {"ejabberd MUC module","Módulo de MUC para ejabberd"}.
 {"ejabberd Multicast service","Servizo Multicast de ejabberd"}.
 {"ejabberd Publish-Subscribe module","Módulo de Publicar-Subscribir de ejabberd"}.
 {"ejabberd SOCKS5 Bytestreams module","Módulo SOCKS5 Bytestreams para ejabberd"}.
 {"ejabberd vCard module","Módulo vCard para ejabberd"}.
-{"ejabberd Web Admin","Ejabberd Administrador Web"}.
+{"ejabberd Web Admin","ejabberd Administrador Web"}.
 {"Elements","Elementos"}.
 {"Email","Email"}.
 {"Enable logging","Gardar históricos"}.
-{"Encoding for server ~b","Codificación de servidor ~b"}.
+{"Enabling push without 'node' attribute is not supported","Non se admite a activación do empuxe sen o atributo 'nodo'"}.
 {"End User Session","Pechar sesión de usuario"}.
-{"Enter list of {Module, [Options]}","Introduce lista de {Módulo, [Opcións]}"}.
 {"Enter nickname you want to register","Introduce o alcume que queiras rexistrar"}.
 {"Enter path to backup file","Introduce ruta ao ficheiro de copia de seguridade"}.
 {"Enter path to jabberd14 spool dir","Introduce a ruta ao directorio de jabberd14 spools"}.
 {"Enter path to jabberd14 spool file","Introduce ruta ao ficheiro jabberd14 spool"}.
 {"Enter path to text file","Introduce ruta ao ficheiro de texto"}.
 {"Enter the text you see","Introduza o texto que ves"}.
-{"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.","Introduce o nome de usuario e codificaciones de carácteres que queiras usar ao conectar nos servidores de IRC. Presione 'Siguiente' para obtener más campos para rellenar Presione 'completo' para guardar axustes."}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Introduce o nome de usuario, codificaciones de carácteres, portos e contrasinai que queiras usar ao conectar nos servidores de IRC"}.
 {"Erlang Jabber Server","Servidor Jabber en Erlang"}.
 {"Error","Erro"}.
-{"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Exemplo: [{\"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:","Exportar todas as táboas a un ficheiro SQL:"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Exportar datos de todos os usuarios do servidor a ficheros PIEFXIS (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Exportar datos dos usuarios dun dominio a ficheiros PIEFXIS (XEP-0227):"}.
+{"External component failure","Fallo de compoñente externo"}.
+{"External component timeout","Paso o tempo de espera do compoñente externo"}.
+{"Failed to activate bytestream","Fallo ao activar bytestream"}.
 {"Failed to extract JID from your voice request approval","Fallo ao extraer o Jabber ID da túa aprobación de petición de voz"}.
+{"Failed to map delegated namespace to external component","O mapeo de espazo de nomes delegado fallou ao compoñente externo"}.
+{"Failed to parse HTTP response","Non se puido analizar a resposta HTTP"}.
 {"Family Name","Apelido"}.
 {"February","Febreiro"}.
-{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","Enche o formulario para buscar usuarios Jabber (Engade * ao final dun campo para buscar subcadenas)"}.
+{"File larger than ~w bytes","O ficheiro é maior que ~w bytes"}.
 {"Friday","Venres"}.
 {"From","De"}.
-{"From ~s","De ~s"}.
 {"Full Name","Nome completo"}.
 {"Get Number of Online Users","Ver número de usuarios conectados"}.
 {"Get Number of Registered Users","Ver número de usuarios rexistrados"}.
 {"Get User Last Login Time","Ver data da última conexión de usuario"}.
 {"Get User Password","Ver contrasinal de usuario"}.
 {"Get User Statistics","Ver estatísticas de usuario"}.
+{"Given Name","Nome"}.
 {"Group ","Grupo "}.
 {"Groups","Grupos"}.
 {"has been banned","foi bloqueado"}.
-{"has been kicked because of an affiliation change","foi expulsado debido a un cambio de afiliación"}.
 {"has been kicked because of a system shutdown","foi expulsado porque o sistema vaise a deter"}.
+{"has been kicked because of an affiliation change","foi expulsado debido a un cambio de afiliación"}.
 {"has been kicked because the room has been changed to members-only","foi expulsado, porque a sala cambiouse a só-membros"}.
 {"has been kicked","foi expulsado"}.
-{" has set the subject to: "," puxo o asunto: "}.
+{"Host unknown","Dominio descoñecido"}.
 {"Host","Host"}.
 {"If you don't see the CAPTCHA image here, visit the web page.","Si non ves a imaxe CAPTCHA aquí, visita a páxina 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.","Se quere especificar codificaciones de caracteres diferentes, contrasinal ou servidor IRC rechea esta lista con valores no formato '{\"servidor irc\", \"codificación\", \"porto\", \"contrasinal\"}'.  Este servizo utiliza por defecto a codificación \"~s\", porto ~p, sen contrasinal."}.
 {"Import Directory","Importar directorio"}.
 {"Import File","Importar ficheiro"}.
 {"Import user data from jabberd14 spool file:","Importar usuario de ficheiro spool de jabberd14:"}.
@@ -131,29 +131,27 @@
 {"Import users data from jabberd14 spool directory:","Importar usuarios do directorio spool de jabberd14:"}.
 {"Import Users from Dir at ","Importar usuarios desde o directorio en "}.
 {"Import Users From jabberd14 Spool Files","Importar usuarios de ficheiros spool de jabberd-1.4"}.
+{"Improper domain part of 'from' attribute","Parte de dominio impropio no atributo 'from'"}.
 {"Improper message type","Tipo de mensaxe incorrecta"}.
 {"Incoming s2s Connections:","Conexións S2S saíntes:"}.
+{"Incorrect CAPTCHA submit","O CAPTCHA proporcionado é incorrecto"}.
+{"Incorrect data form","Formulario de datos incorrecto"}.
 {"Incorrect password","Contrasinal incorrecta"}.
+{"Incorrect value of 'action' attribute","Valor incorrecto do atributo 'action'"}.
+{"Incorrect value of 'action' in data form","Valor incorrecto de 'action' no formulario de datos"}.
+{"Incorrect value of 'path' in data form","Valor incorrecto de 'path' no formulario de datos"}.
+{"Insufficient privilege","Privilexio insuficiente"}.
+{"Invalid 'from' attribute in forwarded message","Atributo 'from'' non é válido na mensaxe reenviada"}.
+{"Invitations are not allowed in this conference","As invitacións non están permitidas nesta sala"}.
 {"IP addresses","Direccións IP"}.
-{"IP","IP"}.
-{"IRC channel (don't put the first #)","Canle de IRC (non poñer o primeiro #)"}.
-{"IRC server","Servidor IRC"}.
-{"IRC settings","IRC axustes"}.
-{"IRC Transport","Transporte IRC"}.
-{"IRC username","Nome de usuario en IRC"}.
-{"IRC Username","Nome de usuario en IRC"}.
-{"is now known as","cámbiase o nome a"}.
-{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","Non está permitido enviar mensaxes de erro á sala. Este participante (~s) enviou unha mensaxe de erro (~s) e foi expulsado da sala"}.
-{"It is not allowed to send private messages","Non está permitido enviar mensaxes privadas"}.
+{"is now known as","agora coñécese como"}.
 {"It is not allowed to send private messages of type \"groupchat\"","Non está permitido enviar mensaxes privadas do tipo \"groupchat\""}.
 {"It is not allowed to send private messages to the conference","Impedir o envio de mensaxes privadas á sala"}.
+{"It is not allowed to send private messages","Non está permitido enviar mensaxes privadas"}.
 {"Jabber Account Registration","Rexistro de conta Jabber"}.
 {"Jabber ID","Jabber ID"}.
 {"January","Xaneiro"}.
-{"Join IRC channel","Entrar en canle IRC"}.
 {"joins the room","entra na sala"}.
-{"Join the IRC channel here.","Únete á canle de IRC aquí."}.
-{"Join the IRC channel in this Jabber ID: ~s","Únete á canle de IRC con este IDE de Jabber: ~s"}.
 {"July","Xullo"}.
 {"June","Xuño"}.
 {"Last Activity","Última actividade"}.
@@ -161,9 +159,6 @@
 {"Last month","Último mes"}.
 {"Last year","Último ano"}.
 {"leaves the room","sae da sala"}.
-{"Listened Ports at ","Portos de escoita en "}.
-{"Listened Ports","Portos de escoita"}.
-{"List of modules to start","Lista de módulos a iniciar"}.
 {"List of rooms","Lista de salas"}.
 {"Low level update script","Script de actualización a baixo nivel"}.
 {"Make participants list public","A lista de participantes é pública"}.
@@ -173,37 +168,64 @@
 {"Make room password protected","Protexer a sala con contrasinal"}.
 {"Make room persistent","Sala permanente"}.
 {"Make room public searchable","Sala publicamente visible"}.
+{"Malformed username","Nome de usuario mal formado"}.
 {"March","Marzo"}.
 {"Maximum Number of Occupants","Número máximo de ocupantes"}.
 {"May","Maio"}.
 {"Membership is required to enter this room","Necesitas ser membro desta sala para poder entrar"}.
 {"Members:","Membros:"}.
-{"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.","Memorice o seu contrasinal ou escribilo nun papel colocado nun lugar seguro. En Jabber non hai unha forma automatizada para recuperar o seu contrasinal si a esquece"}.
+{"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.","Memorice o seu contrasinal ou escribilo nun papel colocado nun lugar seguro. En Jabber non hai unha forma automatizada para recuperar o seu contrasinal si a esquece."}.
 {"Memory","Memoria"}.
 {"Message body","Corpo da mensaxe"}.
+{"Message not found in forwarded payload","Mensaxe non atopada no contido reenviado"}.
 {"Middle Name","Segundo nome"}.
 {"Moderator privileges required","Necesítase privilexios de moderador"}.
 {"Modified modules","Módulos Modificados"}.
-{"Module","Módulo"}.
-{"Modules at ~p","Módulos en ~p"}.
-{"Modules","Módulos"}.
+{"Module failed to handle the query","O módulo non puido xestionar a consulta"}.
 {"Monday","Luns"}.
 {"Multicast","Multicast"}.
+{"Multiple <item/> elements are not allowed by RFC6121","Múltiples elementos <item/> non están permitidos por RFC6121"}.
 {"Multi-User Chat","Salas de Charla"}.
-{"Name:","Nome:"}.
 {"Name","Nome"}.
+{"Name:","Nome:"}.
+{"Neither 'jid' nor 'nick' attribute found","Non se atopou o atributo 'jid' nin 'nick'"}.
+{"Neither 'role' nor 'affiliation' attribute found","Non se atopou o atributo 'role' nin 'affiliation'"}.
 {"Never","Nunca"}.
 {"New Password:","Novo contrasinal:"}.
-{"Nickname","Alcume"}.
 {"Nickname Registration at ","Rexistro do alcume en "}.
-{"Nickname ~s does not exist in the room","O alcume ~s non existe na sala"}.
+{"Nickname","Alcume"}.
+{"No 'affiliation' attribute found","Non se atopou o atributo de 'affiliation'"}.
+{"No available resource found","Non se atopou ningún recurso"}.
 {"No body provided for announce message","Non se proporcionou corpo de mensaxe para o anuncio"}.
+{"No data form found","Non se atopou formulario de datos"}.
 {"No Data","Sen datos"}.
+{"No features available","Non hai características dispoñibles"}.
+{"No hook has processed this command","Ningún evento procesou este comando"}.
+{"No info about last activity found","Non se atopou información sobre a última actividade"}.
+{"No 'item' element found","Non se atopou o elemento 'item'"}.
+{"No items found in this query","Non se atoparon elementos nesta consulta"}.
+{"No limit","Sen límite"}.
+{"No module is handling this query","Ningún módulo manexa esta consulta"}.
+{"No node specified","Non se especificou nodo"}.
+{"No 'password' found in data form","Non se atopou 'password' no formulario de datos"}.
+{"No 'password' found in this query","Non se atopou 'password' nesta solicitude"}.
+{"No 'path' found in data form","Non se atopou 'path' neste formulario de datos"}.
+{"No pending subscriptions found","Non se atoparon subscricións pendentes"}.
+{"No privacy list with this name found","Non se atopou ningunha lista de privacidade con este nome"}.
+{"No private data found in this query","Non se atopou ningún elemento de datos privado nesta solicitude"}.
+{"No running node found","Non se atoparon nodos activos"}.
+{"No services available","Non hai servizos dispoñibles"}.
+{"No statistics found for this item","Non se atopou ningunha estatística para este elemento"}.
+{"No 'to' attribute found in the invitation","O atributo 'to' non se atopou na invitación"}.
+{"Node already exists","O nodo xa existe"}.
+{"Node index not found","Non se atopou índice de nodo"}.
 {"Node not found","Nodo non atopado"}.
 {"Node ~p","Nodo ~p"}.
+{"Nodeprep has failed","Nodeprep fallou"}.
 {"Nodes","Nodos"}.
 {"None","Ningún"}.
 {"Not Found","Non atopado"}.
+{"Not subscribed","Non subscrito"}.
 {"November","Novembro"}.
 {"Number of online users","Número de usuarios conectados"}.
 {"Number of registered users","Número de usuarios rexistrados"}.
@@ -212,9 +234,11 @@
 {"Offline Messages:","Mensaxes sen conexión:"}.
 {"OK","Aceptar"}.
 {"Old Password:","Contrasinal anterior:"}.
-{"Online","Conectado"}.
-{"Online Users:","Usuarios conectados:"}.
 {"Online Users","Usuarios conectados"}.
+{"Online Users:","Usuarios conectados:"}.
+{"Online","Conectado"}.
+{"Only <enable/> or <disable/> tags are allowed","Só se permiten etiquetas <enable/> ou <disable/>"}.
+{"Only <list/> element is allowed in this query","Só se admite o elemento <list/> nesta consulta"}.
 {"Only members may query archives of this room","Só membros poden consultar o arquivo de mensaxes da sala"}.
 {"Only moderators and participants are allowed to change the subject in this room","Só os moderadores e os participantes se lles permite cambiar o tema nesta sala"}.
 {"Only moderators are allowed to change the subject in this room","Só os moderadores están autorizados a cambiar o tema nesta sala"}.
@@ -222,53 +246,47 @@
 {"Only occupants are allowed to send messages to the conference","Só os ocupantes poden enviar mensaxes á sala"}.
 {"Only occupants are allowed to send queries to the conference","Só os ocupantes poden enviar solicitudes á sala"}.
 {"Only service administrators are allowed to send service messages","Só os administradores do servizo teñen permiso para enviar mensaxes de servizo"}.
-{"Options","Opcións"}.
 {"Organization Name","Nome da organización"}.
 {"Organization Unit","Unidade da organización"}.
-{"Outgoing s2s Connections:","Conexións S2S saíntes:"}.
 {"Outgoing s2s Connections","Conexións S2S saíntes"}.
+{"Outgoing s2s Connections:","Conexións S2S saíntes:"}.
 {"Owner privileges required","Requírense privilexios de propietario da sala"}.
 {"Packet","Paquete"}.
-{"Password ~b","Contrasinal ~b"}.
-{"Password:","Contrasinal:"}.
-{"Password","Contrasinal"}.
-{"Password Verification:","Verificación da contrasinal"}.
 {"Password Verification","Verificación da contrasinal"}.
+{"Password Verification:","Verificación da Contrasinal:"}.
+{"Password","Contrasinal"}.
+{"Password:","Contrasinal:"}.
 {"Path to Dir","Ruta ao directorio"}.
 {"Path to File","Ruta ao ficheiro"}.
 {"Pending","Pendente"}.
 {"Period: ","Periodo: "}.
-{"Permanent rooms","Salas permanentes"}.
+{"Ping query is incorrect","A solicitude de Ping é 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.","Ten en conta que estas opcións só farán copia de seguridade da base de datos Mnesia. Se está a utilizar o módulo de ODBC, tamén necesita unha copia de seguridade da súa base de datos SQL por separado."}.
 {"Please, wait for a while before sending new voice request","Por favor, espera un pouco antes de enviar outra petición de voz"}.
 {"Pong","Pong"}.
-{"Port ~b","Porto ~b"}.
-{"Port","Porto"}.
-{"private, ","privado"}.
-{"Protocol","Protocolo"}.
+{"Possessing 'ask' attribute is not allowed by RFC6121","Posuír o atributo 'ask' non está permitido por RFC6121"}.
+{"private, ","privado, "}.
 {"Publish-Subscribe","Publicar-Subscribir"}.
 {"PubSub subscriber request","Petición de subscriptor de PubSub"}.
 {"Queries to the conference members are not allowed in this room","Nesta sala non se permiten solicitudes aos membros da sala"}.
+{"Query to another users is forbidden","É prohibido enviar solicitudes a outros usuarios"}.
 {"RAM and disc copy","Copia en RAM e disco"}.
 {"RAM copy","Copia en RAM"}.
-{"Raw","Cru"}.
 {"Really delete message of the day?","¿Está seguro que quere borrar a mensaxe do dia?"}.
 {"Recipient is not in the conference room","O receptor non está na sala de conferencia"}.
 {"Register a Jabber account","Rexistrar unha conta Jabber"}.
-{"Registered nicknames","Alcumes rexistrados"}.
-{"Registered Users:","Usuarios rexistrados:"}.
 {"Registered Users","Usuarios rexistrados"}.
+{"Registered Users:","Usuarios rexistrados:"}.
 {"Register","Rexistrar"}.
-{"Registration in mod_irc for ","Rexistro en mod_irc para"}.
 {"Remote copy","Copia remota"}.
 {"Remove All Offline Messages","Borrar Todas as Mensaxes Sen conexión"}.
-{"Remove","Borrar"}.
 {"Remove User","Eliminar usuario"}.
+{"Remove","Borrar"}.
 {"Replaced by new connection","Substituído por unha nova conexión"}.
 {"Resources","Recursos"}.
-{"Restart","Reiniciar"}.
 {"Restart Service","Reiniciar o servizo"}.
+{"Restart","Reiniciar"}.
 {"Restore Backup from File at ","Restaura copia de seguridade desde o ficheiro en "}.
 {"Restore binary backup after next ejabberd restart (requires less memory):","Restaurar copia de seguridade binaria no seguinte reinicio de ejabberd (require menos memoria):"}.
 {"Restore binary backup immediately:","Restaurar inmediatamente copia de seguridade binaria:"}.
@@ -279,22 +297,19 @@
 {"Room description","Descrición da sala"}.
 {"Room Occupants","Ocupantes da sala"}.
 {"Room title","Título da sala"}.
-{"Roster","Lista de contactos"}.
-{"Roster of ","Lista de contactos de "}.
 {"Roster size","Tamaño da lista de contactos"}.
+{"Roster","Lista de contactos"}.
 {"RPC Call Error","Erro na chamada RPC"}.
 {"Running Nodes","Nodos funcionando"}.
-{"~s access rule configuration","Configuración das Regra de Acceso ~s"}.
 {"Saturday","Sábado"}.
 {"Script check","Comprobación de script"}.
 {"Search Results for ","Buscar resultados por "}.
 {"Search users in ","Buscar usuarios en "}.
-{"Send announcement to all online users","Enviar anuncio a todos os usuarios conectados"}.
 {"Send announcement to all online users on all hosts","Enviar anuncio a todos os usuarios conectados en todos os dominios"}.
-{"Send announcement to all users","Enviar anuncio a todos os usuarios"}.
+{"Send announcement to all online users","Enviar anuncio a todos os usuarios conectados"}.
 {"Send announcement to all users on all hosts","Enviar anuncio a todos os usuarios en todos os dominios"}.
+{"Send announcement to all users","Enviar anuncio a todos os usuarios"}.
 {"September","Setembro"}.
-{"Server ~b","Servidor ~b"}.
 {"Server:","Servidor:"}.
 {"Set message of the day and send to online users","Pór mensaxe do dia e enviar a todos os usuarios conectados"}.
 {"Set message of the day on all hosts and send to online users","Pór mensaxe do día en todos os dominios e enviar aos usuarios conectados"}.
@@ -302,17 +317,10 @@
 {"Show Integral Table","Mostrar Táboa Integral"}.
 {"Show Ordinary Table","Mostrar Táboa Ordinaria"}.
 {"Shut Down Service","Deter o servizo"}.
-{"~s invites you to the room ~s","~s invítache á 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.","Algúns clientes Jabber pode almacenar o contrasinal no computador, pero debe facer isto só no seu computador persoal por razóns de seguridade."}.
-{"~s's Offline Messages Queue","Cola de mensaxes diferidas de ~s"}.
-{"Start","Iniciar"}.
-{"Start Modules at ","Iniciar módulos en "}.
-{"Start Modules","Iniciar módulos"}.
-{"Statistics","Estatísticas"}.
 {"Statistics of ~p","Estatísticas de ~p"}.
+{"Statistics","Estatísticas"}.
 {"Stop","Deter"}.
-{"Stop Modules at ","Deter módulos en "}.
-{"Stop Modules","Deter módulos"}.
 {"Stopped Nodes","Nodos detidos"}.
 {"Storage Type","Tipo de almacenamento"}.
 {"Store binary backup:","Gardar copia de seguridade binaria:"}.
@@ -320,15 +328,21 @@
 {"Subject","Asunto"}.
 {"Submit","Enviar"}.
 {"Submitted","Enviado"}.
+{"Subscriptions are not allowed","Non se permiten subscricións"}.
 {"Subscription","Subscripción"}.
 {"Sunday","Domingo"}.
 {"That nickname is already in use by another occupant","Ese alcume xa está a ser usado por outro ocupante"}.
 {"That nickname is registered by another person","O alcume xa está rexistrado por outra persoa"}.
 {"The CAPTCHA is valid.","O CAPTCHA é válido."}.
 {"The CAPTCHA verification has failed","A verificación de CAPTCHA fallou"}.
-{"the password is","a contrasinal é"}.
+{"The feature requested is not supported by the conference","A sala de conferencias non admite a función solicitada"}.
+{"The password contains unacceptable characters","O contrasinal contén caracteres inaceptables"}.
 {"The password is too weak","O contrasinal é demasiado débil"}.
+{"the password is","a contrasinal é"}.
 {"The password of your Jabber account was successfully changed.","O contrasinal da súa conta Jabber cambiouse correctamente."}.
+{"The query is only allowed from local users","A solicitude só se permite para usuarios locais"}.
+{"The query must not contain <item/> elements","A solicitude non debe conter elementos <item/>"}.
+{"The stanza MUST contain only one <active/> element, one <default/> element, or one <list/> element","A estroa DEBEN conter un elemento <active/>, un elemento <default/> ou un elemento <list/>"}.
 {"There was an error changing the password: ","Produciuse un erro ao cambiar o contrasinal: "}.
 {"There was an error creating the account: ","Produciuse un erro ao crear a conta: "}.
 {"There was an error deleting the account: ","Produciuse un erro ao eliminar a conta: "}.
@@ -337,12 +351,16 @@
 {"This page allows to unregister a Jabber account in this Jabber server.","Esta páxina permite anular o rexistro dunha conta Jabber neste servidor Jabber."}.
 {"This room is not anonymous","Sala non anónima"}.
 {"Thursday","Xoves"}.
-{"Time","Data"}.
 {"Time delay","Atraso temporal"}.
-{"Too many CAPTCHA requests","Demasiadas peticións de CAPTCHA"}.
+{"Time","Data"}.
+{"Token TTL","Token TTL"}.
+{"Too many active bytestreams","Demasiados bytestreams activos"}.
+{"Too many CAPTCHA requests","Demasiadas solicitudes CAPTCHA"}.
+{"Too many <item/> elements","Demasiados elementos <item/>"}.
+{"Too many <list/> elements","Demasiados elementos <list/>"}.
 {"Too many unacked stanzas","Demasiadas mensaxes sen recoñecer recibilos"}.
+{"Too many users in this conference","Demasiados usuarios nesta sala"}.
 {"To","Para"}.
-{"To ~s","A ~s"}.
 {"Total rooms","Salas totais"}.
 {"Traffic rate limit is exceeded","Hase exedido o límite de tráfico"}.
 {"Transactions Aborted:","Transaccións abortadas:"}.
@@ -351,25 +369,32 @@
 {"Transactions Restarted:","Transaccións reiniciadas:"}.
 {"Tuesday","Martes"}.
 {"Unable to generate a CAPTCHA","No se pudo generar un CAPTCHA"}.
+{"Unable to register route on existing local domain","Non se pode rexistrar a ruta no dominio local existente"}.
 {"Unauthorized","Non autorizado"}.
+{"Unexpected action","Acción inesperada"}.
 {"Unregister a Jabber account","Eliminar o rexistro dunha conta Jabber"}.
 {"Unregister","Eliminar rexistro"}.
-{"Update","Actualizar"}.
+{"Unsupported <index/> element","Elemento <index/> non soportado"}.
 {"Update message of the day (don't send)","Actualizar mensaxe do dia, pero non envialo"}.
 {"Update message of the day on all hosts (don't send)","Actualizar a mensaxe do día en todos os dominos (pero non envialo)"}.
 {"Update ~p","Actualizar ~p"}.
 {"Update plan","Plan de actualización"}.
 {"Update script","Script de actualización"}.
+{"Update","Actualizar"}.
 {"Uptime:","Tempo desde o inicio:"}.
-{"Use of STARTTLS required","Requírese o uso de STARTTLS"}.
+{"User already exists","O usuario xa existe"}.
+{"User (jid)","Usuario (jid)"}.
 {"User Management","Administración de usuarios"}.
+{"User session not found","Sesión de usuario non atopada"}.
+{"User session terminated","Sesión de usuario completada"}.
 {"Username:","Nome de usuario:"}.
 {"Users are not allowed to register accounts so quickly","Os usuarios non están autorizados a rexistrar contas con tanta rapidez"}.
 {"Users Last Activity","Última actividade dos usuarios"}.
-{"User ~s","Usuario ~s"}.
 {"Users","Usuarios"}.
 {"User","Usuario"}.
 {"Validate","Validar"}.
+{"Value 'get' of 'type' attribute is not allowed","O valor \"get\" do atributo 'type' non está permitido"}.
+{"Value 'set' of 'type' attribute is not allowed","O valor \"set\" do atributo 'type' non está permitido"}.
 {"vCard User Search","vCard busqueda de usuario"}.
 {"Virtual Hosts","Hosts Virtuais"}.
 {"Visitors are not allowed to change their nicknames in this room","Os visitantes non teñen permitido cambiar os seus alcumes nesta sala"}.
@@ -378,14 +403,14 @@
 {"Voice requests are disabled in this conference","As peticións de voz están desactivadas nesta sala"}.
 {"Wednesday","Mércores"}.
 {"You can later change your password using a Jabber client.","Máis tarde, pode cambiar o seu contrasinal utilizando un cliente Jabber."}.
-{"You have been banned from this room","fuches bloqueado nesta sala"}.
+{"You have been banned from this room","Fuches bloqueado nesta sala"}.
+{"You have joined too many conferences","Entrou en demasiadas salas de conferencia"}.
 {"You must fill in field \"Nickname\" in the form","Debes encher o campo \"Alcumo\" no formulario"}.
 {"You need a client that supports x:data and CAPTCHA to register","Necesitas un cliente con soporte de x:data e CAPTCHA para rexistrarche"}.
 {"You need a client that supports x:data to register the nickname","Necesitas un cliente con soporte de x:data para poder rexistrar o alcume"}.
-{"You need an x:data capable client to configure mod_irc settings","Necesitas un cliente con soporte de x:data para configurar as opcións de mod_irc"}.
 {"You need an x:data capable client to search","Necesitas un cliente con soporte de x:data para poder buscar"}.
 {"Your active privacy list has denied the routing of this stanza.","A súa lista de privacidade activa negou o encaminamiento desta estrofa."}.
 {"Your contact offline message queue is full. The message has been discarded.","A túa cola de mensaxes diferidas de contactos está chea. A mensaxe descartouse."}.
 {"Your Jabber account was successfully created.","A súa conta Jabber creouse correctamente."}.
 {"Your Jabber account was successfully deleted.","A súa conta Jabber eliminouse correctamente."}.
-{"Your messages to ~s are being blocked. To unblock them, visit ~s","As súas mensaxes a ~s encóntranse bloqueadas. Para desbloquear, visite ~s"}.
+{"You're not allowed to create nodes","Non tes permiso para crear nodos"}.

priv/msgs/he.msg

@@ -1,12 +1,8 @@
-%% -*- coding: latin-1 -*-
+%% -*- coding: utf-8 -*-
+{" has set the subject to: "," הגדיר/ה את הנושא אל: "}.
+{"A password is required to enter this room","נדרשת סיסמה כדי להיכנס אל חדר זה"}.
 {"Accept","קבל"}.
-{"Access Configuration","תצורת גישה"}.
-{"Access Control List Configuration","תצורת רשימת בקרת גישה"}.
-{"Access control lists","רשימות בקרת גישה"}.
-{"Access Control Lists","רשימות בקרת גישה"}.
 {"Access denied by service policy","גישה נדחתה על ידי פוליסת שירות"}.
-{"Access rules","כללי גישה"}.
-{"Access Rules","כללי גישה"}.
 {"Action on user","פעולה על משתמש"}.
 {"Add Jabber ID","הוסף מזהה Jabber"}.
 {"Add New","הוסף חדש"}.
@@ -15,6 +11,7 @@
 {"Administration","הנהלה"}.
 {"Administrator privileges required","נדרשות הרשאות מנהל"}.
 {"All activity","כל פעילות"}.
+{"All Users","כל המשתמשים"}.
 {"Allow users to change the subject","התר למשתמשים לשנות את הנושא"}.
 {"Allow users to query other users","התר למשתמשים לתשאל משתמשים אחרים"}.
 {"Allow users to send invites","התר למשתמשים לשלוח הזמנות"}.
@@ -22,20 +19,22 @@
 {"Allow visitors to change nickname","התר למבקרים לשנות שם כינוי"}.
 {"Allow visitors to send private messages to","התר למבקרים לשלוח הודעות פרטיות אל"}.
 {"Allow visitors to send status text in presence updates","התר למבקרים לשלוח טקסט מצב בתוך עדכוני נוכחות"}.
-{"All Users","כל המשתמשים"}.
 {"Announcements","בשורות"}.
-{"A password is required to enter this room","נדרשת סיסמה כדי להיכנס אל חדר זה"}.
 {"April","אפריל"}.
 {"August","אוגוסט"}.
+{"Automatic node creation is not enabled","יצירה אוטומטית של צומת אינה מאופשרת"}.
 {"Backup Management","ניהול גיבוי"}.
 {"Backup of ~p","גיבוי של ~p"}.
 {"Backup to File at ","גבה לקובץ אצל "}.
 {"Backup","גיבוי"}.
 {"Bad format","פורמט רע"}.
 {"Birthday","יום הולדת"}.
-{"CAPTCHA web page","עמוד רשת CAPTCHA"}.
+{"Cannot remove active list","לא ניתן להסיר רשימה פעילה"}.
+{"Cannot remove default list","לא ניתן להסיר רשימה שגרתית"}.
 {"Change Password","שנה סיסמה"}.
 {"Change User Password","שנה סיסמת משתמש"}.
+{"Changing password is not allowed","שינוי סיסמה אינו מותר"}.
+{"Changing role/affiliation is not allowed","שינוי תפקיד/שיוך אינו מותר"}.
 {"Characters not allowed:","תווים לא מורשים:"}.
 {"Chatroom configuration modified","תצורת חדר שיחה שונתה"}.
 {"Chatroom is created","חדר שיחה נוצר כעת"}.
@@ -44,18 +43,16 @@
 {"Chatroom is stopped","חדר שיחה הינו מופסק"}.
 {"Chatrooms","חדרי שיחה"}.
 {"Choose a username and password to register with this server","בחר שם משתמש וסיסמה כדי להירשם בעזרת שרת זה"}.
-{"Choose modules to stop","בחר מודולים להפסקה"}.
 {"Choose storage type of tables","בחר טיפוס אחסון של טבלאות"}.
 {"Choose whether to approve this entity's subscription.","בחר האם לאשר את ההרשמה של ישות זו."}.
 {"City","עיר"}.
 {"Commands","פקודות"}.
 {"Conference room does not exist","חדר ועידה לא קיים"}.
-{"Configuration of room ~s","תצורת חדר ~s"}.
 {"Configuration","תצורה"}.
 {"Connected Resources:","משאבים מחוברים:"}.
-{"Connections parameters","פרמטרים של חיבור"}.
 {"Country","ארץ"}.
 {"CPU Time:","זמן מחשב (CPU):"}.
+{"Database failure","כשל מסד נתונים"}.
 {"Database Tables at ~p","טבלאות מסד נתונים אצל ~p"}.
 {"Database Tables Configuration at ","תצורת טבלאות מסד נתונים אצל "}.
 {"Database","מסד נתונים"}.
@@ -73,7 +70,6 @@
 {"Dump to Text File","השלך לקובץ טקסט"}.
 {"Edit Properties","ערוך מאפיינים"}.
 {"Either approve or decline the voice request.","אשר או דחה בקשת ביטוי."}.
-{"ejabberd IRC module","מודול IRC של ejabberd"}.
 {"ejabberd MUC module","מודול MUC של ejabberd"}.
 {"ejabberd Multicast service","שירות שידור מרובב של ejabberd"}.
 {"ejabberd Publish-Subscribe module","מודול Publish-Subscribe של ejabberd"}.
@@ -83,29 +79,25 @@
 {"Elements","אלמנטים"}.
 {"Email","דוא״ל"}.
 {"Enable logging","אפשר רישום פעילות"}.
-{"Encoding for server ~b","קידוד עבור שרת ~b"}.
 {"End User Session","סיים סשן משתמש"}.
-{"Enter list of {Module, [Options]}","הזן רשימה של {מודול, [אפשרויות]}"}.
 {"Enter nickname you want to register","הזן שם כינוי אשר ברצונך לרשום"}.
 {"Enter path to backup file","הזן נתיב לקובץ גיבוי"}.
 {"Enter path to jabberd14 spool dir","הזן נתיב למדור סליל (spool dir) של jabberd14"}.
 {"Enter path to jabberd14 spool file","הזן נתיב לקובץ סליל (spool file) של jabberd14"}.
 {"Enter path to text file","הזן נתיב לקובץ טקסט"}.
 {"Enter the text you see","הזן את הכיתוב שאתה רואה"}.
-{"Enter username and encodings you wish to use for connecting to IRC servers.  Press 'Next' to get more fields to fill in.  Press 'Complete' to save settings.","הזן שם משתמש וקידודים בהם ברצונך להשתמש לצורך התחברות לשרתי IRC.  לחץ 'הבא' כדי להשיג עוד שדות למילוי.  לחץ 'סיים' כדי לשמור הגדרות."}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","הזן שם משתמש, קידודים, פורטים וסיסמאות בהם ברצונך להשתמש לצורך התחברות לשרתי IRC"}.
 {"Erlang Jabber Server","שרת ג׳אבּר Erlang"}.
 {"Error","שגיאה"}.
-{"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","דוגמא: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
 {"Export all tables as SQL queries to a file:","יצא את כל הטבלאות בתור שאילתות SQL לתוך קובץ:"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","יצא מידע של כל המשתמשים שבתוך שרת זה לתוך קבצי PIEFXIS ‏(XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","יצא מידע של כל המשתמשים שבתוך מארח לתוך קבצי PIEFXIS ‏(XEP-0227):"}.
+{"Failed to activate bytestream","נכשל להפעיל bytestream"}.
 {"Failed to extract JID from your voice request approval","נכשל לחלץ JID מתוך אישור בקשת הביטוי שלך"}.
+{"Failed to parse HTTP response","נכשל לפענח תגובת HTTP"}.
 {"Family Name","שם משפחה"}.
 {"February","פברואר"}.
-{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","מלא את הטופס כדי לחפש אחר כל משתמש Jabber מבוקש (באפשרותך להוסיף * בסוף שדה כדי להתאים למחרוזת-משנה)"}.
+{"File larger than ~w bytes","קובץ גדול יותר משיעור של ~w בייטים"}.
 {"Friday","יום שישי"}.
-{"From ~s","מאת ~s"}.
 {"From","מאת"}.
 {"Full Name","שם מלא"}.
 {"Get Number of Online Users","השג מספר של משתמשים מקוונים"}.
@@ -113,17 +105,17 @@
 {"Get User Last Login Time","השג זמן כניסה אחרון של משתמש"}.
 {"Get User Password","השג סיסמת משתמש"}.
 {"Get User Statistics","השג סטטיסטיקת משתמש"}.
-{"Groups","קבוצות"}.
+{"Given Name","שם פרטי"}.
 {"Group ","קבוצה "}.
+{"Groups","קבוצות"}.
 {"has been banned","נאסר/ה"}.
-{"has been kicked because of an affiliation change","נבעט/ה משום שינוי סינוף"}.
 {"has been kicked because of a system shutdown","נבעט/ה משום כיבוי מערכת"}.
+{"has been kicked because of an affiliation change","נבעט/ה משום שינוי סינוף"}.
 {"has been kicked because the room has been changed to members-only","נבעט/ה משום שהחדר שונה אל חברים-בלבד"}.
 {"has been kicked","נבעט/ה"}.
-{" has set the subject to: "," הגדיר/ה את הנושא אל: "}.
+{"Host unknown","מארח לא ידוע"}.
 {"Host","מארח"}.
 {"If you don't see the CAPTCHA image here, visit the web page.","אם אינך רואה תמונת CAPTCHA כאן, בקר בעמוד רשת."}.
-{"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","אם ברצונך לציין פורטים, סיסמאות, קידודים אחרים עבור שרתים של IRC, מלא את רשימה זו עם ערכים בפורמט '{\"irc server\", \"encoding\", port, \"password\"}'.  באופן שגרתי שירות זה משתמש בקידוד \"~s\", פורט ~p, סיסמה ריקה."}.
 {"Import Directory","ייבוא מדור"}.
 {"Import File","ייבוא קובץ"}.
 {"Import user data from jabberd14 spool file:","יבא נתוני משתמש מתוך קובץ סליל (spool file) של jabberd14:"}.
@@ -134,27 +126,20 @@
 {"Import Users From jabberd14 Spool Files","יבא משתמשים מתוך קבצי סליל (Spool Files) של jabberd14"}.
 {"Improper message type","טיפוס הודעה לא מתאים"}.
 {"Incoming s2s Connections:","חיבורי s2s נכנסים:"}.
+{"Incorrect CAPTCHA submit","נשלחה CAPTCHA שגויה"}.
+{"Incorrect data form","טופס מידע לא תקין"}.
 {"Incorrect password","מילת מעבר שגויה"}.
+{"Insufficient privilege","הרשאה לא מספיקה"}.
+{"Invitations are not allowed in this conference","הזמנות אינן מותרות בועידה זו"}.
 {"IP addresses","כתובות IP"}.
-{"IP","‫IP"}.
-{"IRC channel (don't put the first #)","ערוץ IRC (אל תשים סימן # ראשון)"}.
-{"IRC server","שרת IRC"}.
-{"IRC settings","הגדרות IRC"}.
-{"IRC Transport","טרנספורט IRC"}.
-{"IRC username","שם משתמש IRC"}.
-{"IRC Username","שם משתמש IRC"}.
 {"is now known as","ידועה כעת בכינוי"}.
-{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","אין זה מותר לשלוח הודעות שגיאה לחדר. משתתף זה (~s) שלח הודעת שגיאה (~s) ונבעט מתוך החדר"}.
 {"It is not allowed to send private messages of type \"groupchat\"","אין זה מותר לשלוח הודעות פרטיות מן טיפוס \"groupchat\""}.
 {"It is not allowed to send private messages to the conference","אין זה מותר לשלוח הודעות פרטיות לועידה"}.
 {"It is not allowed to send private messages","אין זה מותר לשלוח הודעות פרטיות"}.
 {"Jabber Account Registration","רישום חשבון Jabber"}.
 {"Jabber ID","מזהה Jabber"}.
 {"January","ינואר"}.
-{"Join IRC channel","הצטרף לערוץ IRC"}.
 {"joins the room","נכנס/ת אל החדר"}.
-{"Join the IRC channel here.","הצטרף לערוץ IRC כאן."}.
-{"Join the IRC channel in this Jabber ID: ~s","הצטרף לערוץ IRC במזהה Jabber זה: ~s"}.
 {"July","יולי"}.
 {"June","יוני"}.
 {"Last Activity","פעילות אחרונה"}.
@@ -162,9 +147,6 @@
 {"Last month","חודש אחרון"}.
 {"Last year","שנה אחרונה"}.
 {"leaves the room","עוזב/ת את החדר"}.
-{"Listened Ports at ","פורטים מואזנים אצל "}.
-{"Listened Ports","פורטים מואזנים"}.
-{"List of modules to start","רשימה של מודולים להפעלה"}.
 {"List of rooms","רשימה של חדרים"}.
 {"Low level update script","תסריט עדכון Low level"}.
 {"Make participants list public","הפוך רשימת משתתפים לפומבית"}.
@@ -174,6 +156,7 @@
 {"Make room password protected","הפוך חדר לחדר מוגן במילת מעבר"}.
 {"Make room persistent","הפוך חדר לחדר קבוע"}.
 {"Make room public searchable","הפוך חדר לחדר שנתון לחיפוש פומבי"}.
+{"Malformed username","שם משתמש פגום"}.
 {"March","מרץ"}.
 {"Maximum Number of Occupants","מספר מרבי של נוכחים"}.
 {"May","מאי"}.
@@ -185,37 +168,51 @@
 {"Middle Name","שם אמצעי"}.
 {"Moderator privileges required","נדרשות הרשאות אחראי"}.
 {"Modified modules","מודולים שהותאמו"}.
-{"Modules at ~p","מודולים אצל ~p"}.
-{"Modules","מודולים"}.
-{"Module","מודול"}.
+{"Module failed to handle the query","מודול נכשל לטפל בשאילתא"}.
 {"Monday","יום שני"}.
 {"Multicast","שידור מרובב"}.
 {"Multi-User Chat","שיחה מרובת משתמשים"}.
-{"Name:","שם:"}.
 {"Name","שם"}.
+{"Name:","שם:"}.
 {"Never","אף פעם"}.
 {"New Password:","סיסמה חדשה:"}.
 {"Nickname Registration at ","רישום שם כינוי אצל "}.
-{"Nickname ~s does not exist in the room","שם כינוי ~s לא קיים בחדר"}.
 {"Nickname","שם כינוי"}.
+{"No available resource found","לא נמצא משאב זמין"}.
 {"No body provided for announce message","לא סופק גוף עבור הודעת בשורה"}.
 {"No Data","אין מידע"}.
+{"No features available","אין תכונות זמינות"}.
+{"No items found in this query","לא נמצאו פריטים בתוך שאילתא זו"}.
+{"No limit","ללא הגבלה"}.
+{"No module is handling this query","אין מודול אשר מטפל בשאילתא זו"}.
+{"No node specified","לא צויין צומת"}.
+{"No pending subscriptions found","לא נמצאו הרשמות ממתינות"}.
+{"No privacy list with this name found","לא נמצאה רשימת פרטיות בשם זה"}.
+{"No private data found in this query","לא נמצא מידע פרטי בתוך שאילתא זו"}.
+{"No running node found","לא נמצא צומת מורץ"}.
+{"No services available","אין שירות זמין"}.
+{"No statistics found for this item","לא נמצאה סטטיסטיקה לגבי פריט זה"}.
+{"Node already exists","צומת כבר קיים"}.
+{"Node index not found","מפתח צומת לא נמצא"}.
 {"Node not found","צומת לא נמצא"}.
 {"Node ~p","צומת ~p"}.
+{"Nodeprep has failed","‏Nodeprep נכשל"}.
 {"Nodes","צמתים"}.
 {"None","אין"}.
 {"Not Found","לא נמצא"}.
+{"Not subscribed","לא רשום"}.
 {"November","נובמבר"}.
 {"Number of online users","מספר של משתמשים מקוונים"}.
 {"Number of registered users","מספר של משתמשים רשומים"}.
 {"October","אוקטובר"}.
-{"Offline Messages:","הודעות לא מקוונות:"}.
 {"Offline Messages","הודעות לא מקוונות"}.
+{"Offline Messages:","הודעות לא מקוונות:"}.
 {"OK","אישור"}.
 {"Old Password:","סיסמה ישנה:"}.
-{"Online Users:","משתמשים מקוונים:"}.
 {"Online Users","משתמשים מקוונים"}.
+{"Online Users:","משתמשים מקוונים:"}.
 {"Online","מקוון"}.
+{"Only <enable/> or <disable/> tags are allowed","רק תגיות <enable/> או <disable/> הינן מורשות"}.
 {"Only members may query archives of this room","רק חברים רשאים לתשאל ארכיונים של חדר זה"}.
 {"Only moderators and participants are allowed to change the subject in this room","רק אחראים ומשתתפים רשאים לשנות את הנושא בחדר זה"}.
 {"Only moderators are allowed to change the subject in this room","רק אחראים רשאים לשנות את הנושא בחדר זה"}.
@@ -223,45 +220,37 @@
 {"Only occupants are allowed to send messages to the conference","רק נוכחים רשאים לשלוח הודעות אל הועידה"}.
 {"Only occupants are allowed to send queries to the conference","רק נוכחים רשאים לשלוח שאילתות אל הועידה"}.
 {"Only service administrators are allowed to send service messages","רק מנהלי שירות רשאים לשלוח הודעות שירות"}.
-{"Options","אפשרויות"}.
 {"Organization Name","שם ארגון"}.
 {"Organization Unit","יחידת איגוד"}.
-{"Outgoing s2s Connections:","חיבורי s2s יוצאים:"}.
 {"Outgoing s2s Connections","חיבורי s2s יוצאים"}.
+{"Outgoing s2s Connections:","חיבורי s2s יוצאים:"}.
 {"Owner privileges required","נדרשות הרשאות בעלים"}.
 {"Packet","חבילת מידע"}.
-{"Password ~b","סיסמה ~b"}.
-{"Password Verification:","אימות סיסמה:"}.
 {"Password Verification","אימות סיסמה"}.
-{"Password:","סיסמה:"}.
+{"Password Verification:","אימות סיסמה:"}.
 {"Password","סיסמה"}.
+{"Password:","סיסמה:"}.
 {"Path to Dir","נתיב למדור"}.
 {"Path to File","נתיב לקובץ"}.
 {"Pending","ממתינות"}.
 {"Period: ","משך זמן: "}.
-{"Permanent rooms","חדרים קבועים"}.
+{"Ping query is incorrect","שאילתת פינג הינה שגויה"}.
 {"Ping","פינג"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","אנא שים לב כי אפשרויות אלו יגבו את מסד הנתונים המובנה Mnesia בלבד. אם הינך עושה שימוש במודול ODBC, עליך גם לגבות את מסד הנתונים SQL אשר מצוי ברשותך בנפרד."}.
 {"Please, wait for a while before sending new voice request","אנא, המתן לזמן מה לפני שליחת בקשת ביטוי חדשה"}.
 {"Pong","פונג"}.
-{"Port ~b","פורט ~b"}.
-{"Port","פורט"}.
 {"private, ","פרטי, "}.
-{"Protocol","פרוטוקול"}.
 {"Publish-Subscribe","‫Publish-Subscribe"}.
 {"PubSub subscriber request","בקשת מנוי PubSub"}.
 {"Queries to the conference members are not allowed in this room","שאילתות אל חברי הועידה אינן מותרות בחדר זה"}.
 {"RAM and disc copy","העתק RAM וגם תקליטור"}.
 {"RAM copy","העתק RAM"}.
-{"Raw","גולמי"}.
 {"Really delete message of the day?","באמת למחוק את בשורת היום?"}.
 {"Recipient is not in the conference room","מקבל אינו מצוי בחדר הועידה"}.
 {"Register a Jabber account","רשום חשבון Jabber"}.
-{"Registered nicknames","שמות כינוי רשומים"}.
-{"Registered Users:","משתמשים רשומים:"}.
 {"Registered Users","משתמשים רשומים"}.
+{"Registered Users:","משתמשים רשומים:"}.
 {"Register","הרשם"}.
-{"Registration in mod_irc for ","רישום בתוך mod_irc עבור "}.
 {"Remote copy","העתק מרוחק"}.
 {"Remove All Offline Messages","הסר את כל ההודעות הלא מקוונות"}.
 {"Remove User","הסר משתמש"}.
@@ -280,12 +269,10 @@
 {"Room description","תיאור חדר"}.
 {"Room Occupants","נוכחי חדר"}.
 {"Room title","כותרת חדר"}.
-{"Roster of ","רשימה של "}.
 {"Roster size","גודל רשימה"}.
 {"Roster","רשימה"}.
 {"RPC Call Error","שגיאת קריאת RPC"}.
 {"Running Nodes","צמתים מורצים"}.
-{"~s access rule configuration","~s תצורת כללי גישה"}.
 {"Saturday","יום שבת"}.
 {"Script check","בדיקת תסריט"}.
 {"Search Results for ","תוצאות חיפוש עבור "}.
@@ -295,7 +282,6 @@
 {"Send announcement to all users on all hosts","שלח בשורה לכל המשתמשים בכל המארחים"}.
 {"Send announcement to all users","שלח בשורה לכל המשתמשים"}.
 {"September","ספטמבר"}.
-{"Server ~b","שרת ~b"}.
 {"Server:","שרת:"}.
 {"Set message of the day and send to online users","קבע את בשורת היום ושלח למשתמשים מקוונים"}.
 {"Set message of the day on all hosts and send to online users","קבע את בשורת היום בכל המארחים ושלח למשתמשים מקוונים"}.
@@ -303,16 +289,9 @@
 {"Show Integral Table","הצג טבלה אינטגרלית"}.
 {"Show Ordinary Table","הצג טבלה רגילה"}.
 {"Shut Down Service","כבה שירות"}.
-{"~s invites you to the room ~s","‫~s מזמינך לחדר ~s"}.
 {"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","ישנם לקוחות Jabber אשר מסוגלים לאחסן את הסיסמה שלך בתוך המחשב, אולם עליך לעשות זאת רק בתוך המחשב האישי שלך מסיבות ביטחוניות."}.
-{"~s's Offline Messages Queue","תור הודעות לא מקוונות של ~s"}.
-{"Start Modules at ","התחל מודולים אצל "}.
-{"Start Modules","התחל מודולים"}.
-{"Start","התחל"}.
 {"Statistics of ~p","סטטיסטיקות של ~p"}.
 {"Statistics","סטטיסטיקה"}.
-{"Stop Modules at ","הפסק מודולים אצל "}.
-{"Stop Modules","הפסק מודולים"}.
 {"Stopped Nodes","צמתים שנפסקו"}.
 {"Stop","הפסק"}.
 {"Storage Type","טיפוס אחסון"}.
@@ -321,6 +300,7 @@
 {"Subject","נושא"}.
 {"Submitted","נשלח"}.
 {"Submit","שלח"}.
+{"Subscriptions are not allowed","הרשמות אינן מורשות"}.
 {"Subscription","הרשמה"}.
 {"Sunday","יום ראשון"}.
 {"That nickname is already in use by another occupant","שם כינוי זה כבר מצוי בשימוש על ידי נוכח אחר"}.
@@ -340,9 +320,11 @@
 {"Thursday","יום חמישי"}.
 {"Time delay","זמן שיהוי"}.
 {"Time","זמן"}.
+{"Token TTL","סימן TTL"}.
+{"Too many active bytestreams","יותר מדי יחידות bytestream פעילות"}.
 {"Too many CAPTCHA requests","יותר מדי בקשות CAPTCHA"}.
 {"Too many unacked stanzas","יותר מדי סטנזות בלי אישורי קבלה"}.
-{"To ~s","אל ~s"}.
+{"Too many users in this conference","יותר מדי משתמשים בועידה זו"}.
 {"Total rooms","חדרים סה״כ"}.
 {"To","לכבוד"}.
 {"Traffic rate limit is exceeded","מגבלת שיעור תעבורה נחצתה"}.
@@ -353,6 +335,7 @@
 {"Tuesday","יום שלישי"}.
 {"Unable to generate a CAPTCHA","אין אפשרות להפיק CAPTCHA"}.
 {"Unauthorized","לא מורשה"}.
+{"Unexpected action","פעולה לא צפויה"}.
 {"Unregister a Jabber account","בטל רישום חשבון Jabber"}.
 {"Unregister","בטל רישום"}.
 {"Update message of the day (don't send)","עדכן את בשורת היום (אל תשלח)"}.
@@ -362,12 +345,14 @@
 {"Update script","תסריט עדכון"}.
 {"Update","עדכן"}.
 {"Uptime:","זמן פעילות:"}.
-{"Use of STARTTLS required","נדרש שימוש של STARTTLS"}.
+{"User already exists","משתמש כבר קיים"}.
+{"User (jid)","משתמש (jid)"}.
 {"User Management","ניהול משתמשים"}.
+{"User session not found","סשן משתמש לא נמצא"}.
+{"User session terminated","סשן משתמש הסתיים"}.
 {"Username:","שם משתמש:"}.
 {"Users are not allowed to register accounts so quickly","משתמשים אינם מורשים לרשום חשבונות כל כך במהירות"}.
 {"Users Last Activity","פעילות משתמשים אחרונה"}.
-{"User ~s","משתמש ~s"}.
 {"Users","משתמשים"}.
 {"User","משתמש"}.
 {"Validate","הענק תוקף"}.
@@ -380,13 +365,13 @@
 {"Wednesday","יום רביעי"}.
 {"You can later change your password using a Jabber client.","באפשרותך לשנות את הסיסמה שלך מאוחר יותר באמצעות לקוח Jabber."}.
 {"You have been banned from this room","נאסרת מן חדר זה"}.
+{"You have joined too many conferences","הצטרפת ליותר מדי ועידות"}.
 {"You must fill in field \"Nickname\" in the form","עליך למלא את השדה \"שם כינוי\" בתוך התבנית"}.
 {"You need a client that supports x:data and CAPTCHA to register","עליך להשתמש בלקוח אשר תומך x:data וגם CAPTCHA כדי להירשם"}.
 {"You need a client that supports x:data to register the nickname","עליך להשתמש בלקוח אשר תומך x:data כדי לרשום את השם כינוי"}.
-{"You need an x:data capable client to configure mod_irc settings","עליך להשתמש בלקוח אשר מסוגל להבין x:data כדי להגדיר הגדרות mod_irc"}.
 {"You need an x:data capable client to search","עליך להשתמש בלקוח אשר מסוגל להבין x:data כדי לחפש"}.
 {"Your active privacy list has denied the routing of this stanza.","רשימת הפרטיות הפעילה שלך אסרה את הניתוב של סטנזה זו."}.
 {"Your contact offline message queue is full. The message has been discarded.","תור הודעות קשר לא מקוונות הינו מלא. ההודעה סולקה."}.
 {"Your Jabber account was successfully created.","חשבון Jabber נוצר בהצלחה."}.
 {"Your Jabber account was successfully deleted.","חשבון Jabber נמחק בהצלחה."}.
-{"Your messages to ~s are being blocked. To unblock them, visit ~s","ההודעות שלך לערוץ ~s הינן חסומות. כדי לבטל את חסימתן, בקר בכתובת ~s"}.
+{"You're not allowed to create nodes","אינך מורשה ליצור צמתים"}.

priv/msgs/hu.msg

@@ -0,0 +1,498 @@
+%% -*- coding: utf-8 -*-
+{" (Add * to the end of field to match substring)"," (adjon * karaktert a mező végéhez a részkarakterláncra illesztéshez)"}.
+{" has set the subject to: "," beállította a tárgyat erre: "}.
+{"A password is required to enter this room","Jelszó szükséges a szobába történő belépéshez"}.
+{"Accept","Elfogadás"}.
+{"Access denied by service policy","Hozzáférés megtagadva a szolgáltatási irányelv miatt"}.
+{"Account doesn't exist","A fiók nem létezik"}.
+{"Action on user","Művelet a felhasználón"}.
+{"Add Jabber ID","Jabber-azonosító hozzáadása"}.
+{"Add New","Új hozzáadása"}.
+{"Add User","Felhasználó hozzáadása"}.
+{"Administration of ","Adminisztrációja ennek: "}.
+{"Administration","Adminisztráció"}.
+{"Administrator privileges required","Adminisztrátori jogosultságok szükségesek"}.
+{"All activity","Összes tevékenység"}.
+{"All Users","Összes felhasználó"}.
+{"Allow users to change the subject","Lehetővé tenni a felhasználóknak a tárgy megváltoztatását"}.
+{"Allow users to query other users","Lehetővé tenni a felhasználóknak más felhasználók lekérdezését"}.
+{"Allow users to send invites","Lehetővé tenni a felhasználóknak meghívók küldését"}.
+{"Allow users to send private messages","Lehetővé tenni a felhasználóknak személyes üzenetek küldését"}.
+{"Allow visitors to change nickname","Lehetővé tenni a látogatóknak a becenév megváltoztatását"}.
+{"Allow visitors to send private messages to","Lehetővé tenni a látogatóknak személyes üzenetek küldését"}.
+{"Allow visitors to send status text in presence updates","Lehetővé tenni a látogatóknak állapotszöveg küldését a jelenlét frissítéseiben"}.
+{"Announcements","Közlemények"}.
+{"April","április"}.
+{"Attribute 'channel' is required for this request","A „channel” attribútum kötelező ennél a kérésnél"}.
+{"Attribute 'id' is mandatory for MIX messages","Az „id” attribútum kötelező a MIX üzeneteknél"}.
+{"Attribute 'jid' is not allowed here","A „jid” attribútum itt nem engedélyezett"}.
+{"Attribute 'node' is not allowed here","A „node” attribútum itt nem engedélyezett"}.
+{"August","augusztus"}.
+{"Automatic node creation is not enabled","Automatikus csomópont-létrehozás nincs engedélyezve"}.
+{"Backup Management","Biztonságimentés-kezelés"}.
+{"Backup of ~p","~p biztonsági mentése"}.
+{"Backup to File at ","Biztonsági mentés fájlba ekkor: "}.
+{"Backup","Biztonsági mentés"}.
+{"Bad format","Hibás formátum"}.
+{"Birthday","Születésnap"}.
+{"Both the username and the resource are required","A felhasználónév és az erőforrás is szükséges"}.
+{"Bytestream already activated","A bájtfolyam már be van kapcsolva"}.
+{"Cannot remove active list","Nem lehet eltávolítani az aktív listát"}.
+{"Cannot remove default list","Nem lehet eltávolítani az alapértelmezett listát"}.
+{"Change Password","Jelszó megváltoztatása"}.
+{"Change User Password","Felhasználó jelszavának megváltoztatása"}.
+{"Changing password is not allowed","A jelszó megváltoztatása nem engedélyezett"}.
+{"Changing role/affiliation is not allowed","A szerep vagy a hovatartozás megváltoztatása nem engedélyezett"}.
+{"Channel already exists","A csatorna már létezik"}.
+{"Channel does not exist","A csatorna nem létezik"}.
+{"Channels","Csatornák"}.
+{"Characters not allowed:","Nem engedélyezett karakterek:"}.
+{"Chatroom configuration modified","Csevegőszoba beállítása módosítva"}.
+{"Chatroom is created","Csevegőszoba létrehozva"}.
+{"Chatroom is destroyed","Csevegőszoba megszüntetve"}.
+{"Chatroom is started","Csevegőszoba elindítva"}.
+{"Chatroom is stopped","Csevegőszoba leállítva"}.
+{"Chatrooms","Csevegőszobák"}.
+{"Choose a username and password to register with this server","Válasszon felhasználónevet és jelszót a kiszolgálóra történő regisztráláshoz"}.
+{"Choose storage type of tables","Táblák tárolótípusának kiválasztása"}.
+{"Choose whether to approve this entity's subscription.","Annak kiválasztása, hogy elfogadja-e ennek a bejegyzésnek a feliratkozását."}.
+{"City","Település"}.
+{"Client acknowledged more stanzas than sent by server","Az ügyfél több stanzát nyugtázott, mint amennyit a kiszolgáló küldött"}.
+{"Commands","Parancsok"}.
+{"Conference room does not exist","A konferenciaszoba nem létezik"}.
+{"Configuration of room ~ts","A(z) ~ts szoba beállítása"}.
+{"Configuration","Beállítás"}.
+{"Connected Resources:","Kapcsolódott erőforrások:"}.
+{"Country","Ország"}.
+{"CPU Time:","Processzoridő:"}.
+{"Database failure","Adatbázishiba"}.
+{"Database Tables at ~p","Adatbázistáblák itt: ~p"}.
+{"Database Tables Configuration at ","Adatbázistáblák beállítása itt: "}.
+{"Database","Adatbázis"}.
+{"December","december"}.
+{"Default users as participants","Alapértelmezett felhasználók mint résztvevők"}.
+{"Delete content","Tartalom törlése"}.
+{"Delete message of the day on all hosts","Napi üzenet törlése az összes gépen"}.
+{"Delete message of the day","Napi üzenet törlése"}.
+{"Delete Selected","Kijelöltek törlése"}.
+{"Delete table","Tábla törlése"}.
+{"Delete User","Felhasználó törlése"}.
+{"Description:","Leírás:"}.
+{"Disc only copy","Csak lemez másolása"}.
+{"Displayed Groups:","Megjelenített csoportok:"}.
+{"Don't tell your password to anybody, not even the administrators of the Jabber server.","Ne árulja el a jelszavát senkinek, még a Jabber-kiszolgáló adminisztrátorainak sem."}.
+{"Dump Backup to Text File at ","Biztonsági mentés kiírása szövegfájlba itt: "}.
+{"Dump to Text File","Kiírás szövegfájlba"}.
+{"Duplicated groups are not allowed by RFC6121","A kettőzött csoportok nem engedélyezettek az RFC6121 alapján"}.
+{"Edit Properties","Tulajdonságok szerkesztése"}.
+{"Either approve or decline the voice request.","Hagyja jóvá vagy utasítsa el a hangkérelmet."}.
+{"ejabberd HTTP Upload service","ejabberd HTTP feltöltési szolgáltatás"}.
+{"ejabberd MUC module","ejabberd MUC modul"}.
+{"ejabberd Multicast service","ejabberd üzenetszórási szolgáltatás"}.
+{"ejabberd Publish-Subscribe module","ejabberd publikálás-feliratkozás modul"}.
+{"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 bájtfolyam modul"}.
+{"ejabberd vCard module","ejabberd vCard modul"}.
+{"ejabberd Web Admin","ejabberd webes adminisztráció"}.
+{"ejabberd","ejabberd"}.
+{"Elements","Elemek"}.
+{"Email","E-mail"}.
+{"Enable logging","Naplózás engedélyezése"}.
+{"Enabling push without 'node' attribute is not supported","A „node” attribútum nélküli felküldés engedélyezése nem támogatott"}.
+{"End User Session","Felhasználói munkamenet befejezése"}.
+{"Enter nickname you want to register","Adja meg a becenevet, amelyet regisztrálni szeretne"}.
+{"Enter path to backup file","Adja meg a biztonsági mentés fájl útvonalát"}.
+{"Enter path to jabberd14 spool dir","Adja meg a jabberd14 tárolókönyvtár útvonalát"}.
+{"Enter path to jabberd14 spool file","Adja meg a jabberd14 tárolófájl útvonalát"}.
+{"Enter path to text file","Adja meg a szövegfájl útvonalát"}.
+{"Enter the text you see","Írja be a látott szöveget"}.
+{"Erlang Jabber Server","Erlang Jabber-kiszolgáló"}.
+{"Error","Hiba"}.
+{"Export all tables as SQL queries to a file:","Összes tábla exportálása SQL-lekérdezésekként egy fájlba:"}.
+{"Export data of all users in the server to PIEFXIS files (XEP-0227):","A kiszolgálón lévő összes felhasználó adatainak exportálása PIEFXIS-fájlokba (XEP-0227):"}.
+{"Export data of users in a host to PIEFXIS files (XEP-0227):","Egy gépen lévő felhasználók adatainak exportálása PIEFXIS-fájlokba (XEP-0227):"}.
+{"External component failure","Külső összetevő hiba"}.
+{"External component timeout","Külső összetevő időtúllépés"}.
+{"Failed to activate bytestream","Nem sikerült bekapcsolni a bájtfolyamot"}.
+{"Failed to extract JID from your voice request approval","Nem sikerült kinyerni a Jabber-azonosítót a hangkérelem jóváhagyásból"}.
+{"Failed to map delegated namespace to external component","Nem sikerült leképezni a delegált névteret külső összetevőre"}.
+{"Failed to parse HTTP response","Nem sikerült feldolgozni a HTTP választ"}.
+{"Failed to process option '~ts'","Nem sikerült feldolgozni a(z) „~ts” kapcsolót"}.
+{"Family Name","Családnév"}.
+{"February","február"}.
+{"File larger than ~w bytes","A fájl nagyobb ~w bájtnál"}.
+{"Fill in the form to search for any matching Jabber User","Töltse ki az űrlapot bármely egyező Jabber-felhasználóra való kereséshez"}.
+{"Friday","péntek"}.
+{"From ~ts","Feladó: ~ts"}.
+{"From","Feladó"}.
+{"Full Name","Teljes név"}.
+{"Get Number of Online Users","Elérhető felhasználók számának lekérése"}.
+{"Get Number of Registered Users","Regisztrált felhasználók számának lekérése"}.
+{"Get Pending","Függőben lévő lekérése"}.
+{"Get User Last Login Time","Felhasználó legutolsó bejelentkezési idejének lekérése"}.
+{"Get User Password","Felhasználó jelszavának lekérése"}.
+{"Get User Statistics","Felhasználói statisztikák lekérése"}.
+{"Given Name","Keresztnév"}.
+{"Group ","Csoport "}.
+{"Groups","Csoportok"}.
+{"has been banned","ki lett tiltva"}.
+{"has been kicked because of a system shutdown","ki lett rúgva egy rendszerleállítás miatt"}.
+{"has been kicked because of an affiliation change","ki lett rúgva egy hovatartozás megváltozása miatt"}.
+{"has been kicked because the room has been changed to members-only","ki lett rúgva, mert a szobát megváltoztatták csak tagok részére"}.
+{"has been kicked","ki lett rúgva"}.
+{"Host unknown","Gép ismeretlen"}.
+{"Host","Gép"}.
+{"HTTP File Upload","HTTP fájlfeltöltés"}.
+{"Idle connection","Tétlen kapcsolat"}.
+{"If you don't see the CAPTCHA image here, visit the web page.","Ha nem látja itt a CAPTCHA képet, akkor látogassa meg a weboldalt."}.
+{"Import Directory","Könyvtár importálása"}.
+{"Import File","Fájl importálása"}.
+{"Import user data from jabberd14 spool file:","Felhasználóadatok importálása jabberd14 tárolófájlból:"}.
+{"Import User from File at ","Felhasználó importálása fájlból itt: "}.
+{"Import users data from a PIEFXIS file (XEP-0227):","Felhasználók adatainak importálása PIEFXIS-fájlból (XEP-0227):"}.
+{"Import users data from jabberd14 spool directory:","Felhasználók adatainak importálása jabberd14 tárolókönyvtárból:"}.
+{"Import Users from Dir at ","Felhasználók importálása könyvtárból itt: "}.
+{"Import Users From jabberd14 Spool Files","Felhasználók importálása jabberd14 tárolófájlokból"}.
+{"Improper domain part of 'from' attribute","A „from” attribútum tartományrésze helytelen"}.
+{"Improper message type","Helytelen üzenettípus"}.
+{"Incoming s2s Connections:","Bejövő s2s kapcsolatok:"}.
+{"Incorrect CAPTCHA submit","Hibás CAPTCHA beküldés"}.
+{"Incorrect data form","Hibás adatűrlap"}.
+{"Incorrect password","Hibás jelszó"}.
+{"Incorrect value of 'action' attribute","Az „action” attribútum értéke hibás"}.
+{"Incorrect value of 'action' in data form","Az „action” értéke hibás az adatűrlapon"}.
+{"Incorrect value of 'path' in data form","A „path” értéke hibás az adatűrlapon"}.
+{"Insufficient privilege","Nincs elegendő jogosultság"}.
+{"Internal server error","Belső kiszolgálóhiba"}.
+{"Invalid 'from' attribute in forwarded message","Érvénytelen „from” attribútum a továbbított üzenetben"}.
+{"Invalid node name","Érvénytelen csomópontnév"}.
+{"Invalid 'previd' value","Érvénytelen „previd” érték"}.
+{"Invitations are not allowed in this conference","Meghívások nem engedélyezettek ebben a konferenciában"}.
+{"IP addresses","IP-címek"}.
+{"is now known as","mostantól úgy ismert mint"}.
+{"It is not allowed to send error messages to the room. The participant (~ts) has sent an error message (~ts) and got kicked from the room","Nem engedélyezett hibaüzeneteket küldeni a szobába. A résztvevő (~ts) hibaüzenetet (~ts) küldött, és ki lett rúgva a szobából"}.
+{"It is not allowed to send private messages of type \"groupchat\"","Nem engedélyezett „groupchat” típusú személyes üzeneteket küldeni"}.
+{"It is not allowed to send private messages to the conference","Nem engedélyezett személyes üzeneteket küldeni a konferenciába"}.
+{"It is not allowed to send private messages","Nem engedélyezett személyes üzeneteket küldeni"}.
+{"Jabber Account Registration","Jabber-fiók regisztráció"}.
+{"Jabber ID","Jabber-azonosító"}.
+{"January","január"}.
+{"JID normalization denied by service policy","A Jabber-azonosító normalizálása megtagadva a szolgáltatási irányelv miatt"}.
+{"JID normalization failed","A Jabber-azonosító normalizálása nem sikerült"}.
+{"joins the room","belépett a szobába"}.
+{"July","július"}.
+{"June","június"}.
+{"Last Activity","Utolsó tevékenység"}.
+{"Last login","Utolsó belépés"}.
+{"Last month","Múlt hónap"}.
+{"Last year","Múlt év"}.
+{"leaves the room","elhagyta a szobát"}.
+{"List of rooms","Szobák listája"}.
+{"Low level update script","Alacsony szintű frissítő parancsfájl"}.
+{"Make participants list public","Résztvevőlista nyilvánossá tétele"}.
+{"Make room CAPTCHA protected","Szoba CAPTCHA-védetté tétele"}.
+{"Make room members-only","Szoba beállítása csak tagoknak"}.
+{"Make room moderated","Szoba moderálttá tétele"}.
+{"Make room password protected","Szoba jelszóval védetté tétele"}.
+{"Make room persistent","Szoba állandóvá tétele"}.
+{"Make room public searchable","Szoba nyilvánosan kereshetővé tétele"}.
+{"Malformed username","Helytelenül formázott felhasználónév"}.
+{"MAM preference modification denied by service policy","MAM beállítások módosítása megtagadva a szolgáltatási irányelv miatt"}.
+{"March","március"}.
+{"Maximum Number of Occupants","Résztvevők legnagyobb száma"}.
+{"May","május"}.
+{"Members not added (inexistent vhost): ","Tagok nincsenek hozzáadva (nem létező virtuális gép): "}.
+{"Membership is required to enter this room","Tagság szükséges a szobába lépéshez"}.
+{"Members:","Tagok:"}.
+{"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.","Jegyezze meg a jelszavát, vagy írja fel egy biztonságos helyen lévő papírra. A Jabber nem nyújt automatizált módszert a jelszó visszaállítására, ha elfelejti azt."}.
+{"Memory","Memória"}.
+{"Message body","Üzenettörzs"}.
+{"Message not found in forwarded payload","Nem található üzenet a továbbított adatokban"}.
+{"Messages from strangers are rejected","Idegenektől származó üzenetek vissza vannak utasítva"}.
+{"Middle Name","Középső név"}.
+{"Moderator privileges required","Moderátori jogosultságok szükségesek"}.
+{"Modified modules","Módosított modulok"}.
+{"Module failed to handle the query","A modul nem tudta kezelni a lekérdezést"}.
+{"Monday","hétfő"}.
+{"Multicast","Csoportcímzés"}.
+{"Multiple <item/> elements are not allowed by RFC6121","Több <item/> elem nem engedélyezett az RFC6121 alapján"}.
+{"Multi-User Chat","Többfelhasználós csevegés"}.
+{"Name","Név"}.
+{"Name:","Név:"}.
+{"Neither 'jid' nor 'nick' attribute found","Sem a „jid”, sem a „nick” attribútum nem található"}.
+{"Neither 'role' nor 'affiliation' attribute found","Sem a „role”, sem az „affiliation” attribútum nem található"}.
+{"Never","Soha"}.
+{"New Password:","Új jelszó:"}.
+{"Nickname can't be empty","A becenév nem lehet üres"}.
+{"Nickname Registration at ","Becenév regisztrációja itt: "}.
+{"Nickname ~ts does not exist in the room","A(z) ~ts becenév nem létezik a szobában"}.
+{"Nickname","Becenév"}.
+{"No address elements found","Nem találhatók cím elemek"}.
+{"No addresses element found","Nem található címek elem"}.
+{"No 'affiliation' attribute found","Nem található „affiliation” attribútum"}.
+{"No available resource found","Nem található elérhető erőforrás"}.
+{"No body provided for announce message","Nincs törzs megadva a közleményüzenethez"}.
+{"No child elements found","Nem találhatók gyermekelemek"}.
+{"No data form found","Nem található adatűrlap"}.
+{"No Data","Nincs adat"}.
+{"No features available","Nincsenek elérhető funkciók"}.
+{"No <forwarded/> element found","Nem található <forwarded/> elem"}.
+{"No hook has processed this command","Egyetlen horog sem dolgozta fel ezt a parancsot"}.
+{"No info about last activity found","Nem található információ a legutolsó tevékenységgel kapcsolatban"}.
+{"No 'item' element found","Nem található „item” elem"}.
+{"No items found in this query","Nem találhatók elemek ebben a lekérdezésben"}.
+{"No limit","Nincs korlát"}.
+{"No module is handling this query","Egyetlen modul sem kezeli ezt a lekérdezést"}.
+{"No node specified","Nincs csomópont megadva"}.
+{"No 'password' found in data form","Nem található „password” az adatűrlapon"}.
+{"No 'password' found in this query","Nem található „password” ebben a lekérdezésben"}.
+{"No 'path' found in data form","Nem található „path” az adatűrlapon"}.
+{"No pending subscriptions found","Nem találhatók függőben lévő feliratkozások"}.
+{"No privacy list with this name found","Nem található ilyen nevű adatvédelmi lista"}.
+{"No private data found in this query","Nem található személyes adat ebben a lekérdezésben"}.
+{"No running node found","Nem található futó csomópont"}.
+{"No services available","Nincsenek elérhető szolgáltatások"}.
+{"No statistics found for this item","Nem találhatók statisztikák ehhez az elemhez"}.
+{"No 'to' attribute found in the invitation","Nem található „to” attribútum a meghívásban"}.
+{"Node already exists","A csomópont már létezik"}.
+{"Node index not found","A csomópontindex nem található"}.
+{"Node not found","A csomópont nem található"}.
+{"Node ~p","~p csomópont"}.
+{"Nodeprep has failed","A csomópont-előkészítés sikertelen"}.
+{"Nodes","Csomópontok"}.
+{"None","Nincs"}.
+{"Not allowed","Nem engedélyezett"}.
+{"Not Found","Nem található"}.
+{"Not subscribed","Nincs feliratkozva"}.
+{"November","november"}.
+{"Number of online users","Elérhető felhasználók száma"}.
+{"Number of registered users","Regisztrált felhasználók száma"}.
+{"October","október"}.
+{"Offline Messages","Kapcsolat nélküli üzenetek"}.
+{"Offline Messages:","Kapcsolat nélküli üzenetek:"}.
+{"OK","Rendben"}.
+{"Old Password:","Régi jelszó:"}.
+{"Online Users","Elérhető felhasználók"}.
+{"Online Users:","Elérhető felhasználók:"}.
+{"Online","Elérhető"}.
+{"Only <enable/> or <disable/> tags are allowed","Csak az <enable/> vagy <disable/> címkék engedélyezettek"}.
+{"Only <list/> element is allowed in this query","Csak a <list/> elem engedélyezett ebben a lekérdezésben"}.
+{"Only members may query archives of this room","Csak tagok kérdezhetik le ennek a szobának az archívumát"}.
+{"Only moderators and participants are allowed to change the subject in this room","Csak moderátoroknak és résztvevőknek engedélyezett megváltoztatni a tárgyat ebben a szobában"}.
+{"Only moderators are allowed to change the subject in this room","Csak moderátoroknak engedélyezett megváltoztatni a tárgyat ebben a szobában"}.
+{"Only moderators can approve voice requests","Csak moderátorok hagyhatnak jóvá hangkérelmeket"}.
+{"Only occupants are allowed to send messages to the conference","Csak résztvevőknek engedélyezett üzeneteket küldeni a konferenciába"}.
+{"Only occupants are allowed to send queries to the conference","Csak résztvevőknek engedélyezett lekérdezéseket küldeni a konferenciába"}.
+{"Only service administrators are allowed to send service messages","Csak szolgáltatás-adminisztrátoroknak engedélyezett szolgáltatási üzeneteket küldeni"}.
+{"Organization Name","Szervezet neve"}.
+{"Organization Unit","Szervezeti egység"}.
+{"Outgoing s2s Connections","Kimenő s2s kapcsolatok"}.
+{"Outgoing s2s Connections:","Kimenő s2s kapcsolatok:"}.
+{"Owner privileges required","Tulajdonosi jogosultságok szükségesek"}.
+{"Packet relay is denied by service policy","Csomagátjátszás megtagadva a szolgáltatási irányelv miatt"}.
+{"Packet","Csomag"}.
+{"Password Verification","Jelszó ellenőrzése"}.
+{"Password Verification:","Jelszó ellenőrzése:"}.
+{"Password","Jelszó"}.
+{"Password:","Jelszó:"}.
+{"Path to Dir","Útvonal a könyvtárhoz"}.
+{"Path to File","Útvonal a fájlhoz"}.
+{"Pending","Függőben"}.
+{"Period: ","Időszak: "}.
+{"Ping query is incorrect","A lekérdezés pingelése hibás"}.
+{"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.","Ne feledje, hogy ezek a beállítások csak a beépített Mnesia adatbázisról készítenek biztonsági mentést. Ha az ODBC modult használja, akkor az SQL adatbázisról is különálló biztonsági mentést kell készítenie."}.
+{"Please, wait for a while before sending new voice request","Várjon egy kicsit az új hangkérelem küldése előtt"}.
+{"Pong","Pong"}.
+{"Possessing 'ask' attribute is not allowed by RFC6121","Az „ask” attribútum feldolgozása nem engedélyezett az RFC6121 alapján"}.
+{"Previous session not found","Az előző munkamenet nem található"}.
+{"Previous session PID has been killed","Az előző munkamenet folyamat-azonosítója ki lett lőve"}.
+{"Previous session PID has exited","Az előző munkamenet folyamat-azonosítója kilépett"}.
+{"Previous session PID is dead","Az előző munkamenet folyamat-azonosítója halott"}.
+{"Previous session timed out","Az előző munkamenet túllépte az időkorlátot"}.
+{"private, ","személyes, "}.
+{"Publish-Subscribe","Publikálás-feliratkozás"}.
+{"PubSub subscriber request","Publikálás-feliratkozás feliratkozási kérelem"}.
+{"Push record not found","Leküldési rekord nem található"}.
+{"Queries to the conference members are not allowed in this room","A konferenciatagok lekérdezései nem engedélyezettek ebben a szobában"}.
+{"Query to another users is forbidden","Egy másik felhasználó lekérdezése tiltva van"}.
+{"RAM and disc copy","RAM és lemezmásolás"}.
+{"RAM copy","RAM másolás"}.
+{"Really delete message of the day?","Valóban törli a napi üzenetet?"}.
+{"Recipient is not in the conference room","A címzett nincs a konferenciaszobában"}.
+{"Register a Jabber account","Jabber-fiók regisztrációja"}.
+{"Registered Users","Regisztrált felhasználók"}.
+{"Registered Users:","Regisztrált felhasználók:"}.
+{"Register","Regisztráció"}.
+{"Remote copy","Távoli másolás"}.
+{"Remove All Offline Messages","Összes kapcsolat nélküli üzenet eltávolítása"}.
+{"Remove User","Felhasználó eltávolítása"}.
+{"Remove","Eltávolítás"}.
+{"Replaced by new connection","Kicserélve egy új kapcsolattal"}.
+{"Request has timed out","A kérés túllépte az időkorlátot"}.
+{"Request is ignored","A kérés mellőzve lett"}.
+{"Resources","Erőforrások"}.
+{"Restart Service","Szolgáltatás újraindítása"}.
+{"Restart","Újraindítás"}.
+{"Restore Backup from File at ","Biztonsági mentés visszaállítása fájlból itt: "}.
+{"Restore binary backup after next ejabberd restart (requires less memory):","Bináris biztonsági mentés visszaállítása az ejabberd következő újraindítása után (kevesebb memóriát igényel):"}.
+{"Restore binary backup immediately:","Bináris biztonsági mentés visszaállítása azonnal:"}.
+{"Restore plain text backup immediately:","Egyszerű szöveges biztonsági mentés visszaállítása azonnal:"}.
+{"Restore","Visszaállítás"}.
+{"Room Configuration","Szoba beállítása"}.
+{"Room creation is denied by service policy","Szobalétrehozás megtagadva a szolgáltatási irányelv miatt"}.
+{"Room description","Szoba leírása"}.
+{"Room Occupants","Szoba résztvevői"}.
+{"Room terminates","Szoba megszűnik"}.
+{"Room title","Szoba címe"}.
+{"Roster of ~ts","~ts névsora"}.
+{"Roster size","Névsor mérete"}.
+{"Roster","Névsor"}.
+{"RPC Call Error","RPC hívási hiba"}.
+{"Running Nodes","Futó csomópontok"}.
+{"Saturday","szombat"}.
+{"Script check","Parancsfájl-ellenőrzés"}.
+{"Search Results for ","Keresési eredménye ennek: "}.
+{"Search users in ","Felhasználók keresése ebben: "}.
+{"Select All","Összes kijelölése"}.
+{"Send announcement to all online users on all hosts","Közlemény küldése az összes elérhető felhasználónak az összes gépen"}.
+{"Send announcement to all online users","Közlemény küldése az összes elérhető felhasználónak"}.
+{"Send announcement to all users on all hosts","Közlemény küldése az összes felhasználónak az összes gépen"}.
+{"Send announcement to all users","Közlemény küldése az összes felhasználónak"}.
+{"September","szeptember"}.
+{"Server:","Kiszolgáló:"}.
+{"Session state copying timed out","A munkamenet állapotának másolása túllépte az időkorlátot"}.
+{"Set message of the day and send to online users","Napi üzenet beállítása és küldés az elérhető felhasználóknak"}.
+{"Set message of the day on all hosts and send to online users","Napi üzenet beállítása az összes gépen és küldés az elérhető felhasználóknak"}.
+{"Shared Roster Groups","Megosztott névsorcsoportok"}.
+{"Show Integral Table","Integráltáblázat megjelenítése"}.
+{"Show Ordinary Table","Szokásos táblázat megjelenítése"}.
+{"Shut Down Service","Szolgáltatás leállítása"}.
+{"SOCKS5 Bytestreams","SOCKS5 bájtfolyamok"}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Néhány Jabber program el tudja tárolni a jelszavát a számítógépen, de ezt csak a saját személyi számítógépén kell megtennie biztonsági okokból."}.
+{"Statistics of ~p","~p statisztikái"}.
+{"Statistics","Statisztikák"}.
+{"Stop","Leállítás"}.
+{"Stopped Nodes","Leállított csomópontok"}.
+{"Storage Type","Tárolótípus"}.
+{"Store binary backup:","Bináris biztonsági mentés tárolása:"}.
+{"Store plain text backup:","Egyszerű szöveges biztonsági mentés tárolása:"}.
+{"Stream management is already enabled","A folyamkezelés már engedélyezve van"}.
+{"Stream management is not enabled","A folyamkezelés nincs engedélyezve"}.
+{"Subject","Tárgy"}.
+{"Submit","Elküldés"}.
+{"Submitted","Elküldve"}.
+{"Subscription","Feliratkozás"}.
+{"Subscriptions are not allowed","Feliratkozások nem engedélyezettek"}.
+{"Sunday","vasárnap"}.
+{"That nickname is already in use by another occupant","Ezt a becenevet már használja egy másik résztvevő"}.
+{"That nickname is registered by another person","Ezt a becenevet egy másik személy regisztrálta"}.
+{"The account already exists","A fiók már létezik"}.
+{"The account was not deleted","A fiók nem lett törölve"}.
+{"The CAPTCHA is valid.","A CAPTCHA érvényes."}.
+{"The CAPTCHA verification has failed","A CAPTCHA ellenőrzése nem sikerült"}.
+{"The captcha you entered is wrong","A beírt CAPTCHA hibás"}.
+{"The feature requested is not supported by the conference","A kért funkciót nem támogatja a konferencia"}.
+{"The password contains unacceptable characters","A jelszó elfogadhatatlan karaktereket tartalmaz"}.
+{"The password is too weak","A jelszó túl gyenge"}.
+{"the password is","a jelszó"}.
+{"The password of your Jabber account was successfully changed.","A Jabber-fiókjának jelszava sikeresen megváltoztatva."}.
+{"The password was not changed","A jelszó nem lett megváltoztatva"}.
+{"The passwords are different","A jelszavak különböznek"}.
+{"The query is only allowed from local users","A lekérdezés csak helyi felhasználóktól engedélyezett"}.
+{"The query must not contain <item/> elements","A lekérdezés nem tartalmazhat <item/> elemeket"}.
+{"The stanza MUST contain only one <active/> element, one <default/> element, or one <list/> element","A stanzának csak egyetlen <active/> elemet, egyetlen <default/> elemet vagy egyetlen <list/> elemet KELL tartalmaznia"}.
+{"The username is not valid","A felhasználónév nem érvényes"}.
+{"There was an error changing the password: ","Hiba történt a jelszó megváltoztatásakor: "}.
+{"There was an error creating the account: ","Hiba történt a fiók létrehozásakor: "}.
+{"There was an error deleting the account: ","Hiba történt a fiók törlésekor: "}.
+{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Ez érzékeny a kis- és nagybetűkre: a macbeth ugyanaz mint a MacBeth és 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.","Ez az oldal lehetővé teszi egy Jabber-fiók létrehozását ezen a Jabber-kiszolgálón. A JID (Jabber-azonosító) a következő alakú lesz: felhasználónév@kiszolgáló. Alaposan olvassa el az utasításokat a mezők helyes kitöltéséhez."}.
+{"This page allows to unregister a Jabber account in this Jabber server.","Ez az oldal lehetővé teszi egy Jabber-fiók regisztrációjának törlését ezen a Jabber-kiszolgálón."}.
+{"This room is not anonymous","Ez a szoba nem névtelen"}.
+{"This service can not process the address: ~ts","Ez a szolgáltatás nem tudja feldolgozni a címet: ~ts"}.
+{"Thursday","csütörtök"}.
+{"Time delay","Időkésleltetés"}.
+{"Timed out waiting for stream resumption","Időtúllépés a folyam újrakezdésére várakozásnál"}.
+{"Time","Idő"}.
+{"To register, visit ~ts","Regisztráláshoz látogassa meg ezt az oldalt: ~ts"}.
+{"To ~ts","Címzett: ~ts"}.
+{"To","Címzett"}.
+{"Token TTL","Token élettartama"}.
+{"Too many active bytestreams","Túl sok aktív bájtfolyam"}.
+{"Too many CAPTCHA requests","Túl sok CAPTCHA kérés"}.
+{"Too many child elements","Túl sok gyermekelem"}.
+{"Too many <item/> elements","Túl sok <item/> elem"}.
+{"Too many <list/> elements","Túl sok <list/> elem"}.
+{"Too many (~p) failed authentications from this IP address (~ts). The address will be unblocked at ~ts UTC","Túl sok (~p) sikertelen hitelesítés erről az IP-címről (~ts) A cím ~ts-kor lesz feloldva UTC szerint"}.
+{"Too many receiver fields were specified","Túl sok fogadómező lett meghatározva"}.
+{"Too many unacked stanzas","Túl sok nyugtázatlan stanza"}.
+{"Too many users in this conference","Túl sok felhasználó ebben a konferenciában"}.
+{"Total rooms","Szobák összesen"}.
+{"Traffic rate limit is exceeded","Forgalom sebességkorlátja elérve"}.
+{"Transactions Aborted:","Megszakított tranzakciók:"}.
+{"Transactions Committed:","Véglegesített tranzakciók:"}.
+{"Transactions Logged:","Naplózott tranzakciók:"}.
+{"Transactions Restarted:","Újraindított tranzakciók:"}.
+{"~ts invites you to the room ~ts","~ts meghívja Önt a(z) ~ts szobába"}.
+{"~ts's Offline Messages Queue","~ts kapcsolat nélküli üzeneteinek tárolója"}.
+{"Tuesday","kedd"}.
+{"Unable to generate a CAPTCHA","Nem lehet előállítani CAPTCHA-t"}.
+{"Unable to register route on existing local domain","Nem lehet útvonalat regisztrálni egy meglévő helyi tartományon"}.
+{"Unauthorized","Nem engedélyezett"}.
+{"Unexpected action","Váratlan művelet"}.
+{"Unexpected error condition: ~p","Váratlan hibafeltétel: ~p"}.
+{"Unregister a Jabber account","Jabber-fiók regisztrációjának törlése"}.
+{"Unregister","Regisztráció törlése"}.
+{"Unselect All","Összes kijelölésének megszüntetése"}.
+{"Unsupported <index/> element","Nem támogatott <index/> elem"}.
+{"Unsupported version","Nem támogatott verzió"}.
+{"Update message of the day (don't send)","Napi üzenet frissítése (ne küldje el)"}.
+{"Update message of the day on all hosts (don't send)","Napi üzenet frissítése az összes gépen (ne küldje el)"}.
+{"Update plan","Frissítési terv"}.
+{"Update ~p","~p frissítése"}.
+{"Update script","Frissítő parancsfájl"}.
+{"Update","Frissítés"}.
+{"Uptime:","Működési idő:"}.
+{"User already exists","A felhasználó már létezik"}.
+{"User (jid)","Felhasználó (JID)"}.
+{"User Management","Felhasználó-kezelés"}.
+{"User removed","Felhasználó eltávolítva"}.
+{"User session not found","Felhasználói munkamenet nem található"}.
+{"User session terminated","Felhasználói munkamenet befejeződött"}.
+{"User ~ts","~ts felhasználó"}.
+{"User","Felhasználó"}.
+{"Username:","Felhasználónév:"}.
+{"Users are not allowed to register accounts so quickly","A felhasználóknak nem engedélyezett fiókokat regisztrálni ilyen gyorsan"}.
+{"Users Last Activity","Felhasználók utolsó tevékenysége"}.
+{"Users","Felhasználók"}.
+{"Validate","Ellenőrzés"}.
+{"Value 'get' of 'type' attribute is not allowed","A „type” attribútum „get” értéke nem engedélyezett"}.
+{"Value of '~ts' should be boolean","A(z) „~ts” értéke csak logikai lehet"}.
+{"Value of '~ts' should be datetime string","A(z) „~ts” értéke csak dátum és idő karakterlánc lehet"}.
+{"Value of '~ts' should be integer","A(z) „~ts” értéke csak egész szám lehet"}.
+{"Value 'set' of 'type' attribute is not allowed","A „type” attribútum „set” értéke nem engedélyezett"}.
+{"vCard User Search","vCard felhasználó-keresés"}.
+{"Virtual Hosting","Virtuális kiszolgálás"}.
+{"Virtual Hosts","Virtuális gépek"}.
+{"Visitors are not allowed to change their nicknames in this room","A látogatóknak nem engedélyezett megváltoztatni a beceneveiket ebben a szobában"}.
+{"Visitors are not allowed to send messages to all occupants","A látogatóknak nem engedélyezett üzeneteket küldeni az összes résztvevőnek"}.
+{"Voice request","Hangkérelem"}.
+{"Voice requests are disabled in this conference","A hangkérelmek le vannak tiltva ebben a konferenciában"}.
+{"Wednesday","szerda"}.
+{"Wrong parameters in the web formulary","Hibás paraméterek a webes modelldokumentumban"}.
+{"Wrong xmlns","Hibás xmlns"}.
+{"You are being removed from the room because of a system shutdown","El lett távolítva a szobából egy rendszerleállítás miatt"}.
+{"You are not joined to the channel","Nincs csatlakozva a csatornához"}.
+{"You can later change your password using a Jabber client.","Később megváltoztathatja a jelszavát egy Jabber program használatával."}.
+{"You have been banned from this room","Ki lett tiltva ebből a szobából"}.
+{"You have joined too many conferences","Túl sok konferenciához csatlakozott"}.
+{"You must fill in field \"Nickname\" in the form","Ki kell töltenie a „becenév” mezőt az űrlapon"}.
+{"You need a client that supports x:data and CAPTCHA to register","Olyan programra van szüksége, amelynek x:data és CAPTCHA támogatása van a regisztráláshoz"}.
+{"You need a client that supports x:data to register the nickname","Olyan programra van szüksége, amelynek x:data támogatása van a becenév regisztráláshoz"}.
+{"You need an x:data capable client to search","Egy x:data támogatású programra van szüksége a kereséshez"}.
+{"Your active privacy list has denied the routing of this stanza.","Az aktív adatvédelmi listája megtagadta ennek a stanzának az útválasztását."}.
+{"Your contact offline message queue is full. The message has been discarded.","A partnere kapcsolat nélküli üzenettárolója megtelt. Az üzenet el lett dobva."}.
+{"Your Jabber account was successfully created.","A Jabber-fiókja sikeresen létrehozva."}.
+{"Your Jabber account was successfully deleted.","A Jabber-fiókja sikeresen törölve."}.
+{"Your subscription request and/or messages to ~ts have been blocked. To unblock your subscription request, visit ~ts","A feliratkozási kérelme és/vagy ~ts számára küldött üzenetei blokkolva lettek. A feliratkozási kérelmének feloldásához látogassa meg ezt az oldalt: ~ts"}.
+{"You're not allowed to create nodes","Önnek nincs engedélye csomópontokat létrehozni"}.

priv/msgs/id.msg

@@ -1,36 +1,30 @@
-%% -*- coding: latin-1 -*-
-{"Access Configuration","Akses Konfigurasi"}.
-{"Access Control List Configuration","Konfigurasi Daftar Akses Pengendalian"}.
-{"Access Control Lists","Akses Daftar Pengendalian"}.
-{"Access control lists","Daftar Pengendalian Akses"}.
+%% -*- coding: utf-8 -*-
+{" has set the subject to: ","telah menetapkan topik yaitu:"}.
+{"A password is required to enter this room","Diperlukan kata sandi untuk masuk ruangan ini"}.
 {"Access denied by service policy","Akses ditolak oleh kebijakan layanan"}.
-{"Access rules","Akses peraturan"}.
-{"Access Rules","Aturan Akses"}.
 {"Action on user","Tindakan pada pengguna"}.
 {"Add Jabber ID","Tambah Jabber ID"}.
 {"Add New","Tambah Baru"}.
 {"Add User","Tambah Pengguna"}.
-{"Administration","Administrasi"}.
 {"Administration of ","Administrasi"}.
+{"Administration","Administrasi"}.
 {"Administrator privileges required","Hak istimewa Administrator dibutuhkan"}.
 {"All activity","Semua aktifitas"}.
+{"All Users","Semua Pengguna"}.
 {"Allow users to change the subject","Perbolehkan pengguna untuk mengganti topik"}.
 {"Allow users to query other users","Perbolehkan pengguna untuk mengetahui pengguna lain"}.
 {"Allow users to send invites","Perbolehkan pengguna mengirimkan undangan"}.
 {"Allow users to send private messages","perbolehkan pengguna mengirimkan pesan ke pengguna lain secara pribadi"}.
 {"Allow visitors to change nickname","Perbolehkan visitor mengganti nama julukan"}.
 {"Allow visitors to send status text in presence updates","Izinkan pengunjung untuk mengirim teks status terbaru"}.
-{"All Users","Semua Pengguna"}.
 {"Announcements","Pengumuman"}.
-{"A password is required to enter this room","Diperlukan kata sandi untuk masuk ruangan ini"}.
 {"April","April"}.
 {"August","Agustus"}.
-{"Backup","Backup"}.
 {"Backup Management","Manajemen Backup"}.
 {"Backup to File at ","Backup ke File pada"}.
+{"Backup","Backup"}.
 {"Bad format","Format yang buruk"}.
 {"Birthday","Hari Lahir"}.
-{"CAPTCHA web page","CAPTCHA laman web"}.
 {"Change Password","Ubah Kata Sandi"}.
 {"Change User Password","Ubah User Password"}.
 {"Characters not allowed:","Karakter tidak diperbolehkan:"}.
@@ -41,24 +35,21 @@
 {"Chatroom is stopped","Ruang chat dihentikan"}.
 {"Chatrooms","Ruangan Chat"}.
 {"Choose a username and password to register with this server","Pilih nama pengguna dan kata sandi untuk mendaftar dengan layanan ini"}.
-{"Choose modules to stop","Pilih Modul untuk berhenti"}.
 {"Choose storage type of tables","Pilih jenis penyimpanan tabel"}.
 {"Choose whether to approve this entity's subscription.","Pilih apakah akan menyetujui hubungan pertemanan ini."}.
 {"City","Kota"}.
 {"Commands","Perintah"}.
 {"Conference room does not exist","Ruang Konferensi tidak ada"}.
-{"Configuration of room ~s","Pengaturan ruangan ~s"}.
 {"Configuration","Pengaturan"}.
 {"Connected Resources:","Sumber Daya Terhubung:"}.
-{"Connections parameters","Parameter Koneksi"}.
 {"Country","Negara"}.
 {"CPU Time:","Waktu CPU:"}.
-{"Database","Database"}.
 {"Database Tables Configuration at ","Database Tabel Konfigurasi pada"}.
+{"Database","Database"}.
 {"December","Desember"}.
 {"Default users as participants","pengguna pertama kali masuk sebagai participant"}.
-{"Delete message of the day","Hapus pesan harian"}.
 {"Delete message of the day on all hosts","Hapus pesan harian pada semua host"}.
+{"Delete message of the day","Hapus pesan harian"}.
 {"Delete Selected","Hapus Yang Terpilih"}.
 {"Delete User","Hapus Pengguna"}.
 {"Description:","Keterangan:"}.
@@ -68,7 +59,6 @@
 {"Dump Backup to Text File at ","Dump Backup ke File Teks di"}.
 {"Dump to Text File","Dump menjadi File Teks"}.
 {"Edit Properties","Ganti Properti"}.
-{"ejabberd IRC module","ejabberd IRC modul"}.
 {"ejabberd MUC module","ejabberd MUC Module"}.
 {"ejabberd Publish-Subscribe module","Modul ejabberd Setujui-Pertemanan"}.
 {"ejabberd SOCKS5 Bytestreams module","modul ejabberd SOCKS5 Bytestreams"}.
@@ -77,28 +67,21 @@
 {"Elements","Elemen-elemen"}.
 {"Email","Email"}.
 {"Enable logging","Aktifkan catatan"}.
-{"Encoding for server ~b","Pengkodean untuk layanan ~b"}.
 {"End User Session","Akhir Sesi Pengguna"}.
-{"Enter list of {Module, [Options]}","Masukkan daftar {Modul, [Options]}"}.
 {"Enter nickname you want to register","Masukkan nama julukan Anda jika ingin mendaftar"}.
 {"Enter path to backup file","Masukkan path untuk file cadangan"}.
 {"Enter path to jabberd14 spool dir","Masukkan path ke direktori spool jabberd14"}.
 {"Enter path to jabberd14 spool file","Masukkan path ke file jabberd14 spool"}.
 {"Enter path to text file","Masukkan path ke file teks"}.
 {"Enter the text you see","Masukkan teks yang Anda lihat"}.
-{"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.","Masukkan username dan pengkodean yang ingin Anda gunakan untuk menghubungkan ke layanan IRC. Tekan 'Selanjutnya' untuk mendapatkan lagi formulir kemudian Tekan 'Lengkap' untuk menyimpan pengaturan."}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Masukkan username, pengkodean, port dan sandi yang ingin Anda gunakan untuk menghubungkan ke layanan IRC"}.
 {"Erlang Jabber Server","Layanan Erlang Jabber"}.
 {"Error","Kesalahan"}.
-{"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Contoh: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Ekspor data dari semua pengguna pada layanan ke berkas PIEFXIS (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Ekspor data pengguna pada sebuah host ke berkas PIEFXIS (XEP-0227):"}.
 {"Family Name","Nama Keluarga (marga)"}.
 {"February","Februari"}.
-{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","Isi formulir untuk pencarian pengguna Jabber yang cocok (Tambahkan * ke mengakhiri pengisian untuk menyamakan kata)"}.
 {"Friday","Jumat"}.
 {"From","Dari"}.
-{"From ~s","Dari ~s"}.
 {"Full Name","Nama Lengkap"}.
 {"Get Number of Online Users","Dapatkan Jumlah User Yang Online"}.
 {"Get Number of Registered Users","Dapatkan Jumlah Pengguna Yang Terdaftar"}.
@@ -108,14 +91,12 @@
 {"Group ","Grup"}.
 {"Groups","Grup"}.
 {"has been banned","telah dibanned"}.
-{"has been kicked because of an affiliation change","telah dikick karena perubahan afiliasi"}.
 {"has been kicked because of a system shutdown","telah dikick karena sistem shutdown"}.
+{"has been kicked because of an affiliation change","telah dikick karena perubahan afiliasi"}.
 {"has been kicked because the room has been changed to members-only","telah dikick karena ruangan telah diubah menjadi hanya untuk member"}.
 {"has been kicked","telah dikick"}.
-{" has set the subject to: ","telah menetapkan topik yaitu:"}.
 {"Host","Host"}.
 {"If you don't see the CAPTCHA image here, visit the web page.","Jika Anda tidak melihat gambar CAPTCHA disini, silahkan kunjungi halaman 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.","Jika Anda ingin menentukan port yang berbeda, sandi, pengkodean untuk layanan IRC, isi daftar ini dengan nilai-nilai dalam format '{\"server irc \", \"encoding \", port, \"sandi \"}'. Secara default ini menggunakan layanan \"~s \" pengkodean, port ~p, kata sandi kosong."}.
 {"Import Directory","Impor Direktori"}.
 {"Import File","Impor File"}.
 {"Import user data from jabberd14 spool file:","Impor data pengguna dari sekumpulan berkas jabberd14:"}.
@@ -127,24 +108,14 @@
 {"Improper message type","Jenis pesan yang tidak benar"}.
 {"Incorrect password","Kata sandi salah"}.
 {"IP addresses","Alamat IP"}.
-{"IP","IP"}.
-{"IRC channel (don't put the first #)","Channel IRC (tidak perlu menempatkan # sebelumnya)"}.
-{"IRC server","Layanan IRC"}.
-{"IRC settings","Pengaturan IRC"}.
-{"IRC Transport","IRC Transport"}.
-{"IRC username","Nama Pengguna IRC"}.
-{"IRC Username","Nama Pengguna IRC"}.
 {"is now known as","sekarang dikenal sebagai"}.
-{"It is not allowed to send private messages","Hal ini tidak diperbolehkan untuk mengirim pesan pribadi"}.
 {"It is not allowed to send private messages of type \"groupchat\"","Hal ini tidak diperbolehkan untuk mengirim pesan pribadi jenis \"groupchat \""}.
 {"It is not allowed to send private messages to the conference","Hal ini tidak diperbolehkan untuk mengirim pesan pribadi ke konferensi"}.
+{"It is not allowed to send private messages","Hal ini tidak diperbolehkan untuk mengirim pesan pribadi"}.
 {"Jabber Account Registration","Pendaftaran Akun Jabber"}.
 {"Jabber ID","Jabber ID"}.
 {"January","Januari"}.
-{"Join IRC channel","Gabung channel IRC"}.
 {"joins the room","bergabung ke ruangan"}.
-{"Join the IRC channel here.","Gabung ke channel IRC disini"}.
-{"Join the IRC channel in this Jabber ID: ~s","Gabung ke channel IRC dengan Jabber ID: ~s"}.
 {"July","Juli"}.
 {"June","Juni"}.
 {"Last Activity","Aktifitas Terakhir"}.
@@ -152,9 +123,6 @@
 {"Last month","Akhir bulan"}.
 {"Last year","Akhir tahun"}.
 {"leaves the room","meninggalkan ruangan"}.
-{"Listened Ports at ","Mendeteksi Port-port di"}.
-{"Listened Ports","Port Terdeteksi"}.
-{"List of modules to start","Daftar modul untuk memulai"}.
 {"Low level update script","Perbaruan naskah tingkat rendah"}.
 {"Make participants list public","Buat daftar participant diketahui oleh public"}.
 {"Make room CAPTCHA protected","Buat ruangan dilindungi dengan CAPTCHA"}.
@@ -174,18 +142,16 @@
 {"Middle Name","Nama Tengah"}.
 {"Moderator privileges required","Hak istimewa moderator dibutuhkan"}.
 {"Modified modules","Modifikasi modul-modul"}.
-{"Module","Modul"}.
-{"Modules","Modul"}.
 {"Monday","Senin"}.
-{"Name:","Nama:"}.
 {"Name","Nama"}.
+{"Name:","Nama:"}.
 {"Never","Tidak Pernah"}.
 {"New Password:","Password Baru:"}.
-{"Nickname","Nama Julukan"}.
 {"Nickname Registration at ","Pendaftaran Julukan pada"}.
-{"Nickname ~s does not exist in the room","Nama Julukan ~s tidak berada di dalam ruangan"}.
+{"Nickname","Nama Julukan"}.
 {"No body provided for announce message","Tidak ada isi pesan yang disediakan untuk mengirimkan pesan"}.
 {"No Data","Tidak Ada Data"}.
+{"No limit","Tidak terbatas"}.
 {"Node not found","Node tidak ditemukan"}.
 {"Nodes","Node-node"}.
 {"None","Tak satupun"}.
@@ -194,30 +160,28 @@
 {"Number of online users","Jumlah pengguna online"}.
 {"Number of registered users","Jumlah pengguna terdaftar"}.
 {"October","Oktober"}.
-{"Offline Messages:","Pesan Offline:"}.
 {"Offline Messages","Pesan Offline"}.
+{"Offline Messages:","Pesan Offline:"}.
 {"OK","YA"}.
 {"Old Password:","Password Lama:"}.
-{"Online","Online"}.
 {"Online Users:","Pengguna Online:"}.
 {"Online Users","Pengguna Yang Online"}.
+{"Online","Online"}.
 {"Only moderators and participants are allowed to change the subject in this room","Hanya moderator dan peserta yang diizinkan untuk mengganti topik pembicaraan di ruangan ini"}.
 {"Only moderators are allowed to change the subject in this room","Hanya moderator yang diperbolehkan untuk mengubah topik dalam ruangan ini"}.
 {"Only occupants are allowed to send messages to the conference","Hanya penghuni yang diizinkan untuk mengirim pesan ke konferensi"}.
 {"Only occupants are allowed to send queries to the conference","Hanya penghuni diizinkan untuk mengirim permintaan ke konferensi"}.
 {"Only service administrators are allowed to send service messages","Layanan hanya diperuntukan kepada administrator yang diizinkan untuk mengirim layanan pesan"}.
-{"Options","Pilihan-pilihan"}.
 {"Organization Name","Nama Organisasi"}.
 {"Organization Unit","Unit Organisasi"}.
 {"Outgoing s2s Connections","Koneksi Keluar s2s"}.
 {"Outgoing s2s Connections:","Koneksi s2s yang keluar:"}.
 {"Owner privileges required","Hak istimewa owner dibutuhkan"}.
 {"Packet","Paket"}.
-{"Password ~b","Kata Sandi ~b"}.
-{"Password:","Kata Sandi:"}.
-{"Password","Sandi"}.
 {"Password Verification:","Verifikasi Kata Sandi:"}.
 {"Password Verification","Verifikasi Sandi"}.
+{"Password:","Kata Sandi:"}.
+{"Password","Sandi"}.
 {"Path to Dir","Jalur ke Dir"}.
 {"Path to File","Jalur ke File"}.
 {"Pending","Tertunda"}.
@@ -225,57 +189,49 @@
 {"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.","Harap dicatat bahwa pilihan ini hanya akan membuat cadangan builtin Mnesia database. Jika Anda menggunakan modul ODBC, anda juga perlu untuk membuat cadangan database SQL Anda secara terpisah."}.
 {"Pong","Pong"}.
-{"Port ~b","Port ~b"}.
-{"Port","Port"}.
 {"private, ","pribadi, "}.
-{"Protocol","Protocol"}.
 {"Publish-Subscribe","Setujui-Pertemanan"}.
 {"PubSub subscriber request","Permintaan pertemanan PubSub"}.
 {"Queries to the conference members are not allowed in this room","Permintaan untuk para anggota konferensi tidak diperbolehkan di ruangan ini"}.
 {"RAM and disc copy","RAM dan disc salinan"}.
 {"RAM copy","Salinan RAM"}.
-{"Raw","mentah"}.
 {"Really delete message of the day?","Benar-benar ingin menghapus pesan harian?"}.
 {"Recipient is not in the conference room","Penerima tidak berada di ruangan konferensi"}.
 {"Register a Jabber account","Daftarkan sebuah akun jabber"}.
-{"Registered Users:","Pengguna Terdaftar:"}.
 {"Registered Users","Pengguna Terdaftar"}.
+{"Registered Users:","Pengguna Terdaftar:"}.
 {"Register","Mendaftar"}.
-{"Registration in mod_irc for ","Pendaftaran di mod_irc untuk"}.
 {"Remote copy","Salinan Remote"}.
 {"Remove All Offline Messages","Hapus Semua Pesan Offline"}.
-{"Remove","Menghapus"}.
 {"Remove User","Hapus Pengguna"}.
+{"Remove","Menghapus"}.
 {"Replaced by new connection","Diganti dengan koneksi baru"}.
 {"Resources","Sumber daya"}.
-{"Restart","Jalankan Ulang"}.
 {"Restart Service","Restart Layanan"}.
+{"Restart","Jalankan Ulang"}.
 {"Restore Backup from File at ","Kembalikan Backup dari File pada"}.
 {"Restore binary backup after next ejabberd restart (requires less memory):","Mengembalikan cadangan yang berpasanagn setelah ejabberd berikutnya dijalankan ulang (memerlukan memori lebih sedikit):"}.
 {"Restore binary backup immediately:","Segera mengembalikan cadangan yang berpasangan:"}.
-{"Restore","Mengembalikan"}.
 {"Restore plain text backup immediately:","Segera mengembalikan cadangan teks biasa:"}.
+{"Restore","Mengembalikan"}.
 {"Room Configuration","Konfigurasi Ruangan"}.
 {"Room creation is denied by service policy","Pembuatan Ruangan ditolak oleh kebijakan layanan"}.
 {"Room description","Keterangan ruangan"}.
 {"Room Occupants","Penghuni Ruangan"}.
 {"Room title","Nama Ruangan"}.
-{"Roster","Kontak"}.
-{"Roster of ","Kontak dari"}.
 {"Roster size","Ukuran Daftar Kontak"}.
+{"Roster","Kontak"}.
 {"RPC Call Error","Panggilan Kesalahan RPC"}.
 {"Running Nodes","Menjalankan Node"}.
-{"~s access rule configuration","~s aturan akses konfigurasi"}.
 {"Saturday","Sabtu"}.
 {"Script check","Periksa naskah"}.
 {"Search Results for ","Hasil Pencarian untuk"}.
 {"Search users in ","Pencarian pengguna dalam"}.
-{"Send announcement to all online users","Kirim pengumuman untuk semua pengguna yang online"}.
 {"Send announcement to all online users on all hosts","Kirim pengumuman untuk semua pengguna yang online pada semua host"}.
-{"Send announcement to all users","Kirim pengumuman untuk semua pengguna"}.
+{"Send announcement to all online users","Kirim pengumuman untuk semua pengguna yang online"}.
 {"Send announcement to all users on all hosts","Kirim pengumuman untuk semua pengguna pada semua host"}.
+{"Send announcement to all users","Kirim pengumuman untuk semua pengguna"}.
 {"September","September"}.
-{"Server ~b","Layanan ~b"}.
 {"Server:","Layanan:"}.
 {"Set message of the day and send to online users","Mengatur pesan harian dan mengirimkan ke pengguna yang online"}.
 {"Set message of the day on all hosts and send to online users","Mengatur pesan harian pada semua host dan kirimkan ke pengguna yang online"}.
@@ -283,17 +239,10 @@
 {"Show Integral Table","Tampilkan Tabel Terpisah"}.
 {"Show Ordinary Table","Tampilkan Tabel Normal"}.
 {"Shut Down Service","Shut Down Layanan"}.
-{"~s invites you to the room ~s","~s mengundang anda ke ruangan ~s"}.
 {"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Beberapa klien Jabber dapat menyimpan password di komputer Anda. Gunakan fitur itu hanya jika Anda mempercayai komputer Anda aman."}.
-{"~s's Offline Messages Queue","Antrian Pesan Offline ~s"}.
-{"Start Modules at ","Mulai Modul pada"}.
-{"Start Modules","Memulai Modul"}.
-{"Start","Mulai"}.
 {"Statistics of ~p","statistik dari ~p"}.
 {"Statistics","Statistik"}.
 {"Stop","Hentikan"}.
-{"Stop Modules at ","Hentikan Modul pada"}.
-{"Stop Modules","Hentikan Modul"}.
 {"Stopped Nodes","Menghentikan node"}.
 {"Storage Type","Jenis Penyimpanan"}.
 {"Store binary backup:","Penyimpanan cadangan yang berpasangan:"}.
@@ -307,8 +256,8 @@
 {"That nickname is registered by another person","Julukan tersebut telah didaftarkan oleh orang lain"}.
 {"The CAPTCHA is valid.","Captcha ini benar."}.
 {"The CAPTCHA verification has failed","Verifikasi CAPTCHA telah gagal"}.
-{"the password is","kata sandi yaitu:"}.
 {"The password is too weak","Kata sandi terlalu lemah"}.
+{"the password is","kata sandi yaitu:"}.
 {"The password of your Jabber account was successfully changed.","Kata sandi pada akun Jabber Anda telah berhasil diubah."}.
 {"There was an error changing the password: ","Ada kesalahan dalam mengubah password:"}.
 {"There was an error creating the account: ","Ada kesalahan saat membuat akun:"}.
@@ -321,7 +270,6 @@
 {"Time delay","Waktu tunda"}.
 {"Time","Waktu"}.
 {"To","Kepada"}.
-{"To ~s","Kepada ~s"}.
 {"Traffic rate limit is exceeded","Lalu lintas melebihi batas"}.
 {"Transactions Aborted:","Transaksi yang dibatalkan:"}.
 {"Transactions Committed:","Transaksi yang dilakukan:"}.
@@ -332,13 +280,12 @@
 {"Unauthorized","Ditolak"}.
 {"Unregister a Jabber account","Nonaktifkan akun jabber"}.
 {"Unregister","Nonaktifkan"}.
-{"Update","Memperbarui"}.
 {"Update message of the day (don't send)","Rubah pesan harian (tidak dikirim)"}.
 {"Update message of the day on all hosts (don't send)","Rubah pesan harian pada semua host (tidak dikirim)"}.
 {"Update plan","Rencana Perubahan"}.
 {"Update script","Perbarui naskah"}.
+{"Update","Memperbarui"}.
 {"Uptime:","Sampai saat:"}.
-{"Use of STARTTLS required","Penggunaan STARTTLS diperlukan"}.
 {"User Management","Manajemen Pengguna"}.
 {"Username:","Nama Pengguna:"}.
 {"User","Pengguna"}.
@@ -356,10 +303,8 @@
 {"You must fill in field \"Nickname\" in the form","Anda harus mengisi kolom \"Julukan\" dalam formulir"}.
 {"You need a client that supports x:data and CAPTCHA to register","Anda memerlukan klien yang mendukung x:data dan CAPTCHA untuk mendaftar"}.
 {"You need a client that supports x:data to register the nickname","Anda memerlukan klien yang mendukung x:data untuk mendaftar julukan"}.
-{"You need an x:data capable client to configure mod_irc settings","Anda memerlukan x:data klien untuk mampu mengkonfigurasi pengaturan mod_irc"}.
 {"You need an x:data capable client to search","Anda memerlukan x:data klien untuk melakukan pencarian"}.
 {"Your active privacy list has denied the routing of this stanza.","Daftar privasi aktif Anda telah menolak routing ztanza ini"}.
 {"Your contact offline message queue is full. The message has been discarded.","Kontak offline Anda pada antrian pesan sudah penuh. Pesan telah dibuang."}.
 {"Your Jabber account was successfully created.","Jabber akun Anda telah sukses dibuat"}.
 {"Your Jabber account was successfully deleted.","Jabber akun Anda berhasil dihapus."}.
-{"Your messages to ~s are being blocked. To unblock them, visit ~s","Pesan Anda untuk ~s sedang diblokir. Untuk membuka blokir tersebut, kunjungi ~s"}.

priv/msgs/it.msg

@@ -1,19 +1,16 @@
-%% -*- coding: latin-1 -*-
-{"Access Configuration","Configurazione dell'accesso"}.
-{"Access Control List Configuration","Configurazione dei diritti di accesso (ACL)"}.
-{"Access control lists","Diritti di accesso (ACL)"}.
-{"Access Control Lists","Diritti di accesso (ACL)"}.
+%% -*- coding: utf-8 -*-
+{" has set the subject to: "," ha modificato l'oggetto in: "}.
+{"A password is required to enter this room","Per entrare in questa stanza è prevista una password"}.
 {"Access denied by service policy","Accesso impedito dalle politiche del servizio"}.
-{"Access rules","Regole di accesso"}.
-{"Access Rules","Regole di accesso"}.
 {"Action on user","Azione sull'utente"}.
 {"Add Jabber ID","Aggiungere un Jabber ID (Jabber ID)"}.
 {"Add New","Aggiungere nuovo"}.
 {"Add User","Aggiungere un utente"}.
-{"Administration","Amministrazione"}.
 {"Administration of ","Amministrazione di "}.
+{"Administration","Amministrazione"}.
 {"Administrator privileges required","Necessari i privilegi di amministratore"}.
 {"All activity","Tutta l'attività"}.
+{"All Users","Tutti gli utenti"}.
 {"Allow users to change the subject","Consentire agli utenti di cambiare l'oggetto"}.
 {"Allow users to query other users","Consentire agli utenti query verso altri utenti"}.
 {"Allow users to send invites","Consentire agli utenti l'invio di inviti"}.
@@ -21,17 +18,14 @@
 {"Allow visitors to change nickname","Consentire ai visitatori di cambiare il nickname"}.
 {"Allow visitors to send private messages to","Consentire agli ospiti l'invio di messaggi privati a"}.
 {"Allow visitors to send status text in presence updates","Consentire ai visitatori l'invio di testo sullo stato in aggiornamenti sulla presenza"}.
-{"All Users","Tutti gli utenti"}.
 {"Announcements","Annunci"}.
-{"A password is required to enter this room","Per entrare in questa stanza è prevista una password"}.
 {"April","Aprile"}.
 {"August","Agosto"}.
 {"Backup Management","Gestione dei salvataggi"}.
-{"Backup","Salvare"}.
 {"Backup to File at ","Salvataggio sul file "}.
+{"Backup","Salvare"}.
 {"Bad format","Formato non valido"}.
 {"Birthday","Compleanno"}.
-{"CAPTCHA web page","Pagina web CAPTCHA"}.
 {"Change Password","Modificare la password"}.
 {"Change User Password","Cambiare la password dell'utente"}.
 {"Characters not allowed:","Caratteri non consentiti:"}.
@@ -42,24 +36,21 @@
 {"Chatroom is stopped","La stanza è arrestata"}.
 {"Chatrooms","Stanze"}.
 {"Choose a username and password to register with this server","Scegliere un nome utente e una password per la registrazione con questo server"}.
-{"Choose modules to stop","Selezionare i moduli da arrestare"}.
 {"Choose storage type of tables","Selezionare una modalità di conservazione delle tabelle"}.
 {"Choose whether to approve this entity's subscription.","Scegliere se approvare l'iscrizione per questa entità"}.
 {"City","Città"}.
 {"Commands","Comandi"}.
 {"Conference room does not exist","La stanza per conferenze non esiste"}.
 {"Configuration","Configurazione"}.
-{"Configuration of room ~s","Configurazione per la stanza ~s"}.
 {"Connected Resources:","Risorse connesse:"}.
-{"Connections parameters","Parametri delle connessioni"}.
 {"Country","Paese"}.
 {"CPU Time:","Tempo CPU:"}.
-{"Database","Database"}.
 {"Database Tables Configuration at ","Configurazione delle tabelle del database su "}.
+{"Database","Database"}.
 {"December","Dicembre"}.
 {"Default users as participants","Definire per default gli utenti come partecipanti"}.
-{"Delete message of the day","Eliminare il messaggio del giorno (MOTD)"}.
 {"Delete message of the day on all hosts","Eliminare il messaggio del giorno (MOTD) su tutti gli host"}.
+{"Delete message of the day","Eliminare il messaggio del giorno (MOTD)"}.
 {"Delete Selected","Eliminare gli elementi selezionati"}.
 {"Delete User","Eliminare l'utente"}.
 {"Description:","Descrizione:"}.
@@ -70,7 +61,6 @@
 {"Dump to Text File","Trascrivere su file di testo"}.
 {"Edit Properties","Modificare le proprietà"}.
 {"Either approve or decline the voice request.","Approva oppure respingi la richiesta di parola."}.
-{"ejabberd IRC module","Modulo IRC per ejabberd"}.
 {"ejabberd MUC module","Modulo MUC per ejabberd"}.
 {"ejabberd Publish-Subscribe module","Modulo Pubblicazione/Iscrizione (PubSub) per ejabberd"}.
 {"ejabberd SOCKS5 Bytestreams module","Modulo SOCKS5 Bytestreams per ejabberd"}.
@@ -79,29 +69,22 @@
 {"Elements","Elementi"}.
 {"Email","E-mail"}.
 {"Enable logging","Abilitare i log"}.
-{"Encoding for server ~b","Codifica per il server ~b"}.
 {"End User Session","Terminare la sessione dell'utente"}.
-{"Enter list of {Module, [Options]}","Immettere un elenco di {Modulo, [Opzioni]}"}.
 {"Enter nickname you want to register","Immettere il nickname che si vuole registrare"}.
 {"Enter path to backup file","Immettere il percorso del file di salvataggio"}.
 {"Enter path to jabberd14 spool dir","Immettere il percorso della directory di spool di jabberd14"}.
 {"Enter path to jabberd14 spool file","Immettere il percorso del file di spool di jabberd14"}.
 {"Enter path to text file","Immettere il percorso del file di testo"}.
 {"Enter the text you see","Immettere il testo visibile"}.
-{"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.","Immettere il nome utente e le codifiche che si desidera utilizzare per la connessione ai server IRC. Premere \"Avanti\" per vedere i successivi campi da compilare. Premere \"Fatto\" per salvare le impostazioni."}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Immettere il nome utente, le codifiche, le porte e le password che si desidera utilizzare per la connessione ai server IRC"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
 {"Error","Errore"}.
-{"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Esempio: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"segreto\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.serverdiprova.net\", \"utf-8\"}]."}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Esportare i dati di tutti gli utenti nel server in file PIEFXIS (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Esportare i dati degli utenti di un host in file PIEFXIS (XEP-0227):"}.
 {"Failed to extract JID from your voice request approval","Impossibile estrarre il JID dall'approvazione della richiesta di parola"}.
 {"Family Name","Cognome"}.
 {"February","Febbraio"}.
-{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","Riempire il modulo per la ricerca di utenti Jabber corrispondenti ai criteri (Aggiungere * alla fine del campo per la ricerca di una sottostringa"}.
 {"Friday","Venerdì"}.
 {"From","Da"}.
-{"From ~s","Da ~s"}.
 {"Full Name","Nome completo"}.
 {"Get Number of Online Users","Ottenere il numero di utenti online"}.
 {"Get Number of Registered Users","Ottenere il numero di utenti registrati"}.
@@ -111,14 +94,12 @@
 {"Group ","Gruppo "}.
 {"Groups","Gruppi"}.
 {"has been banned","è stata/o bandita/o"}.
-{"has been kicked because of an affiliation change","è stato espulso a causa di un cambiamento di appartenenza"}.
 {"has been kicked because of a system shutdown","è stato espulso a causa dello spegnimento del sistema"}.
+{"has been kicked because of an affiliation change","è stato espulso a causa di un cambiamento di appartenenza"}.
 {"has been kicked because the room has been changed to members-only","è stato espulso per la limitazione della stanza ai soli membri"}.
 {"has been kicked","è stata/o espulsa/o"}.
-{" has set the subject to: "," ha modificato l'oggetto in: "}.
 {"Host","Host"}.
 {"If you don't see the CAPTCHA image here, visit the web page.","Se qui non vedi l'immagine CAPTCHA, visita la pagina 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.","Se si vogliono specificare differenti porte, password, codifiche per i server IRC, si riempia questo elenco con valori nel formato '{\"server IRC\", \"codifica\", porta, \"password\"}'. Per default questo servizio utilizza la codifica \"~s\", la porta ~p, la password vuota."}.
 {"Import Directory","Importare una directory"}.
 {"Import File","Importare un file"}.
 {"Import user data from jabberd14 spool file:","Importare i dati utente da file di spool di jabberd14:"}.
@@ -130,24 +111,14 @@
 {"Improper message type","Tipo di messaggio non corretto"}.
 {"Incorrect password","Password non esatta"}.
 {"IP addresses","Indirizzi IP"}.
-{"IP","IP"}.
-{"IRC channel (don't put the first #)","Canale IRC (senza il # iniziale)"}.
-{"IRC server","Server IRC"}.
-{"IRC settings","Impostazioni IRC"}.
-{"IRC Transport","Transport IRC"}.
-{"IRC username","Nome utente IRC"}.
-{"IRC Username","Nome utente IRC"}.
 {"is now known as","è ora conosciuta/o come"}.
-{"It is not allowed to send private messages","Non è consentito l'invio di messaggi privati"}.
 {"It is not allowed to send private messages of type \"groupchat\"","Non è consentito l'invio di messaggi privati di tipo \"groupchat\""}.
 {"It is not allowed to send private messages to the conference","Non è consentito l'invio di messaggi privati alla conferenza"}.
+{"It is not allowed to send private messages","Non è consentito l'invio di messaggi privati"}.
 {"Jabber Account Registration","Registrazione account Jabber"}.
 {"Jabber ID","Jabber ID (Jabber ID)"}.
 {"January","Gennaio"}.
-{"Join IRC channel","Entra nel canale IRC"}.
 {"joins the room","entra nella stanza"}.
-{"Join the IRC channel here.","Entra nel canale IRC qui."}.
-{"Join the IRC channel in this Jabber ID: ~s","Entra nel canale IRC in questo ID Jabber: ~s"}.
 {"July","Luglio"}.
 {"June","Giugno"}.
 {"Last Activity","Ultima attività"}.
@@ -155,9 +126,6 @@
 {"Last month","Ultimo mese"}.
 {"Last year","Ultimo anno"}.
 {"leaves the room","esce dalla stanza"}.
-{"Listened Ports at ","Porte in ascolto su "}.
-{"Listened Ports","Porte in ascolto"}.
-{"List of modules to start","Elenco dei moduli da avviare"}.
 {"Low level update script","Script di aggiornamento di basso livello"}.
 {"Make participants list public","Rendere pubblica la lista dei partecipanti"}.
 {"Make room CAPTCHA protected","Rendere la stanza protetta da CAPTCHA"}.
@@ -177,18 +145,16 @@
 {"Middle Name","Altro nome"}.
 {"Moderator privileges required","Necessari i privilegi di moderatore"}.
 {"Modified modules","Moduli modificati"}.
-{"Module","Modulo"}.
-{"Modules","Moduli"}.
 {"Monday","Lunedì"}.
-{"Name:","Nome:"}.
 {"Name","Nome"}.
+{"Name:","Nome:"}.
 {"Never","Mai"}.
 {"New Password:","Nuova password:"}.
-{"Nickname","Nickname"}.
 {"Nickname Registration at ","Registrazione di un nickname su "}.
-{"Nickname ~s does not exist in the room","Il nickname ~s non esiste nella stanza"}.
+{"Nickname","Nickname"}.
 {"No body provided for announce message","Nessun corpo fornito per il messaggio di annuncio"}.
 {"No Data","Nessuna informazione"}.
+{"No limit","Nessun limite"}.
 {"Node not found","Nodo non trovato"}.
 {"Nodes","Nodi"}.
 {"None","Nessuno"}.
@@ -197,31 +163,29 @@
 {"Number of online users","Numero di utenti online"}.
 {"Number of registered users","Numero di utenti registrati"}.
 {"October","Ottobre"}.
-{"Offline Messages:","Messaggi offline:"}.
 {"Offline Messages","Messaggi offline"}.
+{"Offline Messages:","Messaggi offline:"}.
 {"OK","OK"}.
 {"Old Password:","Vecchia password:"}.
-{"Online","Online"}.
 {"Online Users:","Utenti connessi:"}.
 {"Online Users","Utenti online"}.
+{"Online","Online"}.
 {"Only moderators and participants are allowed to change the subject in this room","La modifica dell'oggetto di questa stanza è consentita soltanto ai moderatori e ai partecipanti"}.
 {"Only moderators are allowed to change the subject in this room","La modifica dell'oggetto di questa stanza è consentita soltanto ai moderatori"}.
 {"Only moderators can approve voice requests","Soltanto i moderatori possono approvare richieste di parola"}.
 {"Only occupants are allowed to send messages to the conference","L'invio di messaggi alla conferenza è consentito soltanto ai presenti"}.
 {"Only occupants are allowed to send queries to the conference","L'invio di query alla conferenza è consentito ai soli presenti"}.
 {"Only service administrators are allowed to send service messages","L'invio di messaggi di servizio è consentito solamente agli amministratori del servizio"}.
-{"Options","Opzioni"}.
 {"Organization Name","Nome dell'organizzazione"}.
 {"Organization Unit","Unità dell'organizzazione"}.
-{"Outgoing s2s Connections:","Connessioni s2s in uscita:"}.
 {"Outgoing s2s Connections","Connessioni s2s in uscita"}.
+{"Outgoing s2s Connections:","Connessioni s2s in uscita:"}.
 {"Owner privileges required","Necessari i privilegi di proprietario"}.
 {"Packet","Pacchetto"}.
-{"Password ~b","Password ~b"}.
-{"Password:","Password:"}.
-{"Password","Password"}.
-{"Password Verification:","Verifica della password:"}.
 {"Password Verification","Verifica della password"}.
+{"Password Verification:","Verifica della password:"}.
+{"Password","Password"}.
+{"Password:","Password:"}.
 {"Path to Dir","Percorso della directory"}.
 {"Path to File","Percorso del file"}.
 {"Pending","Pendente"}.
@@ -230,31 +194,26 @@
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","N.B.: Queste opzioni comportano il salvataggio solamente del database interno Mnesia. Se si sta utilizzando il modulo ODBC, è necessario salvare anche il proprio database SQL separatamente."}.
 {"Please, wait for a while before sending new voice request","Attendi qualche istante prima di inviare una nuova richiesta di parola"}.
 {"Pong","Pong"}.
-{"Port ~b","Porta ~b"}.
-{"Port","Porta"}.
 {"private, ","privato, "}.
-{"Protocol","Protocollo"}.
 {"Publish-Subscribe","Pubblicazione-Iscrizione"}.
 {"PubSub subscriber request","Richiesta di iscrizione per PubSub"}.
 {"Queries to the conference members are not allowed in this room","In questa stanza non sono consentite query ai membri della conferenza"}.
 {"RAM and disc copy","Copia in memoria (RAM) e su disco"}.
 {"RAM copy","Copia in memoria (RAM)"}.
-{"Raw","Grezzo"}.
 {"Really delete message of the day?","Si conferma l'eliminazione del messaggio del giorno (MOTD)?"}.
 {"Recipient is not in the conference room","Il destinatario non è nella stanza per conferenze"}.
 {"Register a Jabber account","Registra un account Jabber"}.
-{"Registered Users:","Utenti registrati:"}.
 {"Registered Users","Utenti registrati"}.
+{"Registered Users:","Utenti registrati:"}.
 {"Register","Registra"}.
-{"Registration in mod_irc for ","Registrazione in mod_irc per "}.
 {"Remote copy","Copia remota"}.
 {"Remove All Offline Messages","Eliminare tutti i messaggi offline"}.
-{"Remove","Eliminare"}.
 {"Remove User","Eliminare l'utente"}.
+{"Remove","Eliminare"}.
 {"Replaced by new connection","Sostituito da una nuova connessione"}.
 {"Resources","Risorse"}.
-{"Restart","Riavviare"}.
 {"Restart Service","Riavviare il servizio"}.
+{"Restart","Riavviare"}.
 {"Restore Backup from File at ","Recuperare il salvataggio dal file "}.
 {"Restore binary backup after next ejabberd restart (requires less memory):","Recuperare un salvataggio binario dopo il prossimo riavvio di ejabberd (necessita di meno memoria):"}.
 {"Restore binary backup immediately:","Recuperare un salvataggio binario adesso:"}.
@@ -265,22 +224,19 @@
 {"Room description","Descrizione della stanza"}.
 {"Room Occupants","Presenti nella stanza"}.
 {"Room title","Titolo della stanza"}.
-{"Roster","Lista dei contatti"}.
-{"Roster of ","Lista dei contatti di "}.
 {"Roster size","Dimensione della lista dei contatti"}.
+{"Roster","Lista dei contatti"}.
 {"RPC Call Error","Errore di chiamata RPC"}.
 {"Running Nodes","Nodi attivi"}.
-{"~s access rule configuration","Configurazione delle regole di accesso per ~s"}.
 {"Saturday","Sabato"}.
 {"Script check","Verifica dello script"}.
 {"Search Results for ","Risultati della ricerca per "}.
 {"Search users in ","Cercare utenti in "}.
-{"Send announcement to all online users","Inviare l'annuncio a tutti gli utenti online"}.
 {"Send announcement to all online users on all hosts","Inviare l'annuncio a tutti gli utenti online su tutti gli host"}.
-{"Send announcement to all users","Inviare l'annuncio a tutti gli utenti"}.
+{"Send announcement to all online users","Inviare l'annuncio a tutti gli utenti online"}.
 {"Send announcement to all users on all hosts","Inviare l'annuncio a tutti gli utenti su tutti gli host"}.
+{"Send announcement to all users","Inviare l'annuncio a tutti gli utenti"}.
 {"September","Settembre"}.
-{"Server ~b","Server ~b"}.
 {"Server:","Server:"}.
 {"Set message of the day and send to online users","Impostare il messaggio del giorno (MOTD) ed inviarlo agli utenti online"}.
 {"Set message of the day on all hosts and send to online users","Impostare il messaggio del giorno (MOTD) su tutti gli host e inviarlo agli utenti online"}.
@@ -288,17 +244,10 @@
 {"Show Integral Table","Mostrare la tabella integrale"}.
 {"Show Ordinary Table","Mostrare la tabella normale"}.
 {"Shut Down Service","Terminare il servizio"}.
-{"~s invites you to the room ~s","~s ti invita nella stanza ~s"}.
 {"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Alcuni client Jabber possono conservare la password nel tuo computer. Utilizza tale funzione soltanto se ritieni che il tuo computer sia sicuro."}.
-{"~s's Offline Messages Queue","Coda di ~s messaggi offline"}.
-{"Start","Avviare"}.
-{"Start Modules at ","Avviare moduli su "}.
-{"Start Modules","Avviare moduli"}.
 {"Statistics of ~p","Statistiche di ~p"}.
 {"Statistics","Statistiche"}.
 {"Stop","Arrestare"}.
-{"Stop Modules","Arrestare moduli"}.
-{"Stop Modules at ","Arrestare moduli su "}.
 {"Stopped Nodes","Nodi arrestati"}.
 {"Storage Type","Tipo di conservazione"}.
 {"Store binary backup:","Conservare un salvataggio binario:"}.
@@ -312,8 +261,8 @@
 {"That nickname is registered by another person","Questo nickname è registrato da un'altra persona"}.
 {"The CAPTCHA is valid.","Il CAPTCHA è valido."}.
 {"The CAPTCHA verification has failed","La verifica del CAPTCHA ha avuto esito negativo"}.
-{"the password is","la password è"}.
 {"The password is too weak","La password è troppo debole"}.
+{"the password is","la password è"}.
 {"The password of your Jabber account was successfully changed.","Il cambio di password del tuo account Jabber è andato a buon fine."}.
 {"There was an error changing the password: ","Si è verificato un errore nel cambio di password: "}.
 {"There was an error creating the account: ","Si è verificato un errore nella creazione dell'account: "}.
@@ -327,7 +276,6 @@
 {"Time","Ora"}.
 {"To","A"}.
 {"Too many CAPTCHA requests","Troppe richieste CAPTCHA"}.
-{"To ~s","A ~s"}.
 {"Traffic rate limit is exceeded","Limite di traffico superato"}.
 {"Transactions Aborted:","Transazioni abortite:"}.
 {"Transactions Committed:","Transazioni avvenute:"}.
@@ -338,13 +286,12 @@
 {"Unauthorized","Non autorizzato"}.
 {"Unregister a Jabber account","Elimina un account Jabber"}.
 {"Unregister","Elimina"}.
-{"Update","Aggiornare"}.
 {"Update message of the day (don't send)","Aggiornare il messaggio del giorno (MOTD) (non inviarlo)"}.
 {"Update message of the day on all hosts (don't send)","Aggiornare il messaggio del giorno (MOTD) su tutti gli host (non inviarlo)"}.
 {"Update plan","Piano di aggiornamento"}.
 {"Update script","Script di aggiornamento"}.
+{"Update","Aggiornare"}.
 {"Uptime:","Tempo dall'avvio:"}.
-{"Use of STARTTLS required","Utilizzo di STARTTLS obbligatorio"}.
 {"User Management","Gestione degli utenti"}.
 {"Username:","Nome utente:"}.
 {"Users are not allowed to register accounts so quickly","Non è consentito agli utenti registrare account così rapidamente"}.
@@ -364,10 +311,8 @@
 {"You must fill in field \"Nickname\" in the form","Si deve riempire il campo \"Nickname\" nel modulo"}.
 {"You need a client that supports x:data and CAPTCHA to register","La registrazione richiede un client che supporti x:data e CAPTCHA"}.
 {"You need a client that supports x:data to register the nickname","Per registrare il nickname è necessario un client che supporti x:data"}.
-{"You need an x:data capable client to configure mod_irc settings","Per la configurazione del modulo IRC è necessario un client che supporti x:data"}.
 {"You need an x:data capable client to search","Per effettuare ricerche è necessario un client che supporti x:data"}.
 {"Your active privacy list has denied the routing of this stanza.","In base alla tua attuale lista privacy questa stanza è stata esclusa dalla navigazione."}.
 {"Your contact offline message queue is full. The message has been discarded.","La coda dei messaggi offline del contatto è piena. Il messaggio è stato scartato"}.
 {"Your Jabber account was successfully created.","La creazione del tuo account Jabber è andata a buon fine."}.
 {"Your Jabber account was successfully deleted.","La cancellazione del tuo account Jabber è andata a buon fine."}.
-{"Your messages to ~s are being blocked. To unblock them, visit ~s","I messaggi verso ~s sono bloccati. Per sbloccarli, visitare ~s"}.

priv/msgs/ja.msg

@@ -1,12 +1,8 @@
-%% -*- coding: latin-1 -*-
+%% -*- coding: utf-8 -*-
+{" has set the subject to: "," は件名を設定しました: "}.
+{"A password is required to enter this room","このチャットルームに入るにはパスワードが必要です"}.
 {"Accept","許可"}.
-{"Access Configuration","アクセス設定"}.
-{"Access Control List Configuration","アクセスコントロールリスト設定"}.
-{"Access control lists","アクセスコントロールリスト"}.
-{"Access Control Lists","アクセスコントロールリスト"}.
 {"Access denied by service policy","サービスポリシーによってアクセスが禁止されました"}.
-{"Access rules","アクセスルール"}.
-{"Access Rules","アクセスルール"}.
 {"Action on user","ユーザー操作"}.
 {"Add Jabber ID","Jabber ID を追加"}.
 {"Add New","新規追加"}.
@@ -15,6 +11,7 @@
 {"Administration","管理"}.
 {"Administrator privileges required","管理者権限が必要です"}.
 {"All activity","すべて"}.
+{"All Users","全ユーザー"}.
 {"Allow users to change the subject","ユーザーによる件名の変更を許可"}.
 {"Allow users to query other users","ユーザーによる他のユーザーへのクエリーを許可"}.
 {"Allow users to send invites","ユーザーによる招待を許可"}.
@@ -22,18 +19,15 @@
 {"Allow visitors to change nickname","傍聴者のニックネームの変更を許可"}.
 {"Allow visitors to send private messages to","傍聴者によるプライベートメッセージの送信を次の相手に許可"}.
 {"Allow visitors to send status text in presence updates","傍聴者によるプレゼンス更新のステータス文の送信を許可"}.
-{"All Users","全ユーザー"}.
 {"Announcements","アナウンス"}.
-{"A password is required to enter this room","このチャットルームに入るにはパスワードが必要です"}.
 {"April","4月"}.
 {"August","8月"}.
-{"Backup","バックアップ"}.
 {"Backup Management","バックアップ管理"}.
 {"Backup of ~p","バックアップ: ~p"}.
 {"Backup to File at ","ファイルにバックアップ: "}.
+{"Backup","バックアップ"}.
 {"Bad format","不正なフォーマット"}.
 {"Birthday","誕生日"}.
-{"CAPTCHA web page","CAPTCHA ウェブページ"}.
 {"Change Password","パスワードを変更"}.
 {"Change User Password","パスワードを変更"}.
 {"Characters not allowed:","使用できない文字:"}.
@@ -44,21 +38,18 @@
 {"Chatroom is stopped","チャットルームを停止しました"}.
 {"Chatrooms","チャットルーム"}.
 {"Choose a username and password to register with this server","サーバーに登録するユーザー名とパスワードを選択してください"}.
-{"Choose modules to stop","停止するモジュールを選択"}.
 {"Choose storage type of tables","テーブルのストレージタイプを選択"}.
 {"Choose whether to approve this entity's subscription.","このエントリを承認するかどうかを選択してください"}.
 {"City","都道府県"}.
 {"Commands","コマンド"}.
 {"Conference room does not exist","会議室は存在しません"}.
-{"Configuration of room ~s","チャットルーム ~s の設定"}.
 {"Configuration","設定"}.
 {"Connected Resources:","接続リソース:"}.
-{"Connections parameters","接続パラメーター"}.
 {"Country","国"}.
 {"CPU Time:","CPU時間:"}.
-{"Database","データーベース"}.
 {"Database Tables at ~p","データーベーステーブル: ~p"}.
 {"Database Tables Configuration at ","データーベーステーブル設定 "}.
+{"Database","データーベース"}.
 {"December","12月"}.
 {"Default users as participants","デフォルトのユーザーは参加者"}.
 {"Delete message of the day on all hosts","全ホストのお知らせメッセージを削除"}.
@@ -73,7 +64,6 @@
 {"Dump to Text File","テキストファイルに出力"}.
 {"Edit Properties","プロパティを編集"}.
 {"Either approve or decline the voice request.","発言権の要求を承認または却下します。"}.
-{"ejabberd IRC module","ejabberd IRC module"}.
 {"ejabberd MUC module","ejabberd MUCモジュール"}.
 {"ejabberd Multicast service","ejabberdマルチキャストサービス"}.
 {"ejabberd Publish-Subscribe module","ejabberd Publish-Subscribe モジュール"}.
@@ -83,29 +73,22 @@
 {"Elements","要素"}.
 {"Email","メールアドレス"}.
 {"Enable logging","ロギングを有効"}.
-{"Encoding for server ~b","サーバーのエンコーディング ~b"}.
 {"End User Session","エンドユーザーセッション"}.
-{"Enter list of {Module, [Options]}","{モジュール, [オプション]}のリストを入力してください"}.
 {"Enter nickname you want to register","登録するニックネームを入力してください"}.
 {"Enter path to backup file","バックアップファイルのパスを入力してください"}.
 {"Enter path to jabberd14 spool dir","jabberd14 spool ディレクトリのディレクトリを入力してください"}.
 {"Enter path to jabberd14 spool file","jabberd14 spool ファイルのパスを入力してください"}.
 {"Enter path to text file","テキストファイルのパスを入力してください"}.
 {"Enter the text you see","見えているテキストを入力してください"}.
-{"Enter username and encodings you wish to use for connecting to IRC servers.  Press 'Next' to get more fields to fill in.  Press 'Complete' to save settings.","IRC サーバーに接続先するためのユーザー名と文字エンコーディングを入力してください。'Next' を押して次の項目に進みます。'Complete' を押すと設定が保存されます。"}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","IRC サーバーに接続先するために使用するユーザー名、文字エンコーディング、ポート、パスワードを入力してください"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
 {"Error","エラー"}.
-{"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","例: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
 {"Export all tables as SQL queries to a file:","すべてのテーブルをSQL形式でファイルにエクスポート: "}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","サーバーにあるすべてのユーザーデータを PIEFXIS ファイルにエクスポート (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","ホストのユーザーデータを PIEFXIS ファイルにエクスポート (XEP-0227):"}.
 {"Failed to extract JID from your voice request approval","発言権要求の承認から JID を取り出すことに失敗しました"}.
 {"Family Name","姓"}.
 {"February","2月"}.
-{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","項目を入力してユーザーを検索を行えます (* を使用すると部分文字列にマッチします)"}.
 {"Friday","金曜日"}.
-{"From ~s","From ~s"}.
 {"From","差出人"}.
 {"Full Name","氏名"}.
 {"Get Number of Online Users","オンラインユーザー数を取得"}.
@@ -116,14 +99,12 @@
 {"Group ","グループ"}.
 {"Groups","グループ"}.
 {"has been banned","はバンされました"}.
-{"has been kicked","はキックされました"}.
-{"has been kicked because of an affiliation change","は分掌が変更されたためキックされました"}.
 {"has been kicked because of a system shutdown","はシステムシャットダウンのためキックされました"}.
+{"has been kicked because of an affiliation change","は分掌が変更されたためキックされました"}.
 {"has been kicked because the room has been changed to members-only","はチャットルームがメンバー制に変更されたためキックされました"}.
-{" has set the subject to: "," は件名を設定しました: "}.
+{"has been kicked","はキックされました"}.
 {"Host","ホスト"}.
 {"If you don't see the CAPTCHA image here, visit the web page.","ここに CAPTCHA 画像が表示されない場合、ウェブページを参照してください。"}.
-{"If you want to specify different ports, passwords, encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\", port, \"password\"}'.  By default this service use \"~s\" encoding, port ~p, empty password.","別のポートやパスワード、文字エンコーディングを使用したい場合、'{\"irc server\", \"encoding\", port, \"password\"}' という形式のリストを入力してください。デフォルトでエンコーディングは \"~s\" を使用し、ポートは ~p、パスワードは空になっています。"}.
 {"Import Directory","ディレクトリインポート"}.
 {"Import File","ファイルからインポート"}.
 {"Import user data from jabberd14 spool file:","ユーザーデータを jabberd14 Spool ファイルからインポート:"}.
@@ -136,25 +117,14 @@
 {"Incoming s2s Connections:","内向き s2s コネクション:"}.
 {"Incorrect password","パスワードが違います"}.
 {"IP addresses","IP アドレス"}.
-{"IP","IP"}.
-{"IRC channel (don't put the first #)","IRC チャンネル (先頭に#は不要)"}.
-{"IRC server","IRC サーバー"}.
-{"IRC settings","IRC 設定"}.
-{"IRC Transport","IRCトランスポート"}.
-{"IRC username","IRC ユーザー名"}.
-{"IRC Username","IRC ユーザー名"}.
 {"is now known as","は名前を変更しました: "}.
-{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","このルームにエラーメッセージを送ることは許可されていません。参加者(~s)はエラーメッセージを(~s)を送信してルームからキックされました。"}.
 {"It is not allowed to send private messages of type \"groupchat\"","種別が\"groupchat\" であるプライベートメッセージを送信することはできません"}.
 {"It is not allowed to send private messages to the conference","この会議にプライベートメッセージを送信することはできません"}.
 {"It is not allowed to send private messages","プライベートメッセージを送信することはできません"}.
 {"Jabber Account Registration","Jabber アカウント登録"}.
 {"Jabber ID","Jabber ID"}.
 {"January","1月"}.
-{"Join IRC channel","IRC チャンネルに参加"}.
 {"joins the room","がチャットルームに参加しました"}.
-{"Join the IRC channel here.","この IRC チャンネルに参加します。"}.
-{"Join the IRC channel in this Jabber ID: ~s","Jabber ID: ~s でこの IRC チャンネルに参加"}.
 {"July","7月"}.
 {"June","6月"}.
 {"Last Activity","活動履歴"}.
@@ -162,9 +132,6 @@
 {"Last month","先月"}.
 {"Last year","去年"}.
 {"leaves the room","がチャットルームから退出しました"}.
-{"Listened Ports at ","Listen ポート "}.
-{"Listened Ports","Listen ポート"}.
-{"List of modules to start","起動モジュールの一覧"}.
 {"List of rooms","チャットルームの一覧"}.
 {"Low level update script","低レベル更新スクリプト"}.
 {"Make participants list public","参加者一覧を公開"}.
@@ -177,17 +144,14 @@
 {"March","3月"}.
 {"Maximum Number of Occupants","最大在室者数"}.
 {"May","5月"}.
-{"Members:","メンバー:"}.
 {"Membership is required to enter this room","このチャットルームに入るにはメンバーでなければなりません"}.
+{"Members:","メンバー:"}.
 {"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","パスワードは記憶するか、紙に書いて安全な場所に保管してください。もしあなたがパスワードを忘れてしまった場合、Jabber ではパスワードのリカバリを自動的に行うことはできません。"}.
 {"Memory","メモリ"}.
 {"Message body","本文"}.
 {"Middle Name","ミドルネーム"}.
 {"Moderator privileges required","モデレーター権限が必要です"}.
 {"Modified modules","更新されたモジュール"}.
-{"Module","モジュール"}.
-{"Modules","モジュール"}.
-{"Modules at ~p","モジュール ~p"}.
 {"Monday","月曜日"}.
 {"Multicast","マルチキャスト"}.
 {"Multi-User Chat","マルチユーザーチャット"}.
@@ -195,11 +159,11 @@
 {"Name:","名前:"}.
 {"Never","なし"}.
 {"New Password:","新しいパスワード:"}.
-{"Nickname","ニックネーム"}.
 {"Nickname Registration at ","ニックネーム登録: "}.
-{"Nickname ~s does not exist in the room","ニックネーム ~s はこのチャットルームにいません"}.
+{"Nickname","ニックネーム"}.
 {"No body provided for announce message","アナウンスメッセージはありませんでした"}.
 {"No Data","データなし"}.
+{"No limit","制限なし"}.
 {"Node not found","ノードが見つかりません"}.
 {"Node ~p","ノード ~p"}.
 {"Nodes","ノード"}.
@@ -209,13 +173,13 @@
 {"Number of online users","オンラインユーザー数"}.
 {"Number of registered users","登録ユーザー数"}.
 {"October","10月"}.
-{"Offline Messages:","オフラインメッセージ:"}.
 {"Offline Messages","オフラインメッセージ"}.
+{"Offline Messages:","オフラインメッセージ:"}.
 {"OK","OK"}.
 {"Old Password:","古いパスワード:"}.
-{"Online","オンライン"}.
-{"Online Users:","オンラインユーザー:"}.
 {"Online Users","オンラインユーザー"}.
+{"Online Users:","オンラインユーザー:"}.
+{"Online","オンライン"}.
 {"Only members may query archives of this room","メンバーのみがこのルームのアーカイブを取得できます"}.
 {"Only moderators and participants are allowed to change the subject in this room","モデレーターと参加者のみがチャットルームの件名を変更できます"}.
 {"Only moderators are allowed to change the subject in this room","モデレーターのみがチャットルームの件名を変更できます"}.
@@ -223,45 +187,36 @@
 {"Only occupants are allowed to send messages to the conference","在室者のみがこの会議にメッセージを送ることができます"}.
 {"Only occupants are allowed to send queries to the conference","在室者のみが会議にクエリーを送信することができます"}.
 {"Only service administrators are allowed to send service messages","サービス管理者のみがサービスメッセージを送信できます"}.
-{"Options","オプション"}.
 {"Organization Name","会社名"}.
 {"Organization Unit","部署名"}.
-{"Outgoing s2s Connections:","外向き s2s コネクション:"}.
 {"Outgoing s2s Connections","外向き s2s コネクション"}.
+{"Outgoing s2s Connections:","外向き s2s コネクション:"}.
 {"Owner privileges required","主宰者の権限が必要です"}.
 {"Packet","パケット"}.
-{"Password:","パスワード:"}.
-{"Password","パスワード"}.
-{"Password ~b","パスワード ~b"}.
-{"Password Verification:","パスワード (確認):"}.
 {"Password Verification","パスワード (確認)"}.
+{"Password Verification:","パスワード (確認):"}.
+{"Password","パスワード"}.
+{"Password:","パスワード:"}.
 {"Path to Dir","ディレクトリのパス"}.
 {"Path to File","ファイルのパス"}.
 {"Pending","保留"}.
 {"Period: ","期間: "}.
-{"Permanent rooms","永続チャットルーム"}.
 {"Ping","Ping"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","これらのオプションは組み込みの Mnesia データーベースのバックアップのみを行うことに注意してください。もし ODBC モジュールを使用している場合は、SQL データーベースのバックアップを別に行う必要があります。"}.
 {"Please, wait for a while before sending new voice request","新しい発言権の要求を送るまで少し間をおいてください"}.
 {"Pong","Pong"}.
-{"Port","ポート"}.
-{"Port ~b","ポート ~b"}.
 {"private, ","プライベート、"}.
-{"Protocol","プロトコル"}.
 {"Publish-Subscribe","Publish-Subscribe"}.
 {"PubSub subscriber request","PubSub 購読者のリクエスト"}.
 {"Queries to the conference members are not allowed in this room","このチャットルームでは、会議のメンバーへのクエリーは禁止されています"}.
 {"RAM and disc copy","RAM, ディスクコピー"}.
 {"RAM copy","RAM コピー"}.
-{"Raw","Raw"}.
 {"Really delete message of the day?","本当にお知らせメッセージを削除しますか ?"}.
 {"Recipient is not in the conference room","受信者はこの会議室にいません"}.
 {"Register a Jabber account","Jabber アカウントを登録"}.
-{"Registered nicknames","登録ニックネーム"}.
-{"Registered Users:","登録ユーザー:"}.
 {"Registered Users","登録ユーザー"}.
+{"Registered Users:","登録ユーザー:"}.
 {"Register","登録"}.
-{"Registration in mod_irc for ","mod_irc での登録: "}.
 {"Remote copy","リモートコピー"}.
 {"Remove All Offline Messages","すべてのオフラインメッセージを削除"}.
 {"Remove User","ユーザーを削除"}.
@@ -270,22 +225,20 @@
 {"Resources","リソース"}.
 {"Restart Service","サービスを再起動"}.
 {"Restart","再起動"}.
-{"Restore","リストア"}.
 {"Restore Backup from File at ","ファイルからバックアップをリストア: "}.
 {"Restore binary backup after next ejabberd restart (requires less memory):","ejabberd の再起動時にバイナリバックアップからリストア (メモリ少):"}.
 {"Restore binary backup immediately:","直ちにバイナリバックアップからリストア:"}.
 {"Restore plain text backup immediately:","直ちにプレーンテキストバックアップからリストア:"}.
+{"Restore","リストア"}.
 {"Room Configuration","チャットルームの設定"}.
 {"Room creation is denied by service policy","サービスポリシーによってチャットルームの作成が禁止されています"}.
 {"Room description","チャットルームの説明"}.
 {"Room Occupants","在室者"}.
 {"Room title","チャットルームのタイトル"}.
-{"Roster of ","名簿: "}.
 {"Roster size","名簿サイズ"}.
 {"Roster","名簿"}.
 {"RPC Call Error","RPC 呼び出しエラー"}.
 {"Running Nodes","起動ノード"}.
-{"~s access rule configuration","~s アクセスルール設定"}.
 {"Saturday","土曜日"}.
 {"Script check","スクリプトチェック"}.
 {"Search Results for ","検索結果: "}.
@@ -296,23 +249,15 @@
 {"Send announcement to all users","すべてのユーザーにアナウンスを送信"}.
 {"September","9月"}.
 {"Server:","サーバー:"}.
-{"Server ~b","サーバー ~b"}.
 {"Set message of the day and send to online users","お知らせメッセージを設定し、オンラインユーザーに送信"}.
 {"Set message of the day on all hosts and send to online users","全ホストのお知らせメッセージを設定し、オンラインユーザーに送信"}.
 {"Shared Roster Groups","共有名簿グループ"}.
 {"Show Integral Table","累積の表を表示"}.
 {"Show Ordinary Table","通常の表を表示"}.
 {"Shut Down Service","サービスを停止"}.
-{"~s invites you to the room ~s","~s はあなたをチャットルーム ~s に招待しています"}.
 {"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Jabber クライアントはコンピューターにパスワードを記憶できます。コンピューターが安全であると信頼できる場合にのみ、この機能を使用してください。"}.
-{"~s's Offline Messages Queue","~s' のオフラインメッセージキュー"}.
-{"Start Modules at ","モジュールを開始: "}.
-{"Start Modules","モジュールを起動"}.
-{"Start","開始"}.
 {"Statistics of ~p","~p の統計"}.
 {"Statistics","統計"}.
-{"Stop Modules at ","モジュールを停止: "}.
-{"Stop Modules","モジュールを停止"}.
 {"Stopped Nodes","停止ノード"}.
 {"Stop","停止"}.
 {"Storage Type","ストレージタイプ"}.
@@ -327,8 +272,8 @@
 {"That nickname is registered by another person","ニックネームはほかの人によって登録されています"}.
 {"The CAPTCHA is valid.","CAPTCHA は有効です。"}.
 {"The CAPTCHA verification has failed","CAPTCHA 検証は失敗しました"}.
-{"the password is","パスワードは"}.
 {"The password is too weak","このパスワードは単純過ぎます"}.
+{"the password is","パスワードは"}.
 {"The password of your Jabber account was successfully changed.","Jabber アカウントのパスワード変更に成功しました。"}.
 {"There was an error changing the password: ","パスワードの変更中にエラーが発生しました: "}.
 {"There was an error creating the account: ","アカウントの作成中にエラーが発生しました: "}.
@@ -342,7 +287,6 @@
 {"Time","時間"}.
 {"Too many CAPTCHA requests","CAPTCHA 要求が多すぎます"}.
 {"Too many unacked stanzas","多くのスタンザが応答していません"}.
-{"To ~s","宛先 ~s"}.
 {"Total rooms","チャットルーム数"}.
 {"To","To"}.
 {"Traffic rate limit is exceeded","トラフィックレートの制限を超えました"}.
@@ -362,14 +306,12 @@
 {"Update script","スクリプトの更新"}.
 {"Update","更新"}.
 {"Uptime:","起動時間:"}.
-{"Use of STARTTLS required","STARTTLS の使用が必須です"}.
-{"User","ユーザー"}.
 {"User Management","ユーザー管理"}.
 {"Username:","ユーザー名:"}.
-{"Users","ユーザー"}.
 {"Users are not allowed to register accounts so quickly","それほど速くアカウントを登録することはできません"}.
 {"Users Last Activity","ユーザーの活動履歴"}.
-{"User ~s","ユーザー ~s"}.
+{"Users","ユーザー"}.
+{"User","ユーザー"}.
 {"Validate","検証"}.
 {"vCard User Search","vCard検索"}.
 {"Virtual Hosts","バーチャルホスト"}.
@@ -383,10 +325,8 @@
 {"You must fill in field \"Nickname\" in the form","フォームの\"ニックネーム\"欄を入力する必要があります"}.
 {"You need a client that supports x:data and CAPTCHA to register","登録を行うには x:data と CAPTCHA をサポートするクライアントが必要です"}.
 {"You need a client that supports x:data to register the nickname","ニックネームを登録するには x:data をサポートするクライアントが必要です"}.
-{"You need an x:data capable client to configure mod_irc settings","mod_irc の設定には x:data をサポートするクライアントが必要です"}.
 {"You need an x:data capable client to search","検索を行うためには x:data をサポートするクライアントが必要です"}.
 {"Your active privacy list has denied the routing of this stanza.","あなたのプライバシーリストはこのスタンザのルーティングを拒否しました。"}.
 {"Your contact offline message queue is full. The message has been discarded.","相手先のオフラインメッセージキューが一杯です。このメッセージは破棄されます。"}.
 {"Your Jabber account was successfully created.","Jabber アカウントの作成に成功しました。"}.
 {"Your Jabber account was successfully deleted.","Jabber アカウントの削除に成功しました。"}.
-{"Your messages to ~s are being blocked. To unblock them, visit ~s","~s 宛のメッセージはブロックされています。解除するにはこちらを見てください ~s"}.