Do not call to deprected/undefined functions from mod_shared_roster_ldap

In some environments, it might be desirable to use separate document
roots for each virtual host.

.gitignore

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

.travis.yml

@@ -3,9 +3,11 @@ language: erlang
 otp_release:
   - 17.1
   - 17.5
+  - 18.0
 
 services:
   - riak
+  - redis-server
 
 before_install:
   #
@@ -25,6 +27,10 @@ install:
   - sudo apt-get -qq install libexpat1-dev libyaml-dev libpam0g-dev libsqlite3-dev
 
 before_script:
+  - mkdir "$PWD/ebin"
+  - echo "[{riak_kv, [{add_paths, [\"$PWD/ebin/\"]}]}]." > advanced.config
+  - sudo mv advanced.config /etc/riak/advanced.config
+  - sudo service riak restart
   - 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';"
@@ -38,7 +44,7 @@ script:
   - make
   - make install
   - make xref
-  - ERL_LIBS=$PWD make test
+  - make test
   - grep -q 'TEST COMPLETE, \([[:digit:]]*\) ok, .* of \1 ' logs/raw.log
 
 after_script:

Makefile.in

@@ -110,7 +110,7 @@ edoc:
 
 spec:
 	$(ERL) -noinput +B -pa ebin -pa deps/*/ebin -eval \
-	'case xml_gen:compile("tools/xmpp_codec.spec") of ok -> halt(0); _ -> halt(1) end.'
+	'case fxml_gen:compile("tools/xmpp_codec.spec") of ok -> halt(0); _ -> halt(1) end.'
 
 JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),$(firstword $(1))/$(call JOIN_PATHS,$(wordlist 2,1000,$(1))),$(1))
 
@@ -137,7 +137,7 @@ MAIN_FILES=$(filter-out %/configure.beam,$(call FILES_WILDCARD,ebin/*.beam ebin/
 MAIN_DIRS=$(sort $(dir $(MAIN_FILES)) priv/bin priv/sql)
 
 define DEP_VERSION_template
-DEP_$(1)_VERSION:=$(shell $(SED) -e '/vsn/!d;s/.*,"/$(1)-/;s/".*//' $(2) 2>/dev/null)
+DEP_$(1)_VERSION:=$(shell $(SED) -e '/vsn/!d;s/.*, *"/$(1)-/;s/".*//' $(2) 2>/dev/null)
 endef
 
 $(foreach DEP,$(DEPS),$(eval $(call DEP_VERSION_template,$(DEP),deps/$(DEP)/ebin/$(DEP).app)))

README

@@ -1,5 +1,7 @@
-ejabberd Community Edition [![Build Status](https://travis-ci.org/processone/ejabberd.svg?branch=master)](https://travis-ci.org/processone/ejabberd)
-=========================================
+ejabberd Community Edition 
+==========================
+
+[![Build Status](https://travis-ci.org/processone/ejabberd.svg?branch=master)](https://travis-ci.org/processone/ejabberd) [![Hex version](https://img.shields.io/hexpm/v/ejabberd.svg "Hex version")](https://hex.pm/packages/ejabberd)
 
 ejabberd is a distributed, fault-tolerant technology that allows the creation
 of large-scale instant messaging applications. The server can reliably support
@@ -162,7 +164,7 @@ 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 -s ejabberd
+    EJABBERD_CONFIG_PATH=ejabberd.yml erl -pa ebin -pa deps/*/ebin -pa test -pa deps/elixir/lib/*/ebin/ -s ejabberd
 
 Links
 -----

configure.ac

@@ -100,10 +100,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-debug --enable-lager --enable-tools (useful for Dialyzer checks, default: no)])],
+[AC_HELP_STRING([--enable-all], [same as --enable-odbc --enable-mysql --enable-pgsql --enable-sqlite --enable-pam --enable-zlib --enable-riak --enable-redis --enable-elixir --enable-iconv --enable-debug --enable-tools (useful for Dialyzer checks, default: no)])],
 [case "${enableval}" in
-  yes) odbc=true mysql=true pgsql=true sqlite=true pam=true zlib=true riak=true redis=true elixir=true iconv=true debug=true lager=true tools=true ;;
-  no) odbc=false mysql=false pgsql=false sqlite=false pam=false zlib=false riak=false redis=false elixir=false iconv=false debug=false lager=false tools=false ;;
+  yes) odbc=true mysql=true pgsql=true sqlite=true pam=true zlib=true riak=true redis=true elixir=true iconv=true debug=true tools=true ;;
+  no) odbc=false mysql=false pgsql=false sqlite=false pam=false zlib=false riak=false redis=false elixir=false iconv=false debug=false tools=false ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-all) ;;
 esac],[])
 
@@ -203,14 +203,6 @@ AC_ARG_ENABLE(debug,
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
 esac],[if test "x$debug" = "x"; then debug=true; fi])
 
-AC_ARG_ENABLE(lager,
-[AC_HELP_STRING([--enable-lager], [enable lager support (default: yes)])],
-[case "${enableval}" in
-  yes) lager=true ;;
-  no)  lager=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-lager) ;;
-esac],[if test "x$lager" = "x"; then lager=true; fi])
-
 AC_ARG_ENABLE(latest_deps,
 [AC_HELP_STRING([--enable-latest-deps], [makes rebar use latest commits for dependences instead of tagged versions (default: no)])],
 [case "${enableval}" in
@@ -261,7 +253,6 @@ AC_SUBST(redis)
 AC_SUBST(elixir)
 AC_SUBST(iconv)
 AC_SUBST(debug)
-AC_SUBST(lager)
 AC_SUBST(tools)
 AC_SUBST(latest_deps)
 AC_SUBST(CFLAGS)

ejabberdctl.template

@@ -31,14 +31,14 @@ if [ "$INSTALLUSER" != "" ] ; then
         fi
     done
     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
-        EXEC_CMD="sh -c"
+        EXEC_CMD="bash -c"
     fi
     if [ "$EXEC_CMD" = "false" ] ; then
         echo "This command can only be run by root or the user $INSTALLUSER" >&2
         exit 4
     fi
 else
-    EXEC_CMD="sh -c"
+    EXEC_CMD="bash -c"
 fi
 
 # parse command line parameters
@@ -104,7 +104,6 @@ ERL_INETRC=$ETC_DIR/inetrc
 # define mnesia options
 MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS"
 # define erl parameters
-ERL_OPTIONS=$(echo $ERL_OPTIONS | sed 's/ /\\ /g')
 ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $ERL_OPTIONS"
 KERNEL_OPTS=""
 if [ "$FIREWALL_WINDOW" != "" ] ; then
@@ -164,7 +163,11 @@ shell_escape()
 {
     local RES=()
     for i in "$@"; do
-        printf '%q ' "$i"
+        if test -z "$i"; then
+            printf '"" '
+        else
+            printf '%q ' "$i"
+        fi
     done
 }
 

include/adhoc.hrl

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

include/ejabberd.hrl

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

include/ejabberd_commands.hrl

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

include/ejabberd_config.hrl

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

include/ejabberd_ctl.hrl

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

include/ejabberd_http.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -35,8 +35,8 @@
 	 headers = []      :: [{atom() | binary(), binary()}]}).
 
 -record(ws,
-	{socket                  :: inet:socket() | p1_tls:tls_socket(),
-	 sockmod = gen_tcp       :: gen_tcp | p1_tls,
+	{socket                  :: inet:socket() | fast_tls:tls_socket(),
+	 sockmod = gen_tcp       :: gen_tcp | fast_tls,
 	 ip                      :: {inet:ip_address(), inet:port_number()},
 	 host = <<"">>           :: binary(),
 	 port = 5280             :: inet:port_number(),

include/ejabberd_web_admin.hrl

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

include/eldap.hrl

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

include/http_bind.hrl

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

include/jlib.hrl

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

include/logger.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -18,8 +18,6 @@
 %%%
 %%%----------------------------------------------------------------------
 -define(PRINT(Format, Args), io:format(Format, Args)).
-
--ifdef(LAGER).
 -compile([{parse_transform, lager_transform}]).
 
 -define(DEBUG(Format, Args),
@@ -36,21 +34,3 @@
 
 -define(CRITICAL_MSG(Format, Args),
 	lager:critical(Format, Args)).
-
--else.
-
--define(DEBUG(Format, Args),
-	p1_logger:debug_msg(?MODULE, ?LINE, Format, Args)).
-
--define(INFO_MSG(Format, Args),
-	p1_logger:info_msg(?MODULE, ?LINE, Format, Args)).
-
--define(WARNING_MSG(Format, Args),
-	p1_logger:warning_msg(?MODULE, ?LINE, Format, Args)).
-
--define(ERROR_MSG(Format, Args),
-	p1_logger:error_msg(?MODULE, ?LINE, Format, Args)).
-
--define(CRITICAL_MSG(Format, Args),
-	p1_logger:critical_msg(?MODULE, ?LINE, Format, Args)).
--endif.

include/mod_muc.hrl

@@ -0,0 +1,33 @@
+%%%----------------------------------------------------------------------
+%%% File    : mod_muc.hrl
+%%%
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-record(muc_room, {name_host = {<<"">>, <<"">>} :: {binary(), binary()} |
+                                                   {'_', binary()},
+                   opts = [] :: list() | '_'}).
+
+-record(muc_online_room,
+        {name_host = {<<"">>, <<"">>} :: {binary(), binary()} | '$1' |
+                                         {'_', binary()} | '_',
+         pid = self() :: pid() | '$2' | '_' | '$1'}).
+
+-record(muc_registered,
+        {us_host = {{<<"">>, <<"">>}, <<"">>} :: {{binary(), binary()}, binary()} | '$1',
+         nick = <<"">> :: binary()}).

include/mod_muc_room.hrl

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

include/mod_privacy.hrl

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

include/mod_proxy65.hrl

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

include/mod_roster.hrl

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

include/ns.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -131,6 +131,7 @@
 -define(NS_FEATURE_COMPRESS,
 	<<"http://jabber.org/features/compress">>).
 -define(NS_FEATURE_MSGOFFLINE, <<"msgoffline">>).
+-define(NS_FLEX_OFFLINE, <<"http://jabber.org/protocol/offline">>).
 -define(NS_COMPRESS,
 	<<"http://jabber.org/protocol/compress">>).
 -define(NS_CAPS, <<"http://jabber.org/protocol/caps">>).

include/pubsub.hrl

@@ -13,12 +13,12 @@
 %%% 
 %%%
 %%% The Initial Developer of the Original Code is ProcessOne.
-%%% Portions created by ProcessOne are Copyright 2006-2015, ProcessOne
+%%% Portions created by ProcessOne are Copyright 2006-2016, ProcessOne
 %%% All Rights Reserved.''
-%%% This software is copyright 2006-2015, ProcessOne.
+%%% This software is copyright 2006-2016, ProcessOne.
 %%%
 %%%
-%%% copyright 2006-2015 ProcessOne
+%%% copyright 2006-2016 ProcessOne
 %%%
 %%% This file contains pubsub types definition.
 %%% ====================================================================

mix.exs

@@ -3,7 +3,8 @@ defmodule Ejabberd.Mixfile do
 
   def project do
     [app: :ejabberd,
-     version: "16.01.0",
+     version: "16.01.0-beta1",
+     description: description,
      elixir: "~> 1.1",
      elixirc_paths: ["lib"],
      compile_path: ".",
@@ -14,13 +15,19 @@ defmodule Ejabberd.Mixfile do
      deps: deps]
   end
 
+  defp description do
+    """
+    Robust, ubiquitous and massively scalable Jabber / XMPP Instant Messaging platform.
+    """
+  end
+
   def application do
     [mod: {:ejabberd_app, []},
-     applications: [:ssl, :mnesia],
-     included_applications: [:lager, :p1_utils, :cache_tab,
-                             :p1_tls, :p1_stringprep, :p1_xml,
-                             :p1_stun, :p1_yaml, :p1_zlib, :p1_iconv,
-                             :esip, :jiffy, :oauth2, :xmlrpc, :eredis,
+     applications: [:ssl],
+     included_applications: [:lager, :mnesia, :p1_utils, :cache_tab,
+                             :fast_tls, :stringprep, :fast_xml,
+                             :stun, :fast_yaml, :ezlib, :iconv,
+                             :esip, :jiffy, :p1_oauth2, :p1_xmlrpc, :eredis,
                              :p1_mysql, :p1_pgsql, :sqlite3]]
   end
 
@@ -31,32 +38,36 @@ defmodule Ejabberd.Mixfile do
   end
 
   defp deps do
-    [{:lager, git: "https://github.com/basho/lager", tag: "3.0.2"},
-     {:p1_utils, git: "https://github.com/processone/p1_utils", tag: "1.0.2"},
-     {:cache_tab, git: "https://github.com/processone/cache_tab", tag: "1.0.1"},
-     {:p1_tls, git: "https://github.com/processone/tls", tag: "1.0.0"},
-     {:p1_stringprep, git: "https://github.com/processone/stringprep", tag: "1.0.0"},
-     {:p1_xml, git: "https://github.com/processone/xml", tag: "1.1.1"},
-     {:p1_stun, git: "https://github.com/processone/stun", tag: "0.9.0"},
-     {:esip, git: "https://github.com/processone/p1_sip", tag: "1.0.0"},
-     {:p1_yaml, git: "https://github.com/processone/p1_yaml", tag: "1.0.0"},
-     {:jiffy, git: "https://github.com/davisp/jiffy", tag: "0.14.5"},
-     {:oauth2, git: "https://github.com/kivra/oauth2", "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8"},
-     {:xmlrpc, git: "https://github.com/rds13/xmlrpc.git", tag: "1.15"},
-     {:p1_mysql, git: "https://github.com/processone/mysql", tag: "1.0.0"},
-     {:p1_pgsql, git: "https://github.com/processone/pgsql", tag: "1.0.0"},
-     {:sqlite3, git: "https://github.com/alexeyr/erlang-sqlite3", "cbc3505f7a131254265d3ef56191b2581b8cc172"},
-     {:p1_zlib, git: "https://github.com/processone/zlib", tag: "1.0.0"},
-     {:p1_iconv, git: "https://github.com/processone/eiconv", tag: "0.9.0"},
-     {:eredis, git: "https://github.com/wooga/eredis", tag: "v1.0.8"},
-     {:exrm, "0.19.9"}]
+    [{:lager, "~> 3.0"},
+     {:p1_utils, "~> 1.0"},
+     {:cache_tab, "~> 1.0"},
+     {:stringprep, "~> 1.0"},
+     {:fast_yaml, "~> 1.0"},
+     {:fast_tls, "~> 1.0"},
+     {:fast_xml, "~> 1.1"},
+     {:stun, "~> 1.0"},
+     {:esip, "~> 1.0"},
+     {:jiffy, "~> 0.14.7"},
+     {:p1_oauth2, "~> 0.6.1"},
+     {:p1_xmlrpc, "~> 1.15"},
+     {:p1_mysql, "~> 1.0"},
+     {:p1_pgsql, "~> 1.0"},
+     {:sqlite3, "~> 1.1"},
+     {:ezlib, "~> 1.0"},
+     {:iconv, "~> 1.0"},
+     {:eredis, "~> 1.0"},
+     {:exrm, "~> 1.0.0-rc7", only: :dev}]
   end
 
   defp package do
-    [licenses: ["GPLv2"],
-     links: %{"Site" => "https://www.ejabberd.im",
-              "Documentation" => "http://docs.ejabberd.im",
-              "Source" => "https://github.com/processone/ejabberd"}]
+    [# These are the default files included in the package
+      files: ["lib", "src", "priv", "mix.exs", "include", "README.md", "COPYING"],
+      maintainers: ["ProcessOne"],
+      licenses: ["GPLv2"],
+      links: %{"Site" => "https://www.ejabberd.im",
+               "Documentation" => "http://docs.ejabberd.im",
+               "Source" => "https://github.com/processone/ejabberd",
+               "ProcessOne" => "http://www.process-one.net/"}]
   end
 end
 

mix.lock

@@ -1,8 +1,25 @@
-%{"bbmustache": {:hex, :bbmustache, "1.0.4"},
-  "erlware_commons": {:hex, :erlware_commons, "0.18.0"},
+%{"bbmustache": {:hex, :bbmustache, "1.0.3"},
+  "cache_tab": {:hex, :cache_tab, "1.0.2"},
+  "eredis": {:hex, :eredis, "1.0.8"},
+  "erlware_commons": {:hex, :erlware_commons, "0.15.0"},
+  "esip": {:hex, :esip, "1.0.2"},
+  "exrm": {:hex, :exrm, "1.0.0-rc7"},
+  "ezlib": {:hex, :ezlib, "1.0.1"},
+  "fast_tls": {:hex, :fast_tls, "1.0.1"},
+  "fast_xml": {:hex, :fast_xml, "1.1.3"},
+  "fast_yaml": {:hex, :fast_yaml, "1.0.2"},
   "getopt": {:hex, :getopt, "0.8.2"},
-  "providers": {:hex, :providers, "1.6.0"},
-  "cf": {:hex, :cf, "0.2.1"},
-  "relx": {:hex, :relx, "3.11.0"},
-  "conform": {:hex, :conform, "0.17.0"},
-  "neotoma": {:hex, :neotoma, "1.7.3"}}
+  "goldrush": {:hex, :goldrush, "0.1.7"},
+  "iconv": {:hex, :iconv, "1.0.0"},
+  "jiffy": {:hex, :jiffy, "0.14.7"},
+  "lager": {:hex, :lager, "3.0.2"},
+  "p1_mysql": {:hex, :p1_mysql, "1.0.1"},
+  "p1_oauth2": {:hex, :p1_oauth2, "0.6.1"},
+  "p1_pgsql": {:hex, :p1_pgsql, "1.0.1"},
+  "p1_utils": {:hex, :p1_utils, "1.0.3"},
+  "p1_xmlrpc": {:hex, :p1_xmlrpc, "1.15.1"},
+  "providers": {:hex, :providers, "1.4.1"},
+  "relx": {:hex, :relx, "3.5.0"},
+  "sqlite3": {:hex, :sqlite3, "1.1.5"},
+  "stringprep": {:hex, :stringprep, "1.0.2"},
+  "stun": {:hex, :stun, "1.0.1"}}

priv/msgs/ca.msg

@@ -1,4 +1,5 @@
 %% -*- coding: latin-1 -*-
+{"Accept","Acceptar"}.
 {"Access Configuration","Configuració d'accesos"}.
 {"Access Control List Configuration","Configuració de la Llista de Control d'Accés"}.
 {"Access Control Lists","Llista de Control d'Accés"}.
@@ -87,6 +88,7 @@
 {"ejabberd Web Admin","Web d'administració del ejabberd"}.
 {"Elements","Elements"}.
 {"Email","Email"}.
+{"Empty Rooms","Sales buides "}.
 {"Enable logging","Habilitar el registre de la conversa"}.
 {"Enable message archiving","Activar l'emmagatzematge de missatges"}.
 {"Encoding for server ~b","Codificació pel servidor ~b"}.
@@ -142,6 +144,7 @@
 {"Import Users from Dir at ","Importar usuaris des del directori en "}.
 {"Import Users From jabberd14 Spool Files","Importar usuaris de jabberd14"}.
 {"Improper message type","Tipus de missatge incorrecte"}.
+{"Incoming s2s Connections:","Connexions s2s d'entrada"}.
 {"Incorrect password","Contrasenya incorrecta"}.
 {"Invalid affiliation: ~s","Afiliació invàlida: ~s"}.
 {"Invalid role: ~s","Rol invàlid: ~s"}.
@@ -154,6 +157,7 @@
 {"IRC username","Nom d'usuari al IRC"}.
 {"IRC Username","Nom d'usuari al IRC"}.
 {"is now known as","ara es conegut com"}.
+{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","No està permés enviar missatges d'error a la sala. El participant (~s) ha enviat un missatge d'error (~s) i ha sigut expulsat de la sala"}.
 {"It is not allowed to send private messages","No està permés enviar missatges privats"}.
 {"It is not allowed to send private messages of type \"groupchat\"","No està permés enviar missatges del tipus \"groupchat\""}.
 {"It is not allowed to send private messages to the conference","No està permès l'enviament de missatges privats a la sala"}.
@@ -196,6 +200,7 @@
 {"Message body","Missatge"}.
 {"Middle Name","Segon nom"}.
 {"Minimum interval between voice requests (in seconds)","Interval mínim entre peticions de veu (en segons)"}.
+{"Moderator","Moderador"}.
 {"Moderator privileges required","Es necessita tenir privilegis de moderador"}.
 {"moderators only","només moderadors"}.
 {"Modified modules","Mòduls modificats"}.
@@ -239,6 +244,7 @@
 {"Online Users","Usuaris conectats"}.
 {"Online Users:","Usuaris en línia:"}.
 {"Only deliver notifications to available users","Sols enviar notificacions als usuaris disponibles"}.
+{"Only members may query archives of this room","Només membres poden consultar l'arxiu de missatges d'aquesta sala"}.
 {"Only moderators and participants are allowed to change the subject in this room","Només els moderadors i participants poden canviar l'assumpte d'aquesta sala"}.
 {"Only moderators are allowed to change the subject in this room","Només els moderadors poden canviar l'assumpte d'aquesta sala"}.
 {"Only moderators can approve voice requests","Només els moderadors poden aprovar les peticions de veu"}.
@@ -252,6 +258,7 @@
 {"Outgoing s2s Connections","Connexions s2s d'eixida"}.
 {"Owner privileges required","Es requerixen privilegis de propietari de la sala"}.
 {"Packet","Paquet"}.
+{"Participant","Participant"}.
 {"Password ~b","Contrasenya ~b"}.
 {"Password:","Contrasenya:"}.
 {"Password","Contrasenya"}.
@@ -265,6 +272,8 @@
 {"Persist items to storage","Persistir elements al guardar"}.
 {"Ping","Ping"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Recorda que aquestes opcions només fan còpia de seguretat de la base de dades Mnesia. Si estàs utilitzant el mòdul d'ODBC també deus de fer una còpia de seguretat de la base de dades de SQL a part."}.
+{"Please specify file name.","Per favor especifica el nom del fitxer."}.
+{"Please specify file size.","Per favor especifica la mida del fitxer."}.
 {"Please, wait for a while before sending new voice request","Si us plau, espera una mica abans d'enviar una nova petició de veu"}.
 {"Pong","Pong"}.
 {"Port ~b","Port ~b"}.
@@ -300,6 +309,7 @@
 {"Restore binary backup immediately:","Restaurar una còpia de seguretat binària ara mateix."}.
 {"Restore plain text backup immediately:","Restaurar una còpia de seguretat en format de text pla ara mateix:"}.
 {"Restore","Restaurar"}.
+{"Roles for which Presence is Broadcasted","Rols per als que sí se difon la seua presencia"}.
 {"Room Configuration","Configuració de la sala"}.
 {"Room creation is denied by service policy","Se t'ha denegat el crear la sala per política del servei"}.
 {"Room description","Descripció de la sala:"}.
@@ -323,6 +333,7 @@
 {"September","Setembre"}.
 {"Server ~b","Servidor ~b"}.
 {"Server:","Servidor:"}.
+{"Server","Servidor"}.
 {"Set message of the day and send to online users","Configurar el missatge del dia i enviar a tots els usuaris"}.
 {"Set message of the day on all hosts and send to online users","Escriure missatge del dia en tots els hosts i enviar-ho als usuaris connectats"}.
 {"Shared Roster Groups","Grups de contactes compartits"}.
@@ -408,6 +419,7 @@
 {"Virtual Hosts","Hosts virtuals"}.
 {"Visitors are not allowed to change their nicknames in this room","Els visitants no tenen permés canviar el seus Nicknames en esta sala"}.
 {"Visitors are not allowed to send messages to all occupants","Els visitants no poden enviar missatges a tots els ocupants"}.
+{"Visitor","Visitant"}.
 {"Voice request","Petició de veu"}.
 {"Voice requests are disabled in this conference","Les peticions de veu es troben desactivades en aquesta conferència"}.
 {"Wednesday","Dimecres"}.

priv/msgs/ca.po

@@ -3,10 +3,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.1.0-alpha\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2015-09-07 14:13+0100\n"
+"PO-Revision-Date: 2016-01-15 12:25+0100\n"
 "Last-Translator: Badlop <badlop@process-one.net>\n"
-"Language-Team: American English <kde-i18n-doc@kde.org>\n"
-"Language: en_US\n"
+"Language-Team: \n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,13 +32,13 @@ msgstr "Reemplaçat per una nova connexió"
 msgid "has been kicked"
 msgstr "Has sigut expulsat"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr ""
 "La teva llista de privacitat activa ha denegat l'encaminament d'aquesta "
 "stanza."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr "Massa missatges sense haver reconegut la seva recepció"
 
@@ -69,9 +69,8 @@ msgid "User"
 msgstr "Usuari"
 
 #: ejabberd_oauth.erl:256
-#, fuzzy
 msgid "Server"
-msgstr "Servidor:"
+msgstr "Servidor"
 
 #: ejabberd_oauth.erl:259 ejabberd_web_admin.erl:1408 mod_configure.erl:1398
 #: mod_configure.erl:1485 mod_configure.erl:1889 mod_configure.erl:2123
@@ -81,7 +80,7 @@ msgstr "Contrasenya"
 
 #: ejabberd_oauth.erl:267
 msgid "Accept"
-msgstr ""
+msgstr "Acceptar"
 
 #: ejabberd_web_admin.erl:202 ejabberd_web_admin.erl:214
 #: ejabberd_web_admin.erl:234 ejabberd_web_admin.erl:246
@@ -248,9 +247,8 @@ msgid "Outgoing s2s Connections:"
 msgstr "Connexions d'eixida s2s"
 
 #: ejabberd_web_admin.erl:1559
-#, fuzzy
 msgid "Incoming s2s Connections:"
-msgstr "Connexions d'eixida s2s"
+msgstr "Connexions s2s d'entrada"
 
 #: ejabberd_web_admin.erl:1595 ejabberd_web_admin.erl:1794
 #: ejabberd_web_admin.erl:1804 ejabberd_web_admin.erl:2214 mod_roster.erl:1429
@@ -849,13 +847,13 @@ msgstr ""
 "Massa autenticacions (~p) han fallat des d'aquesta adreça IP (~s). L'adreça "
 "serà desbloquejada en ~s UTC"
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
-msgstr ""
+msgstr "Per favor especifica la mida del fitxer."
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
-msgstr ""
+msgstr "Per favor especifica el nom del fitxer."
 
 #: mod_ip_blacklist.erl:121
 msgid "This IP address is blacklisted in ~s"
@@ -973,10 +971,9 @@ msgstr "Codificació pel servidor ~b"
 msgid "Server ~b"
 msgstr "Servidor ~b"
 
-#: mod_mam.erl:270
-#, fuzzy
-msgid "Only members are allowed to query archives of this room"
-msgstr "Només els moderadors poden canviar l'assumpte d'aquesta sala"
+#: mod_mam.erl:541
+msgid "Only members may query archives of this room"
+msgstr "Només membres poden consultar l'arxiu de missatges d'aquesta sala"
 
 #: mod_muc.erl:585
 msgid "Only service administrators are allowed to send service messages"
@@ -996,37 +993,37 @@ msgstr "La sala de conferències no existeix"
 msgid "Chatrooms"
 msgstr "Sales de xat"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
-msgstr ""
+msgstr "Sales buides "
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr ""
 "Necessites un client amb suport x:data per a poder registrar el sobrenom"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Registre del sobrenom en "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Introdueix el sobrenom que vols registrar"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Sobrenom"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "El nickname ja està registrat per una altra persona"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Deus d'omplir el camp \"Nickname\" al formulari"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "mòdul ejabberd MUC"
 
@@ -1193,9 +1190,11 @@ msgstr "El llímit de tràfic ha sigut sobrepassat"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
+"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"
 
 #: mod_muc_room.erl:241
 msgid "It is not allowed to send private messages to the conference"
@@ -1233,7 +1232,7 @@ msgstr "El receptor no està en la sala de conferència"
 msgid "It is not allowed to send private messages"
 msgstr "No està permés enviar missatges privats"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Sols els ocupants poden enviar missatges a la sala"
 
@@ -1317,7 +1316,7 @@ msgstr "Afiliació invàlida: ~s"
 msgid "Invalid role: ~s"
 msgstr "Rol invàlid: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Es requerixen privilegis de propietari de la sala"
 
@@ -1329,7 +1328,7 @@ msgstr "Configuració de la sala ~s"
 msgid "Room title"
 msgstr "Títol de la sala"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Descripció de la sala:"
 
@@ -1371,20 +1370,19 @@ msgstr "qualsevol"
 
 #: mod_muc_room.erl:3471
 msgid "Roles for which Presence is Broadcasted"
-msgstr ""
+msgstr "Rols per als que sí se difon la seua presencia"
 
 #: mod_muc_room.erl:3486
-#, fuzzy
 msgid "Moderator"
-msgstr "només moderadors"
+msgstr "Moderador"
 
 #: mod_muc_room.erl:3496
 msgid "Participant"
-msgstr ""
+msgstr "Participant"
 
 #: mod_muc_room.erl:3506
 msgid "Visitor"
-msgstr ""
+msgstr "Visitant"
 
 #: mod_muc_room.erl:3513
 msgid "Make room members-only"
@@ -1460,35 +1458,35 @@ msgstr "Habilitar el registre de la conversa"
 msgid "You need an x:data capable client to configure room"
 msgstr "Necessites un client amb suport x:data per a configurar la sala"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Número d'ocupants"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "privat"
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "Petició de veu"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "Aprova o denega la petició de veu"
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "JID del usuari "
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "Concedir veu a aquesta persona?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s et convida a la sala ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "la contrasenya és"
 

priv/msgs/cs.msg

@@ -1,4 +1,5 @@
 %% -*- coding: latin-1 -*-
+{"Accept","Přijmout"}.
 {"Access Configuration","Konfigurace přístupů"}.
 {"Access Control List Configuration","Konfigurace seznamu přístupových práv (ACL)"}.
 {"Access control lists","Seznamy přístupových práv (ACL)"}.
@@ -31,6 +32,7 @@
 {"April",". dubna"}.
 {"August",". srpna"}.
 {"Backup Management","Správa zálohování"}.
+{"Backup of ~p","Záloha ~p"}.
 {"Backup to File at ","Záloha do souboru na "}.
 {"Backup","Zálohovat"}.
 {"Bad format","Nesprávný formát"}.
@@ -59,6 +61,7 @@
 {"Country","Země"}.
 {"CPU Time:","Čas procesoru"}.
 {"Database","Databáze"}.
+{"Database Tables at ~p","Databázové tabulky na ~p"}.
 {"Database Tables Configuration at ","Konfigurace databázových tabulek "}.
 {"December",". prosince"}.
 {"Default users as participants","Uživatelé jsou implicitně členy"}.
@@ -78,13 +81,16 @@
 {"Either approve or decline the voice request.","Povolit nebo odmítnout voice žádost."}.
 {"ejabberd IRC module","ejabberd IRC modul"}.
 {"ejabberd MUC module","ejabberd MUC modul"}.
+{"ejabberd Multicast service","Služba ejabberd Multicast"}.
 {"ejabberd Publish-Subscribe module","ejabberd Publish-Subscribe modul"}.
 {"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 Bytestreams modul"}.
 {"ejabberd vCard module","ejabberd vCard modul"}.
 {"ejabberd Web Admin","Webová administrace ejabberd"}.
 {"Elements","Položek"}.
 {"Email","E-mail"}.
+{"Empty Rooms","Prázdné konference"}.
 {"Enable logging","Zaznamenávat konverzace"}.
+{"Enable message archiving","Povolit ukládání historie zpráv"}.
 {"Encoding for server ~b","Kódování pro server ~b"}.
 {"End User Session","Ukončit sezení uživatele"}.
 {"Enter list of {Module, [Options]}","Vložte seznam modulů {Modul, [Parametry]}"}.
@@ -100,6 +106,7 @@
 {"Error","Chyba"}.
 {"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Příklad: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].2\"}]."}.
 {"Exclude Jabber IDs from CAPTCHA challenge","Vyloučit Jabber ID z procesu CAPTCHA ověřování"}.
+{"Export all tables as SQL queries to a file:","Zálohovat všechny tabulky jako SQL dotazy do souboru:"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Exportovat všechny uživatele do souboru ve formátu PIEFXIS (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Exportovat uživatele na hostiteli do souboru ve formátu PIEFXIS (XEP-0227):"}.
 {"Failed to extract JID from your voice request approval","Došlo k chybě při získávání Jabber ID z vaší žádosti o voice práva"}.
@@ -137,6 +144,7 @@
 {"Import Users from Dir at ","Importovat uživatele z adresáře na "}.
 {"Import Users From jabberd14 Spool Files","Importovat uživatele z jabberd14 spool souborů"}.
 {"Improper message type","Nesprávný typ zprávy"}.
+{"Incoming s2s Connections:",""}.
 {"Incorrect password","Nesprávné heslo"}.
 {"Invalid affiliation: ~s","Neplatné přiřazení: ~s"}.
 {"Invalid role: ~s","Neplatná role: ~s"}.
@@ -149,6 +157,7 @@
 {"IRC username","IRC přezdívka"}.
 {"IRC Username","IRC přezdívka"}.
 {"is now known as","se přejmenoval(a) na"}.
+{"It is not allowed to send 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"}.
@@ -170,6 +179,7 @@
 {"Listened Ports at ","Otevřené porty na "}.
 {"Listened Ports","Otevřené porty"}.
 {"List of modules to start","Seznam modulů, které mají být spuštěné"}.
+{"List of rooms","Seznam konferencí"}.
 {"Low level update script","Nízkoúrovňový aktualizační skript"}.
 {"Make participants list public","Nastavit seznam účastníků jako veřejný"}.
 {"Make room CAPTCHA protected","Chránit místnost pomocí CAPTCHA"}.
@@ -190,12 +200,16 @@
 {"Message body","Tělo zprávy"}.
 {"Middle Name","Druhé jméno"}.
 {"Minimum interval between voice requests (in seconds)","Minimální interval mezi žádostmi o voice práva (v sekundách)"}.
+{"Moderator","Moderátor"}.
 {"Moderator privileges required","Potřebujete práva moderátora"}.
 {"moderators only","moderátorům"}.
 {"Modified modules","Aktualizované moduly"}.
 {"Module","Modul"}.
+{"Modules at ~p","Moduly v ~p"}.
 {"Modules","Moduly"}.
 {"Monday","Pondělí"}.
+{"Multicast","Multicast"}.
+{"Multi-User Chat","Víceuživatelský chat"}.
 {"Name:","Jméno:"}.
 {"Name","Jméno"}.
 {"Never","Nikdy"}.
@@ -208,6 +222,7 @@
 {"No Data","Žádná data"}.
 {"Node ID","ID uzlu"}.
 {"Node not found","Uzel nenalezen"}.
+{"Node ~p","Uzel ~p"}.
 {"Nodes","Uzly"}.
 {"No limit","Bez limitu"}.
 {"None","Nic"}.
@@ -229,6 +244,7 @@
 {"Online Users:","Online uživatelé:"}.
 {"Online Users","Online uživatelé"}.
 {"Only deliver notifications to available users","Doručovat upozornění jen právě přihlášeným uživatelům"}.
+{"Only members may query archives of this room","Pouze moderátoři mají povoleno měnit téma místnosti"}.
 {"Only moderators and participants are allowed to change the subject in this room","Jen moderátoři a účastníci mají povoleno měnit téma této místnosti"}.
 {"Only moderators are allowed to change the subject in this room","Jen moderátoři mají povoleno měnit téma místnosti"}.
 {"Only moderators can approve voice requests","Pouze moderátoři mohou schválit žádosti o voice práva"}.
@@ -242,6 +258,7 @@
 {"Outgoing s2s Connections","Odchozí s2s spojení"}.
 {"Owner privileges required","Jsou vyžadována práva vlastníka"}.
 {"Packet","Paket"}.
+{"Participant","Účastník"}.
 {"Password ~b","Heslo ~b"}.
 {"Password:","Heslo:"}.
 {"Password","Heslo"}.
@@ -251,9 +268,12 @@
 {"Path to File","Cesta k souboru"}.
 {"Pending","Čekající"}.
 {"Period: ","Čas: "}.
+{"Permanent rooms","Stálých konferencí"}.
 {"Persist items to storage","Uložit položky natrvalo do úložiště"}.
 {"Ping","Ping"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Podotýkáme, že tato nastavení budou zálohována do zabudované databáze Mnesia. Pokud používáte ODBC modul, musíte zálohovat svoji SQL databázi samostatně."}.
+{"Please specify file name.","Zvolit jméno souboru."}.
+{"Please specify file size.","Zvolit velikost souboru."}.
 {"Please, wait for a while before sending new voice request","Prosím, počkejte chvíli před posláním nové žádosti o voice práva"}.
 {"Pong","Pong"}.
 {"Port ~b","Port ~b"}.
@@ -271,6 +291,7 @@
 {"Really delete message of the day?","Skutečně smazat zprávu dne?"}.
 {"Recipient is not in the conference room","Příjemce se nenachází v konferenční místnosti"}.
 {"Register a Jabber account","Zaregistrujte si účet Jabberu"}.
+{"Registered nicknames","Registrované přezdívky"}.
 {"Registered Users","Registrovaní uživatelé"}.
 {"Registered Users:","Registrovaní živatelé:"}.
 {"Register","Zaregistrovat se"}.
@@ -288,6 +309,7 @@
 {"Restore binary backup immediately:","Okamžitě obnovit binární zálohu:"}.
 {"Restore","Obnovit"}.
 {"Restore plain text backup immediately:","Okamžitě obnovit zálohu z textového souboru:"}.
+{"Roles for which Presence is Broadcasted","Role, pro které je zpráva o stavu šířena"}.
 {"Room Configuration","Nastavení místnosti"}.
 {"Room creation is denied by service policy","Pravidla služby nepovolují vytvořit místnost"}.
 {"Room description","Popis místnosti"}.
@@ -311,6 +333,7 @@
 {"September",". září"}.
 {"Server ~b","Server ~b"}.
 {"Server:","Server:"}.
+{"Server","Server"}.
 {"Set message of the day and send to online users","Nastavit zprávu dne a odeslat ji online uživatelům"}.
 {"Set message of the day on all hosts and send to online users","Nastavit zprávu dne a odeslat ji online uživatelům"}.
 {"Shared Roster Groups","Skupiny pro sdílený seznam kontaktů"}.
@@ -352,6 +375,7 @@
 {"There was an error changing the password: ","Při změně hesla došlo k chybě: "}.
 {"There was an error creating the account: ","Při vytváření účtu došlo k chybě."}.
 {"There was an error deleting the account: ","Při mazání účtu došlo k chybě: "}.
+{"This IP address is blacklisted in ~s","IP adresa je blokována na ~s"}.
 {"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Zde nezáleží na velikosti písmen: macbeth je stejný jako MacBeth a Macbeth."}.
 {"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Na této stránce si můžete vytvořit účet na tomto serveru Jabberu. Vaše JID (Jabber IDentifikátor) bude mít tvar: uživatelskéjméno@server. Přečtěte si prosím pozorně instrukce pro vyplnění údajů."}.
 {"This page allows to unregister a Jabber account in this Jabber server.","Zde můžete zrušit registraci účtu na tomto serveru Jabberu."}.
@@ -359,8 +383,11 @@
 {"Time","Čas"}.
 {"Time delay","Časový posun"}.
 {"Too many CAPTCHA requests","Přiliš mnoho CAPTCHA žádostí"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Příliš mnoho (~p) chybných pokusů o přihlášení z této IP adresy (~s). Adresa bude zablokována do ~s UTC"}.
+{"Too many unacked stanzas","Příliš mnoho nepotvrzených stanz"}.
 {"To","Pro"}.
 {"To ~s","Pro ~s"}.
+{"Total rooms","Celkem konferencí"}.
 {"Traffic rate limit is exceeded","Byl překročen limit"}.
 {"Transactions Aborted:","Transakce zrušena"}.
 {"Transactions Committed:","Transakce potvrzena"}.
@@ -374,6 +401,7 @@
 {"Update","Aktualizovat"}.
 {"Update message of the day (don't send)","Aktualizovat zprávu dne (neodesílat)"}.
 {"Update message of the day on all hosts (don't send)","Aktualizovat zprávu dne pro všechny hostitele (neodesílat)"}.
+{"Update ~p","Aktualizovat ~p"}.
 {"Update plan","Aktualizovat plán"}.
 {"Update script","Aktualizované skripty"}.
 {"Uptime:","Čas běhu:"}.
@@ -381,6 +409,7 @@
 {"User JID","Jabber ID uživatele"}.
 {"User Management","Správa uživatelů"}.
 {"Username:","Uživatelské jméno:"}.
+{"User ~s",""}.
 {"Users are not allowed to register accounts so quickly","Je zakázáno registrovat účty v tak rychlém sledu"}.
 {"Users Last Activity","Poslední aktivita uživatele"}.
 {"Users","Uživatelé"}.
@@ -388,6 +417,7 @@
 {"Validate","Ověřit"}.
 {"vCard User Search","Hledání uživatelů podle vizitek"}.
 {"Virtual Hosts","Virtuální hostitelé"}.
+{"Visitor","Návštěvník"}.
 {"Visitors are not allowed to change their nicknames in this room","Návštěvníkům této místnosti je zakázáno měnit přezdívku"}.
 {"Visitors are not allowed to send messages to all occupants","Návštevníci nemají povoleno zasílat zprávy všem účastníkům konference"}.
 {"Voice requests are disabled in this conference","Voice žádosti jsou v této konferenci zakázány"}.

priv/msgs/cs.po

@@ -7,6 +7,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Language: Czech (čeština)\n"
 "X-Additional-Translator: Milos Svasek [DuxforD] from openheads.net\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Language-Team: \n"
+"Language: cs\n"
+"X-Generator: Poedit 1.8.6\n"
 
 #: ejabberd_c2s.erl:505 ejabberd_c2s.erl:853
 msgid "Use of STARTTLS required"
@@ -25,13 +30,13 @@ msgstr "Nahrazeno novým spojením"
 msgid "has been kicked"
 msgstr "byl(a) vyhozen(a) z místnosti"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr "Vaše nastavení soukromí znemožnilo směrování této stance."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
-msgstr ""
+msgstr "Příliš mnoho nepotvrzených stanz"
 
 #: ejabberd_captcha.erl:122 ejabberd_captcha.erl:245 ejabberd_captcha.erl:284
 msgid "Enter the text you see"
@@ -59,9 +64,8 @@ msgid "User"
 msgstr "Uživatel"
 
 #: ejabberd_oauth.erl:256
-#, fuzzy
 msgid "Server"
-msgstr "Server:"
+msgstr "Server"
 
 #: ejabberd_oauth.erl:259 ejabberd_web_admin.erl:1408 mod_configure.erl:1398
 #: mod_configure.erl:1485 mod_configure.erl:1889 mod_configure.erl:2123
@@ -71,7 +75,7 @@ msgstr "Heslo"
 
 #: ejabberd_oauth.erl:267
 msgid "Accept"
-msgstr ""
+msgstr "Přijmout"
 
 #: ejabberd_web_admin.erl:202 ejabberd_web_admin.erl:214
 #: ejabberd_web_admin.erl:234 ejabberd_web_admin.erl:246
@@ -143,8 +147,7 @@ msgstr "Virtuální hostitelé"
 msgid "Users"
 msgstr "Uživatelé"
 
-#: ejabberd_web_admin.erl:955 ejabberd_web_admin.erl:1340
-#: mod_configure.erl:524
+#: ejabberd_web_admin.erl:955 ejabberd_web_admin.erl:1340 mod_configure.erl:524
 msgid "Online Users"
 msgstr "Online uživatelé"
 
@@ -238,9 +241,10 @@ msgid "Outgoing s2s Connections:"
 msgstr "Odchozí s2s spojení:"
 
 #: ejabberd_web_admin.erl:1559
-#, fuzzy
 msgid "Incoming s2s Connections:"
-msgstr "Odchozí s2s spojení:"
+msgstr ""
+"Příchozí\n"
+" s2s spojení:"
 
 #: ejabberd_web_admin.erl:1595 ejabberd_web_admin.erl:1794
 #: ejabberd_web_admin.erl:1804 ejabberd_web_admin.erl:2214 mod_roster.erl:1429
@@ -253,9 +257,10 @@ msgid "Change Password"
 msgstr "Změnit heslo"
 
 #: ejabberd_web_admin.erl:1673
-#, fuzzy
 msgid "User ~s"
-msgstr "Uživatel "
+msgstr ""
+"Uživatel\n"
+" ~s"
 
 #: ejabberd_web_admin.erl:1684
 msgid "Connected Resources:"
@@ -287,9 +292,8 @@ msgid "Stopped Nodes"
 msgstr "Zastavené uzly"
 
 #: ejabberd_web_admin.erl:1833 ejabberd_web_admin.erl:1858
-#, fuzzy
 msgid "Node ~p"
-msgstr "Uzel "
+msgstr "Uzel ~p"
 
 #: ejabberd_web_admin.erl:1842 mod_configure.erl:150 mod_configure.erl:611
 msgid "Database"
@@ -326,9 +330,8 @@ msgid "RPC Call Error"
 msgstr "Chyba RPC volání"
 
 #: ejabberd_web_admin.erl:1917
-#, fuzzy
 msgid "Database Tables at ~p"
-msgstr "Databázové tabulky na "
+msgstr "Databázové tabulky na ~p"
 
 #: ejabberd_web_admin.erl:1927 mod_vcard.erl:490 mod_vcard.erl:616
 msgid "Name"
@@ -351,9 +354,8 @@ msgid "Error"
 msgstr "Chyba"
 
 #: ejabberd_web_admin.erl:1955
-#, fuzzy
 msgid "Backup of ~p"
-msgstr "Záloha na "
+msgstr "Záloha ~p"
 
 #: ejabberd_web_admin.erl:1959
 msgid ""
@@ -412,7 +414,7 @@ msgstr ""
 
 #: ejabberd_web_admin.erl:2060
 msgid "Export all tables as SQL queries to a file:"
-msgstr ""
+msgstr "Zálohovat všechny tabulky jako SQL dotazy do souboru:"
 
 #: ejabberd_web_admin.erl:2076
 msgid "Import user data from jabberd14 spool file:"
@@ -427,9 +429,8 @@ msgid "Listened Ports at "
 msgstr "Otevřené porty na "
 
 #: ejabberd_web_admin.erl:2144
-#, fuzzy
 msgid "Modules at ~p"
-msgstr "Moduly na "
+msgstr "Moduly v ~p"
 
 #: ejabberd_web_admin.erl:2175
 msgid "Statistics of ~p"
@@ -460,9 +461,8 @@ msgid "Transactions Logged:"
 msgstr "Transakce zaznamenána"
 
 #: ejabberd_web_admin.erl:2243
-#, fuzzy
 msgid "Update ~p"
-msgstr "Aktualizovat "
+msgstr "Aktualizovat ~p"
 
 #: ejabberd_web_admin.erl:2254
 msgid "Update plan"
@@ -840,18 +840,20 @@ msgid ""
 "Too many (~p) failed authentications from this IP address (~s). The address "
 "will be unblocked at ~s UTC"
 msgstr ""
+"Příliš mnoho (~p) chybných pokusů o přihlášení z této IP adresy (~s). Adresa "
+"bude zablokována do ~s UTC"
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
-msgstr ""
+msgstr "Zvolit velikost souboru."
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
-msgstr ""
+msgstr "Zvolit jméno souboru."
 
 #: mod_ip_blacklist.erl:121
 msgid "This IP address is blacklisted in ~s"
-msgstr ""
+msgstr "IP adresa je blokována na ~s"
 
 #: mod_irc.erl:220 mod_muc.erl:467
 msgid "Access denied by service policy"
@@ -962,10 +964,9 @@ msgstr "Kódování pro server ~b"
 msgid "Server ~b"
 msgstr "Server ~b"
 
-#: mod_mam.erl:270
-#, fuzzy
-msgid "Only members are allowed to query archives of this room"
-msgstr "Jen moderátoři mají povoleno měnit téma místnosti"
+#: mod_mam.erl:541
+msgid "Only members may query archives of this room"
+msgstr "Pouze moderátoři mají povoleno měnit téma místnosti"
 
 #: mod_muc.erl:585
 msgid "Only service administrators are allowed to send service messages"
@@ -983,62 +984,59 @@ msgstr "Konferenční místnost neexistuje"
 msgid "Chatrooms"
 msgstr "Konference"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
-msgstr ""
+msgstr "Prázdné konference"
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr "Pro registraci přezdívky potřebujete klienta s podporou x:data"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Registrace přezdívky na "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Zadejte přezdívku, kterou chcete zaregistrovat"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "Přezdívka je zaregistrována jinou osobou"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Musíte vyplnit políčko \"Přezdívka\" ve formuláři"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "ejabberd MUC modul"
 
 #: mod_muc_admin.erl:231 mod_muc_admin.erl:234 mod_muc_admin.erl:246
 #: mod_muc_admin.erl:320
 msgid "Multi-User Chat"
-msgstr ""
+msgstr "Víceuživatelský chat"
 
 #: mod_muc_admin.erl:249
-#, fuzzy
 msgid "Total rooms"
-msgstr "Konference"
+msgstr "Celkem konferencí"
 
 #: mod_muc_admin.erl:250
-#, fuzzy
 msgid "Permanent rooms"
-msgstr "opustil(a) místnost"
+msgstr "Stálých konferencí"
 
 #: mod_muc_admin.erl:251
-#, fuzzy
 msgid "Registered nicknames"
-msgstr "Registrovaní uživatelé"
+msgstr "Registrované přezdívky"
 
 #: mod_muc_admin.erl:254
 msgid "List of rooms"
-msgstr ""
+msgstr "Seznam konferencí"
 
 #: mod_muc_log.erl:398 mod_muc_log.erl:407
 msgid "Chatroom configuration modified"
@@ -1182,9 +1180,11 @@ msgstr "Byl překročen limit"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
+"Není povoleno posílat chybové zprávy do konference. Účastník (~s) odeslal "
+"chybovou zprávu (~s) a byl vyhozen z konference."
 
 #: mod_muc_room.erl:241
 msgid "It is not allowed to send private messages to the conference"
@@ -1222,7 +1222,7 @@ msgstr "Příjemce se nenachází v konferenční místnosti"
 msgid "It is not allowed to send private messages"
 msgstr "Je zakázáno posílat soukromé zprávy"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Jen členové mají povolené zasílat zprávy do konference"
 
@@ -1305,7 +1305,7 @@ msgstr "Neplatné přiřazení: ~s"
 msgid "Invalid role: ~s"
 msgstr "Neplatná role: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Jsou vyžadována práva vlastníka"
 
@@ -1317,7 +1317,7 @@ msgstr "Konfigurace místnosti ~s"
 msgid "Room title"
 msgstr "Název místnosti"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Popis místnosti"
 
@@ -1359,20 +1359,19 @@ msgstr "každému"
 
 #: mod_muc_room.erl:3471
 msgid "Roles for which Presence is Broadcasted"
-msgstr ""
+msgstr "Role, pro které je zpráva o stavu šířena"
 
 #: mod_muc_room.erl:3486
-#, fuzzy
 msgid "Moderator"
-msgstr "moderátorům"
+msgstr "Moderátor"
 
 #: mod_muc_room.erl:3496
 msgid "Participant"
-msgstr ""
+msgstr "Účastník"
 
 #: mod_muc_room.erl:3506
 msgid "Visitor"
-msgstr ""
+msgstr "Návštěvník"
 
 #: mod_muc_room.erl:3513
 msgid "Make room members-only"
@@ -1432,7 +1431,7 @@ msgstr "Chránit místnost pomocí CAPTCHA"
 
 #: mod_muc_room.erl:3606
 msgid "Enable message archiving"
-msgstr ""
+msgstr "Povolit ukládání historie zpráv"
 
 #: mod_muc_room.erl:3612
 msgid "Exclude Jabber IDs from CAPTCHA challenge"
@@ -1446,45 +1445,45 @@ msgstr "Zaznamenávat konverzace"
 msgid "You need an x:data capable client to configure room"
 msgstr "Ke konfiguraci místnosti potřebujete klienta podporujícího x:data"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Počet účastníků"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "soukromá, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "Žádost o voice práva"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "Povolit nebo odmítnout voice žádost."
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "Jabber ID uživatele"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "Udělit voice práva této osobě?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s vás zve do místnosti ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "heslo je"
 
 #: mod_multicast.erl:291
 msgid "Multicast"
-msgstr ""
+msgstr "Multicast"
 
 #: mod_multicast.erl:306
 msgid "ejabberd Multicast service"
-msgstr ""
+msgstr "Služba ejabberd Multicast"
 
 #: mod_offline.erl:647
 msgid ""

priv/msgs/de.msg

@@ -1,4 +1,5 @@
 %% -*- coding: latin-1 -*-
+{"Accept","Akzeptieren"}.
 {"Access Configuration","Zugangskonfiguration"}.
 {"Access Control List Configuration","Konfiguration der Zugangskontrolllisten"}.
 {"Access control lists","Zugangskontroll-Listen (ACL)"}.
@@ -87,6 +88,7 @@
 {"ejabberd Web Admin","ejabberd Web-Admin"}.
 {"Elements","Elemente"}.
 {"Email","E-Mail"}.
+{"Empty Rooms","Leere Räume"}.
 {"Enable logging","Protokollierung aktivieren"}.
 {"Enable message archiving","Nachrichtenarchivierung aktivieren"}.
 {"Encoding for server ~b","Kodierung für Server ~b"}.
@@ -142,6 +144,7 @@
 {"Import Users from Dir at ","Benutzer importieren aus dem Verzeichnis "}.
 {"Import Users From jabberd14 Spool Files","Importiere Benutzer aus jabberd14-Spool-Dateien"}.
 {"Improper message type","Unzulässiger Nachrichtentyp"}.
+{"Incoming s2s Connections:","Eingehende s2s-Verbindungen:"}.
 {"Incorrect password","Falsches Passwort"}.
 {"Invalid affiliation: ~s","Ungültige Mitgliedschaft: ~s"}.
 {"Invalid role: ~s","Ungültige Rolle: ~s"}.
@@ -154,6 +157,7 @@
 {"IRC username","IRC Benutzername"}.
 {"IRC Username","IRC-Benutzername"}.
 {"is now known as","ist nun bekannt als"}.
+{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","Es ist nicht erlaubt Fehlermeldungen an den Raum zu senden. Der Teilnehmer (~s) hat eine Fehlermeldung (~s) gesendet und wurde aus dem Raum entfernt"}.
 {"It is not allowed to send private messages","Es ist nicht erlaubt private Nachrichten zu senden"}.
 {"It is not allowed to send private messages of type \"groupchat\"","Es ist nicht erlaubt private Nachrichten des Typs \"Gruppenchat\" zu senden"}.
 {"It is not allowed to send private messages to the conference","Es ist nicht erlaubt private Nachrichten an den Raum zu schicken"}.
@@ -196,6 +200,7 @@
 {"Message body","Nachrichtentext"}.
 {"Middle Name","Zweiter Vorname"}.
 {"Minimum interval between voice requests (in seconds)","Mindestdauer zwischen Anfragen für Sprachrechte (in Sekunden)"}.
+{"Moderator","Moderator"}.
 {"Moderator privileges required","Moderatorrechte benötigt"}.
 {"moderators only","ausschliesslich Moderatoren"}.
 {"Modified modules","Geänderte Module"}.
@@ -210,7 +215,7 @@
 {"Never","Nie"}.
 {"New Password:","Neues Passwort:"}.
 {"Nickname","Benutzername"}.
-{"Nickname Registration at ","Registrieren des Benutzernames auf"}.
+{"Nickname Registration at ","Registrieren des Benutzernames auf "}.
 {"Nickname ~s does not exist in the room","Der Benutzername ~s existiert im Raum nicht"}.
 {"nobody","niemanden"}.
 {"No body provided for announce message","Kein Text für die Ankündigungsnachricht angegeben"}.
@@ -239,6 +244,7 @@
 {"Online Users:","Angemeldete Benutzer:"}.
 {"Online Users","Angemeldete Benutzer"}.
 {"Only deliver notifications to available users","Benachrichtigungen nur an verfügbare Benutzer schicken"}.
+{"Only members may query archives of this room","Nur Mitglieder dürfen den Verlauf dieses Raumes abrufen"}.
 {"Only moderators and participants are allowed to change the subject in this room","Nur Moderatoren und Mitglieder dürfen das Thema in diesem Raum ändern"}.
 {"Only moderators are allowed to change the subject in this room","Nur Moderatoren dürfen das Thema in diesem Raum ändern"}.
 {"Only moderators can approve voice requests","Nur Moderatoren können Anfragen für Sprachrechte bestätigen"}.
@@ -252,6 +258,7 @@
 {"Outgoing s2s Connections","Ausgehende s2s-Verbindungen"}.
 {"Owner privileges required","Besitzerrechte benötigt"}.
 {"Packet","Paket"}.
+{"Participant","Teilnehmer"}.
 {"Password ~b","Passwort ~b"}.
 {"Password:","Passwort:"}.
 {"Password","Passwort"}.
@@ -261,10 +268,12 @@
 {"Path to File","Pfad zur Datei"}.
 {"Pending","Schwebend"}.
 {"Period: ","Zeitraum: "}.
-{"Permanent rooms","permanente Chaträume"}.
+{"Permanent rooms","Permanente Chaträume"}.
 {"Persist items to storage","Einträge dauerhaft speichern"}.
 {"Ping","Ping"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Beachten sie, das diese Optionen nur die eingebaute Mnesia-Datenbank sichern. Wenn sie das ODBC-Modul verwenden, müssen sie die SQL-Datenbank manuell sichern."}.
+{"Please specify file name.","Bitte geben Sie den Dateinamen an."}.
+{"Please specify file size.","Bitte geben Sie die Dateigröße an."}.
 {"Please, wait for a while before sending new voice request","Bitte warten sie ein wenig, bevor sie eine weitere Anfrage für Sprachrechte senden"}.
 {"Pong","Pong"}.
 {"Port ~b","Port ~b"}.
@@ -300,6 +309,7 @@
 {"Restore binary backup immediately:","Stelle binäre Sicherung sofort wieder her:"}.
 {"Restore plain text backup immediately:","Stelle Klartext-Sicherung sofort wieder her:"}.
 {"Restore","Wiederherstellung"}.
+{"Roles for which Presence is Broadcasted","Rollen, für die der Status übertragen wird"}.
 {"Room Configuration","Raum-Konfiguration"}.
 {"Room creation is denied by service policy","Anlegen des Raumes aufgrund der Dienstrichtlinien verweigert"}.
 {"Room description","Raum Beschreibung"}.
@@ -323,6 +333,7 @@
 {"September","September"}.
 {"Server ~b","Server ~b"}.
 {"Server:","Server:"}.
+{"Server","Server"}.
 {"Set message of the day and send to online users","Setze Nachricht des Tages und sende sie an alle angemeldeten Benutzer"}.
 {"Set message of the day on all hosts and send to online users","Setze Nachricht des Tages auf allen Hosts und sende sie an alle angemeldeten Benutzer"}.
 {"Shared Roster Groups","Gruppen der gemeinsamen Kontaktliste"}.
@@ -406,6 +417,7 @@
 {"Validate","Validieren"}.
 {"vCard User Search","vCard-Benutzer-Suche"}.
 {"Virtual Hosts","Virtuelle Hosts"}.
+{"Visitor","Besucher"}.
 {"Visitors are not allowed to change their nicknames in this room","Besucher dürfen in diesem Raum ihren Benutzernamen nicht ändern"}.
 {"Visitors are not allowed to send messages to all occupants","Besucher dürfen nicht an alle Teilnehmer Nachrichten verschicken"}.
 {"Voice request","Anfrage für Sprachrechte"}.

priv/msgs/de.po

@@ -16,7 +16,7 @@ msgstr ""
 "X-Additional-Translator: Patrick Dreker\n"
 "X-Additional-Translator: Torsten Werner\n"
 "X-Additional-Translator: Marina Hahn\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.6\n"
 
 #: ejabberd_c2s.erl:505 ejabberd_c2s.erl:853
 msgid "Use of STARTTLS required"
@@ -35,12 +35,12 @@ msgstr "Durch neue Verbindung ersetzt"
 msgid "has been kicked"
 msgstr "wurde entfernt"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr ""
 "Ihre aktive Privacy Liste hat die Weiterleitung des Stanzas unterbunden."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr "Zu viele unbestätigte Stanzas"
 
@@ -72,9 +72,8 @@ msgid "User"
 msgstr "Benutzer"
 
 #: ejabberd_oauth.erl:256
-#, fuzzy
 msgid "Server"
-msgstr "Server:"
+msgstr "Server"
 
 #: ejabberd_oauth.erl:259 ejabberd_web_admin.erl:1408 mod_configure.erl:1398
 #: mod_configure.erl:1485 mod_configure.erl:1889 mod_configure.erl:2123
@@ -84,7 +83,7 @@ msgstr "Passwort"
 
 #: ejabberd_oauth.erl:267
 msgid "Accept"
-msgstr ""
+msgstr "Akzeptieren"
 
 #: ejabberd_web_admin.erl:202 ejabberd_web_admin.erl:214
 #: ejabberd_web_admin.erl:234 ejabberd_web_admin.erl:246
@@ -156,8 +155,7 @@ msgstr "Virtuelle Hosts"
 msgid "Users"
 msgstr "Benutzer"
 
-#: ejabberd_web_admin.erl:955 ejabberd_web_admin.erl:1340
-#: mod_configure.erl:524
+#: ejabberd_web_admin.erl:955 ejabberd_web_admin.erl:1340 mod_configure.erl:524
 msgid "Online Users"
 msgstr "Angemeldete Benutzer"
 
@@ -251,9 +249,8 @@ msgid "Outgoing s2s Connections:"
 msgstr "Ausgehende s2s-Verbindungen:"
 
 #: ejabberd_web_admin.erl:1559
-#, fuzzy
 msgid "Incoming s2s Connections:"
-msgstr "Ausgehende s2s-Verbindungen:"
+msgstr "Eingehende s2s-Verbindungen:"
 
 #: ejabberd_web_admin.erl:1595 ejabberd_web_admin.erl:1794
 #: ejabberd_web_admin.erl:1804 ejabberd_web_admin.erl:2214 mod_roster.erl:1429
@@ -853,13 +850,13 @@ msgstr ""
 "Zu viele (~p) fehlgeschlagene Anmeldeversuche von dieser IP Adresse (~s). "
 "Die Adresse wird bis ~s UTC blockiert."
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
-msgstr ""
+msgstr "Bitte geben Sie die Dateigröße an."
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
-msgstr ""
+msgstr "Bitte geben Sie den Dateinamen an."
 
 #: mod_ip_blacklist.erl:121
 msgid "This IP address is blacklisted in ~s"
@@ -977,10 +974,9 @@ msgstr "Kodierung für Server ~b"
 msgid "Server ~b"
 msgstr "Server ~b"
 
-#: mod_mam.erl:270
-#, fuzzy
-msgid "Only members are allowed to query archives of this room"
-msgstr "Nur Moderatoren dürfen das Thema in diesem Raum ändern"
+#: mod_mam.erl:541
+msgid "Only members may query archives of this room"
+msgstr "Nur Mitglieder dürfen den Verlauf dieses Raumes abrufen"
 
 #: mod_muc.erl:585
 msgid "Only service administrators are allowed to send service messages"
@@ -999,38 +995,38 @@ msgstr "Konferenzraum existiert nicht"
 msgid "Chatrooms"
 msgstr "Chaträume"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
-msgstr ""
+msgstr "Leere Räume"
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr ""
 "Sie benötigen einen Client, der x:data unterstützt, um Ihren Benutzernamen "
 "zu registrieren"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
-msgstr "Registrieren des Benutzernames auf"
+msgstr "Registrieren des Benutzernames auf "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Geben sie den zu registrierenden Benutzernamen ein"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Benutzername"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "Dieser Benutzername wurde bereits von jemand anderem registriert"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Sie müssen das Feld \"Benutzername\" ausfüllen"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "ejabberd MUC-Modul"
 
@@ -1045,7 +1041,7 @@ msgstr "Alle Chaträume"
 
 #: mod_muc_admin.erl:250
 msgid "Permanent rooms"
-msgstr "permanente Chaträume"
+msgstr "Permanente Chaträume"
 
 #: mod_muc_admin.erl:251
 msgid "Registered nicknames"
@@ -1197,9 +1193,11 @@ msgstr "Datenratenlimit wurde überschritten"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
+"Es ist nicht erlaubt Fehlermeldungen an den Raum zu senden. Der Teilnehmer "
+"(~s) hat eine Fehlermeldung (~s) gesendet und wurde aus dem Raum entfernt"
 
 #: mod_muc_room.erl:241
 msgid "It is not allowed to send private messages to the conference"
@@ -1241,7 +1239,7 @@ msgstr "Der Empfänger ist nicht im Raum"
 msgid "It is not allowed to send private messages"
 msgstr "Es ist nicht erlaubt private Nachrichten zu senden"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Nur Teilnehmer dürfen Nachrichten an den Raum schicken"
 
@@ -1323,7 +1321,7 @@ msgstr "Ungültige Mitgliedschaft: ~s"
 msgid "Invalid role: ~s"
 msgstr "Ungültige Rolle: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Besitzerrechte benötigt"
 
@@ -1335,7 +1333,7 @@ msgstr "Konfiguration für Raum ~s"
 msgid "Room title"
 msgstr "Raumname"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Raum Beschreibung"
 
@@ -1377,20 +1375,19 @@ msgstr "jeden"
 
 #: mod_muc_room.erl:3471
 msgid "Roles for which Presence is Broadcasted"
-msgstr ""
+msgstr "Rollen, für die der Status übertragen wird"
 
 #: mod_muc_room.erl:3486
-#, fuzzy
 msgid "Moderator"
-msgstr "ausschliesslich Moderatoren"
+msgstr "Moderator"
 
 #: mod_muc_room.erl:3496
 msgid "Participant"
-msgstr ""
+msgstr "Teilnehmer"
 
 #: mod_muc_room.erl:3506
 msgid "Visitor"
-msgstr ""
+msgstr "Besucher"
 
 #: mod_muc_room.erl:3513
 msgid "Make room members-only"
@@ -1466,35 +1463,35 @@ msgstr ""
 "Sie benötigen einen Client, der x:data unterstützt, um den Raum zu "
 "konfigurieren"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Anzahl der Teilnehmer"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "privat, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "Anfrage für Sprachrechte"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "Diese Anfrage für Sprachrechte bestätigen oder ablehnen."
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "Benutzer JID"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "Sprachrechte dieser Person erteilen?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s lädt sie in den Raum ~s ein"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "das Passwort lautet"
 

priv/msgs/ejabberd.pot

@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: 15.11.117\n"
+"Project-Id-Version: 15.11.127\n"
 "X-Language: Language Name\n"
 "Last-Translator: Translator name and contact method\n"
 "MIME-Version: 1.0\n"
@@ -24,11 +24,11 @@ msgstr ""
 msgid "has been kicked"
 msgstr ""
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr ""
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr ""
 
@@ -826,11 +826,11 @@ msgid ""
 "will be unblocked at ~s UTC"
 msgstr ""
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -937,8 +937,8 @@ msgstr ""
 msgid "Server ~b"
 msgstr ""
 
-#: mod_mam.erl:270
-msgid "Only members are allowed to query archives of this room"
+#: mod_mam.erl:541
+msgid "Only members may query archives of this room"
 msgstr ""
 
 #: mod_muc.erl:585
@@ -957,36 +957,36 @@ msgstr ""
 msgid "Chatrooms"
 msgstr ""
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr ""
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr ""
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr ""
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr ""
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr ""
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr ""
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr ""
 
@@ -1153,8 +1153,8 @@ msgstr ""
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1193,7 +1193,7 @@ msgstr ""
 msgid "It is not allowed to send private messages"
 msgstr ""
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr ""
 
@@ -1275,7 +1275,7 @@ msgstr ""
 msgid "Invalid role: ~s"
 msgstr ""
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr ""
 
@@ -1287,7 +1287,7 @@ msgstr ""
 msgid "Room title"
 msgstr ""
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr ""
 
@@ -1415,35 +1415,35 @@ msgstr ""
 msgid "You need an x:data capable client to configure room"
 msgstr ""
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr ""
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr ""
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr ""
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr ""
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr ""
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr ""
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr ""
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr ""
 

priv/msgs/el.po

@@ -28,13 +28,13 @@ msgstr "Αντικαταστάθικε από νέα σύνδεση"
 msgid "has been kicked"
 msgstr "αποβλήθηκε "
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr ""
 "Ο ενεργός κατάλογος απορρήτου, έχει αρνηθεί τη δρομολόγηση αυτής της στροφής "
 "(stanza)."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr ""
 
@@ -859,11 +859,11 @@ msgid ""
 "will be unblocked at ~s UTC"
 msgstr ""
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -983,9 +983,9 @@ msgstr "Κωδικοποίηση για διακομιστή ~b"
 msgid "Server ~b"
 msgstr "Διακομιστής  ~b"
 
-#: mod_mam.erl:270
+#: mod_mam.erl:541
 #, fuzzy
-msgid "Only members are allowed to query archives of this room"
+msgid "Only members may query archives of this room"
 msgstr "Μόνο οι συντονιστές μπορούν να αλλάξουν το θέμα αυτής της αίθουσας"
 
 #: mod_muc.erl:585
@@ -1006,36 +1006,36 @@ msgstr "Αίθουσα σύνεδριασης δεν υπάρχει"
 msgid "Chatrooms"
 msgstr "Αίθουσες σύνεδριασης"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr "Χρειάζεστε ένα x:data ικανό πελάτη για εγγραφή με ψευδώνυμο"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Εγγραφή με Ψευδώνυμο στο "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Πληκτρολογήστε το ψευδώνυμο που θέλετε να εγγραφείτε"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Ψευδώνυμο"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "Αυτό το ψευδώνυμο είναι καταχωρημένο από άλλο πρόσωπο"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Θα πρέπει να συμπληρώσετε το πεδίο \"Ψευδώνυμο\" στη φόρμα"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "ejabberd MUC module"
 
@@ -1205,8 +1205,8 @@ msgstr "Υπέρφορτωση"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1245,7 +1245,7 @@ msgstr "Παραλήπτης δεν είναι στην αίθουσα συνε
 msgid "It is not allowed to send private messages"
 msgstr "Δεν επιτρέπεται η αποστολή προσωπικών μηνυμάτων"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Μόνο οι συμμετέχωντες  μπορούν να στέλνουν μηνύματα στο συνέδριο"
 
@@ -1334,7 +1334,7 @@ msgstr "Άκυρη υπαγωγή: ~s"
 msgid "Invalid role: ~s"
 msgstr "Άκυρος ρόλο: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Aπαιτούνται προνόμια ιδιοκτήτη"
 
@@ -1346,7 +1346,7 @@ msgstr "Διαμόρφωση Αίθουσας σύνεδριασης ~s"
 msgid "Room title"
 msgstr "Τίτλος Αίθουσας "
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Περιγραφή Αίθουσας"
 
@@ -1477,35 +1477,35 @@ msgstr "Ενεργοποίηση καταγραφής"
 msgid "You need an x:data capable client to configure room"
 msgstr "Χρειάζεστε ένα x:data ικανό πελάτη για να ρυθμίσετε την αίθουσα "
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Αριθμός συμετεχόντων"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "ιδιωτικό,"
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "Αίτημα φωνής"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "Είτε εγκρίνετε ή απορρίψτε το αίτημα φωνής."
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "JID Χρήστη"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "Παραχώρηση φωνής σε αυτό το άτομο;"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s σας προσκαλεί στην αίθουσα ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "ο κωδικός πρόσβασης είναι"
 

priv/msgs/eo.po

@@ -29,11 +29,11 @@ msgstr "Anstataŭigita je nova konekto"
 msgid "has been kicked"
 msgstr "estas forpelita"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr "Via aktiva privatec-listo malpermesas enkursigi ĉi-tiun pakaĵon"
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr "Tro da neagnoskitaj stancoj"
 
@@ -840,11 +840,11 @@ msgstr ""
 "Tro da malsukcesaj aŭtentprovoj (~p) de ĉi tiu IP-adreso (~s). La adreso "
 "estos malbarata je ~s UTC."
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -962,9 +962,9 @@ msgstr "Enkodigo por servilo ~b"
 msgid "Server ~b"
 msgstr "Servilo ~b"
 
-#: mod_mam.erl:270
+#: mod_mam.erl:541
 #, fuzzy
-msgid "Only members are allowed to query archives of this room"
+msgid "Only members may query archives of this room"
 msgstr "Nur moderigantoj rajtas ŝanĝi la temon en ĉi tiu babilejo"
 
 #: mod_muc.erl:585
@@ -983,36 +983,36 @@ msgstr "Babilejo ne ekzistas"
 msgid "Chatrooms"
 msgstr "Babilejoj"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr "Vi bezonas klienton subtenante x:data-funkcio por registri kaŝnomon"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Kaŝnomo-registrado je "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Enmetu kaŝnomon kiun vi volas registri"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Kaŝnomo"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "Kaŝnomo estas registrita de alia persono"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Vi devas kompletigi la \"Kaŝnomo\" kampon"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "ejabberd MUC-modulo"
 
@@ -1179,8 +1179,8 @@ msgstr "Trafikrapida limigo superita"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1219,7 +1219,7 @@ msgstr "Ricevanto ne ĉeestas en la babilejo "
 msgid "It is not allowed to send private messages"
 msgstr "Ne estas permesata sendi privatajn mesaĝojn"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Nur partoprenantoj rajtas sendi mesaĝojn al la babilejo"
 
@@ -1303,7 +1303,7 @@ msgstr "Nevalida aparteneco: ~s"
 msgid "Invalid role: ~s"
 msgstr "Nevalida rolo: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Mastraj rajtoj bezonata"
 
@@ -1315,7 +1315,7 @@ msgstr "Agordo de babilejo ~s"
 msgid "Room title"
 msgstr "Babilejo-nomo"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Babilejo-priskribo"
 
@@ -1444,35 +1444,35 @@ msgstr "Ŝaltu protokoladon"
 msgid "You need an x:data capable client to configure room"
 msgstr "Vi bezonas klienton kun x:data-funkcio por agordi la babilejon"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Nombro de ĉeestantoj"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "privata, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "Voĉ-peto"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "Ĉu aprobu, aŭ malaprobu la voĉ-peton."
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "Uzant-JID"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "Koncedu voĉon al ĉi-persono?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s invitas vin al la babilejo ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "la pasvorto estas"
 

priv/msgs/es.msg

@@ -1,4 +1,5 @@
 %% -*- coding: latin-1 -*-
+{"Accept","Aceptar"}.
 {"Access Configuration","Configuración de accesos"}.
 {"Access Control List Configuration","Configuración de la Lista de Control de Acceso"}.
 {"Access control lists","Listas de Control de Acceso"}.
@@ -87,6 +88,7 @@
 {"ejabberd Web Admin","ejabberd Web Admin"}.
 {"Elements","Elementos"}.
 {"Email","correo"}.
+{"Empty Rooms","Salas vacías"}.
 {"Enable logging","Guardar históricos"}.
 {"Enable message archiving","Activar el almacenamiento de mensajes"}.
 {"Encoding for server ~b","Codificación del servidor ~b"}.
@@ -142,6 +144,7 @@
 {"Import Users from Dir at ","Importar usuarios desde el directorio en "}.
 {"Import Users From jabberd14 Spool Files","Importar usuarios de ficheros spool de jabberd-1.4"}.
 {"Improper message type","Tipo de mensaje incorrecto"}.
+{"Incoming s2s Connections:","Conexiones S2S entrantes:"}.
 {"Incorrect password","Contraseña incorrecta"}.
 {"Invalid affiliation: ~s","Afiliación no válida: ~s"}.
 {"Invalid role: ~s","Rol no válido: ~s"}.
@@ -154,6 +157,7 @@
 {"IRC username","Nombre de usuario en IRC"}.
 {"IRC Username","Nombre de usuario en IRC"}.
 {"is now known as","se cambia el nombre a"}.
+{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","No está permitido enviar mensajes de error a la sala. Este participante (~s) ha enviado un mensaje de error (~s) y fue expulsado de la sala"}.
 {"It is not allowed to send private messages","No está permitido enviar mensajes privados"}.
 {"It is not allowed to send private messages of type \"groupchat\"","No está permitido enviar mensajes privados del tipo \"groupchat\""}.
 {"It is not allowed to send private messages to the conference","Impedir el envio de mensajes privados a la sala"}.
@@ -196,6 +200,7 @@
 {"Message body","Cuerpo del mensaje"}.
 {"Middle Name","Segundo nombre"}.
 {"Minimum interval between voice requests (in seconds)","Intervalo mínimo entre peticiones de voz (en segundos)"}.
+{"Moderator","Moderador"}.
 {"Moderator privileges required","Se necesita privilegios de moderador"}.
 {"moderators only","solo moderadores"}.
 {"Modified modules","Módulos modificados"}.
@@ -239,6 +244,7 @@
 {"Online Users:","Usuarios conectados:"}.
 {"Online Users","Usuarios conectados"}.
 {"Only deliver notifications to available users","Solo enviar notificaciones a los usuarios disponibles"}.
+{"Only members may query archives of this room","Solo miembros pueden consultar el archivo de mensajes de la sala"}.
 {"Only moderators and participants are allowed to change the subject in this room","Solo los moderadores y participantes pueden cambiar el asunto de esta sala"}.
 {"Only moderators are allowed to change the subject in this room","Solo los moderadores pueden cambiar el asunto de esta sala"}.
 {"Only moderators can approve voice requests","Solo los moderadores pueden aprobar peticiones de voz"}.
@@ -252,6 +258,7 @@
 {"Outgoing s2s Connections","Conexiones S2S salientes"}.
 {"Owner privileges required","Se requieren privilegios de propietario de la sala"}.
 {"Packet","Paquete"}.
+{"Participant","Participante"}.
 {"Password ~b","Contraseña ~b"}.
 {"Password:","Contraseña:"}.
 {"Password","Contraseña"}.
@@ -265,6 +272,8 @@
 {"Persist items to storage","Persistir elementos al almacenar"}.
 {"Ping","Ping"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Ten en cuenta que estas opciones solo harán copia de seguridad de la base de datos Mnesia embebida. Si estás usando ODBC tendrás que hacer también copia de seguridad de tu base de datos SQL."}.
+{"Please specify file name.","Por favor especifica el nombre del fichero."}.
+{"Please specify file size.","Por favor especifica el tamaño del  fichero."}.
 {"Please, wait for a while before sending new voice request","Por favor, espera un poco antes de enviar otra petición de voz"}.
 {"Pong","Pong"}.
 {"Port ~b","Puerto ~b"}.
@@ -300,6 +309,7 @@
 {"Restore binary backup immediately:","Restaurar inmediatamente copia de seguridad binaria:"}.
 {"Restore plain text backup immediately:","Restaurar copias de seguridad de texto plano inmediatamente:"}.
 {"Restore","Restaurar"}.
+{"Roles for which Presence is Broadcasted","Roles para los que sí se difunde su Presencia"}.
 {"Room Configuration","Configuración de la sala"}.
 {"Room creation is denied by service policy","Se te ha denegado crear la sala por política del servicio"}.
 {"Room description","Descripción de la sala"}.
@@ -323,6 +333,7 @@
 {"September","septiembre"}.
 {"Server ~b","Servidor ~b"}.
 {"Server:","Servidor:"}.
+{"Server","Servidor"}.
 {"Set message of the day and send to online users","Poner mensaje del dia y enviar a todos los usuarios conectados"}.
 {"Set message of the day on all hosts and send to online users","Poner mensaje del día en todos los dominios y enviar a los usuarios conectados"}.
 {"Shared Roster Groups","Grupos Compartidos"}.
@@ -408,6 +419,7 @@
 {"Virtual Hosts","Dominios Virtuales"}.
 {"Visitors are not allowed to change their nicknames in this room","Los visitantes no tienen permitido cambiar sus apodos en esta sala"}.
 {"Visitors are not allowed to send messages to all occupants","Los visitantes no pueden enviar mensajes a todos los ocupantes"}.
+{"Visitor","Visitante"}.
 {"Voice request","Petición de voz"}.
 {"Voice requests are disabled in this conference","Las peticiones de voz están desactivadas en esta sala"}.
 {"Wednesday","miércoles"}.

priv/msgs/es.po

@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2015-09-07 14:02+0100\n"
+"PO-Revision-Date: 2016-01-15 12:19+0100\n"
 "Last-Translator: Badlop <badlop@process-one.net>\n"
 "Language-Team: \n"
 "Language: es\n"
@@ -31,11 +31,11 @@ msgstr "Reemplazado por una nueva conexión"
 msgid "has been kicked"
 msgstr "ha sido expulsado"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr "Tu lista de privacidad activa ha denegado el encío de este paquete."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr "Demasiados mensajes sin haber reconocido  recibirlos"
 
@@ -66,9 +66,8 @@ msgid "User"
 msgstr "Usuario"
 
 #: ejabberd_oauth.erl:256
-#, fuzzy
 msgid "Server"
-msgstr "Servidor:"
+msgstr "Servidor"
 
 #: ejabberd_oauth.erl:259 ejabberd_web_admin.erl:1408 mod_configure.erl:1398
 #: mod_configure.erl:1485 mod_configure.erl:1889 mod_configure.erl:2123
@@ -78,7 +77,7 @@ msgstr "Contraseña"
 
 #: ejabberd_oauth.erl:267
 msgid "Accept"
-msgstr ""
+msgstr "Aceptar"
 
 #: ejabberd_web_admin.erl:202 ejabberd_web_admin.erl:214
 #: ejabberd_web_admin.erl:234 ejabberd_web_admin.erl:246
@@ -245,9 +244,8 @@ msgid "Outgoing s2s Connections:"
 msgstr "Conexiones S2S salientes:"
 
 #: ejabberd_web_admin.erl:1559
-#, fuzzy
 msgid "Incoming s2s Connections:"
-msgstr "Conexiones S2S salientes:"
+msgstr "Conexiones S2S entrantes:"
 
 #: ejabberd_web_admin.erl:1595 ejabberd_web_admin.erl:1794
 #: ejabberd_web_admin.erl:1804 ejabberd_web_admin.erl:2214 mod_roster.erl:1429
@@ -848,13 +846,13 @@ msgstr ""
 "Demasiadas (~p) autenticaciones fallidas de esta dirección IP (~s). La "
 "dirección será desbloqueada en ~s UTC"
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
-msgstr ""
+msgstr "Por favor especifica el tamaño del  fichero."
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
-msgstr ""
+msgstr "Por favor especifica el nombre del fichero."
 
 #: mod_ip_blacklist.erl:121
 msgid "This IP address is blacklisted in ~s"
@@ -972,10 +970,9 @@ msgstr "Codificación del servidor ~b"
 msgid "Server ~b"
 msgstr "Servidor ~b"
 
-#: mod_mam.erl:270
-#, fuzzy
-msgid "Only members are allowed to query archives of this room"
-msgstr "Solo los moderadores pueden cambiar el asunto de esta sala"
+#: mod_mam.erl:541
+msgid "Only members may query archives of this room"
+msgstr "Solo miembros pueden consultar el archivo de mensajes de la sala"
 
 #: mod_muc.erl:585
 msgid "Only service administrators are allowed to send service messages"
@@ -995,37 +992,37 @@ msgstr "La sala de conferencias no existe"
 msgid "Chatrooms"
 msgstr "Salas de charla"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
-msgstr ""
+msgstr "Salas vacías"
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr ""
 "Necesitas un cliente con soporte de x:data para poder registrar el apodo"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Registro del apodo en "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Introduce el apodo que quieras registrar"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Apodo"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "El apodo ya está registrado por otra persona"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Debes rellenar el campo \"Apodo\" en el formulario"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "Módulo de MUC para ejabberd"
 
@@ -1192,9 +1189,11 @@ msgstr "Se ha exedido el límite de tráfico"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
+"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"
 
 #: mod_muc_room.erl:241
 msgid "It is not allowed to send private messages to the conference"
@@ -1232,7 +1231,7 @@ msgstr "El receptor no está en la sala de conferencia"
 msgid "It is not allowed to send private messages"
 msgstr "No está permitido enviar mensajes privados"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Solo los ocupantes pueden enviar mensajes a la sala"
 
@@ -1315,7 +1314,7 @@ msgstr "Afiliación no válida: ~s"
 msgid "Invalid role: ~s"
 msgstr "Rol no válido: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Se requieren privilegios de propietario de la sala"
 
@@ -1327,7 +1326,7 @@ msgstr "Configuración para la sala ~s"
 msgid "Room title"
 msgstr "Título de la sala"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Descripción de la sala"
 
@@ -1369,20 +1368,19 @@ msgstr "cualquiera"
 
 #: mod_muc_room.erl:3471
 msgid "Roles for which Presence is Broadcasted"
-msgstr ""
+msgstr "Roles para los que sí se difunde su Presencia"
 
 #: mod_muc_room.erl:3486
-#, fuzzy
 msgid "Moderator"
-msgstr "solo moderadores"
+msgstr "Moderador"
 
 #: mod_muc_room.erl:3496
 msgid "Participant"
-msgstr ""
+msgstr "Participante"
 
 #: mod_muc_room.erl:3506
 msgid "Visitor"
-msgstr ""
+msgstr "Visitante"
 
 #: mod_muc_room.erl:3513
 msgid "Make room members-only"
@@ -1458,35 +1456,35 @@ msgstr "Guardar históricos"
 msgid "You need an x:data capable client to configure room"
 msgstr "Necesitas un cliente con soporte de x:data para configurar la sala"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Número de ocupantes"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "privado"
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "Petición de voz"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "Aprueba o rechaza la petición de voz."
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "Jabber ID del usuario"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "¿Conceder voz a esta persona?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s te invita a la sala ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "la contraseña es"
 

priv/msgs/fr.po

@@ -32,11 +32,11 @@ msgstr "Remplacé par une nouvelle connexion"
 msgid "has been kicked"
 msgstr "a été expulsé"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr "Votre règle de flitrage active a empêché le routage de ce stanza."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr "Trop de stanzas sans accusé de réception (ack)"
 
@@ -852,11 +852,11 @@ msgstr ""
 "Trop (~p) d'authentification ont échoué pour cette adresse IP (~s). "
 "L'adresse sera débloquée à ~s UTC"
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -975,9 +975,9 @@ msgstr "Codage pour le serveur ~b"
 msgid "Server ~b"
 msgstr "Serveur ~b"
 
-#: mod_mam.erl:270
+#: mod_mam.erl:541
 #, fuzzy
-msgid "Only members are allowed to query archives of this room"
+msgid "Only members may query archives of this room"
 msgstr "Seuls les modérateurs peuvent changer le sujet dans ce salon"
 
 #: mod_muc.erl:585
@@ -998,38 +998,38 @@ msgstr "La salle de conférence n'existe pas"
 msgid "Chatrooms"
 msgstr "Salons de discussion"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr ""
 "Vous avez besoin d'un client prenant en charge x:data pour enregistrer un "
 "pseudo"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Enregistrement d'un pseudo sur "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Entrez le pseudo que vous souhaitez enregistrer"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Pseudo"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "Le pseudo est enregistré par une autre personne"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Vous devez préciser le champ \"pseudo\" dans le formulaire"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "Module MUC ejabberd"
 
@@ -1196,8 +1196,8 @@ msgstr "La limite de trafic a été dépassée"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1238,7 +1238,7 @@ msgstr "Le destinataire n'est pas dans la conférence"
 msgid "It is not allowed to send private messages"
 msgstr "L'envoi de messages privés n'est pas autorisé"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Seuls les occupants peuvent envoyer des messages à la conférence"
 
@@ -1327,7 +1327,7 @@ msgstr "Affiliation invalide : ~s"
 msgid "Invalid role: ~s"
 msgstr "Role invalide : ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Les droits de propriétaire sont nécessaires"
 
@@ -1339,7 +1339,7 @@ msgstr "Configuration pour le salon ~s"
 msgid "Room title"
 msgstr "Titre du salon"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Description :"
 
@@ -1470,35 +1470,35 @@ msgid "You need an x:data capable client to configure room"
 msgstr ""
 "Vous avez besoin d'un client supportant x:data pour configurer le salon"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Nombre d'occupants"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "privé"
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "Demande de 'voice'"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "Approuver ou refuser la demande de 'voice'"
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "JID de l'utilisateur "
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "Accorder 'voice' à cet utilisateur"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s vous a invité dans la salle de discussion ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "le mot de passe est"
 

priv/msgs/gl.po

@@ -24,11 +24,11 @@ msgstr "Substituído por unha nova conexión"
 msgid "has been kicked"
 msgstr "foi expulsado"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr ""
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr ""
 
@@ -845,11 +845,11 @@ msgid ""
 "will be unblocked at ~s UTC"
 msgstr ""
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -969,9 +969,9 @@ msgstr "Codificación de servidor ~b"
 msgid "Server ~b"
 msgstr "Servidor ~b"
 
-#: mod_mam.erl:270
+#: mod_mam.erl:541
 #, fuzzy
-msgid "Only members are allowed to query archives of this room"
+msgid "Only members may query archives of this room"
 msgstr "Só os moderadores están autorizados a cambiar o tema nesta sala"
 
 #: mod_muc.erl:585
@@ -992,38 +992,38 @@ msgstr "A sala de conferencias non existe"
 msgid "Chatrooms"
 msgstr "Salas de charla"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 #, fuzzy
 msgid "You need a client that supports x:data to register the nickname"
 msgstr ""
 "Necesitas un cliente con soporte de x:data para poder rexistrar o alcume"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Rexistro do alcume en "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Introduce o alcume que queiras rexistrar"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Alcume"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "O alcume xa está rexistrado por outra persoa"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Debes encher o campo \"Alcumo\" no formulario"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "Módulo de MUC para ejabberd"
 
@@ -1197,8 +1197,8 @@ msgstr "Hase exedido o límite de tráfico"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1238,7 +1238,7 @@ msgstr "O receptor non está na sala de conferencia"
 msgid "It is not allowed to send private messages"
 msgstr "Non está permitido enviar mensaxes privadas"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Só os ocupantes poden enviar mensaxes á sala"
 
@@ -1324,7 +1324,7 @@ msgstr "Afiliación non válida: ~s"
 msgid "Invalid role: ~s"
 msgstr "Rol non válido: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Requírense privilexios de propietario da sala"
 
@@ -1336,7 +1336,7 @@ msgstr "Configuración para a sala ~s"
 msgid "Room title"
 msgstr "Título da sala"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Descrición da sala"
 
@@ -1468,36 +1468,36 @@ msgstr "Gardar históricos"
 msgid "You need an x:data capable client to configure room"
 msgstr "Necesitas un cliente con soporte de x:data para configurar a sala"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Número de ocupantes"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "privado"
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr ""
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr ""
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 #, fuzzy
 msgid "User JID"
 msgstr "Usuario "
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr ""
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s invítache á sala ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "a contrasinal é"
 

priv/msgs/he.msg

@@ -88,6 +88,7 @@
 {"ejabberd Web Admin","מנהל רשת ejabberd"}.
 {"Elements","אלמנטים"}.
 {"Email","דוא״ל"}.
+{"Empty Rooms","חדרים ריקים"}.
 {"Enable logging","אפשר רישום פעילות"}.
 {"Enable message archiving","אפשר אחסון הודעות"}.
 {"Encoding for server ~b","קידוד עבור שרת ~b"}.
@@ -143,6 +144,7 @@
 {"Import Users from Dir at ","ייבוא משתמשים מתוך מדור אצל "}.
 {"Import Users From jabberd14 Spool Files","יבא משתמשים מתוך קבצי סליל (Spool Files) של jabberd14"}.
 {"Improper message type","טיפוס הודעה לא מתאים"}.
+{"Incoming s2s Connections:","חיבורי s2s נכנסים:"}.
 {"Incorrect password","מילת מעבר שגויה"}.
 {"Invalid affiliation: ~s","סינוף שגוי: ~s"}.
 {"Invalid role: ~s","תפקיד שגוי: ~s"}.
@@ -155,8 +157,9 @@
 {"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 to the conference","אין זה מותר לשלוח הודעות פרטיות לועידה"}.
 {"It is not allowed to send private messages","אין זה מותר לשלוח הודעות פרטיות"}.
 {"Jabber Account Registration","רישום חשבון Jabber"}.
 {"Jabber ID ~s is invalid","מזהה Jabber ‏~s הינו שגוי"}.
@@ -199,6 +202,7 @@
 {"Minimum interval between voice requests (in seconds)","תדירות מינימלית בין בקשות ביטוי (בשניות)"}.
 {"Moderator privileges required","נדרשות הרשאות אחראי"}.
 {"moderators only","לאחראים בלבד"}.
+{"Moderator","אחראי"}.
 {"Modified modules","מודולים שהותאמו"}.
 {"Modules at ~p","מודולים אצל ~p"}.
 {"Modules","מודולים"}.
@@ -240,6 +244,7 @@
 {"Online Users","משתמשים מקוונים"}.
 {"Online","מקוון"}.
 {"Only deliver notifications to available users","מסור התראות למשתמשים זמינים בלבד"}.
+{"Only members may query archives of this room","רק חברים רשאים לתשאל ארכיונים של חדר זה"}.
 {"Only moderators and participants are allowed to change the subject in this room","רק אחראים ומשתתפים רשאים לשנות את הנושא בחדר זה"}.
 {"Only moderators are allowed to change the subject in this room","רק אחראים רשאים לשנות את הנושא בחדר זה"}.
 {"Only moderators can approve voice requests","רק אחראים יכולים לאשר בקשות ביטוי"}.
@@ -253,6 +258,7 @@
 {"Outgoing s2s Connections","חיבורי s2s יוצאים"}.
 {"Owner privileges required","נדרשות הרשאות בעלים"}.
 {"Packet","חבילת מידע"}.
+{"Participant","משתתף"}.
 {"Password ~b","סיסמה ~b"}.
 {"Password Verification:","אימות סיסמה:"}.
 {"Password Verification","אימות סיסמה"}.
@@ -266,6 +272,8 @@
 {"Persist items to storage","פריטים קבועים לאחסון"}.
 {"Ping","פינג"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","אנא שים לב כי אפשרויות אלו יגבו את מסד הנתונים המובנה Mnesia בלבד. אם הינך עושה שימוש במודול ODBC, עליך גם לגבות את מסד הנתונים SQL אשר מצוי ברשותך בנפרד."}.
+{"Please specify file name.","אנא ציין שם קובץ."}.
+{"Please specify file size.","אנא ציין גודל קובץ."}.
 {"Please, wait for a while before sending new voice request","אנא, המתן לזמן מה לפני שליחת בקשת ביטוי חדשה"}.
 {"Pong","פונג"}.
 {"Port ~b","פורט ~b"}.
@@ -301,6 +309,7 @@
 {"Restore binary backup immediately:","שחזר גיבוי בינארי לאלתר:"}.
 {"Restore plain text backup immediately:","שחזר גיבוי טקסט גלוי (plain text) לאלתר:"}.
 {"Restore","שחזר"}.
+{"Roles for which Presence is Broadcasted","תפקידים להם נוכחות הינה משודרת"}.
 {"Room Configuration","תצורת חדר"}.
 {"Room creation is denied by service policy","יצירת חדר נדחתה על ידי פוליסת שירות"}.
 {"Room description","תיאור חדר"}.
@@ -332,7 +341,7 @@
 {"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 מסוימים יכולים לאחסן את הסיסמה שלך על המחשב שלך. השתמש בתכונה זו רק אם אתה סמוך כי המחשב שלך הינו מוגן."}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","ישנם לקוחות Jabber אשר מסוגלים לאחסן את הסיסמה שלך בתוך המחשב, אולם עליך לעשות זאת רק בתוך המחשב האישי שלך מסיבות ביטחוניות."}.
 {"Specify the access model","ציין מודל גישה"}.
 {"Specify the event message type","ציין טיפוס הודעת אירוע"}.
 {"Specify the publisher model","ציין מודל פרסום"}.
@@ -410,6 +419,7 @@
 {"Virtual Hosts","מארחים מדומים"}.
 {"Visitors are not allowed to change their nicknames in this room","מבקרים אינם מורשים לשנות את שמות הכינויים שלהם בחדר זה"}.
 {"Visitors are not allowed to send messages to all occupants","מבקרים אינם מורשים לשלוח הודעות אל כל הנוכחים"}.
+{"Visitor","מבקר"}.
 {"Voice requests are disabled in this conference","בקשות ביטוי מנוטרלות בועידה זו"}.
 {"Voice request","בקשת ביטוי"}.
 {"Wednesday","יום רביעי"}.

priv/msgs/he.po

@@ -32,11 +32,11 @@ msgstr "הוחלף בחיבור חדש"
 msgid "has been kicked"
 msgstr "נבעט/ה"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr "רשימת הפרטיות הפעילה שלך אסרה את הניתוב של סטנזה זו."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr "יותר מדי סטנזות בלי אישורי קבלה"
 
@@ -852,11 +852,11 @@ msgstr ""
 "יותר מדי (~p) אימותים כושלים מתוך כתובת IP זו (~s). הכתובת תורשה לקבל גישה "
 "בשעה ~s UTC"
 
-#: mod_http_upload.erl:587
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr "אנא ציין גודל קובץ."
 
-#: mod_http_upload.erl:591
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr "אנא ציין שם קובץ."
 
@@ -974,8 +974,8 @@ msgstr "קידוד עבור שרת ~b"
 msgid "Server ~b"
 msgstr "שרת ~b"
 
-#: mod_mam.erl:270
-msgid "Only members are allowed to query archives of this room"
+#: mod_mam.erl:541
+msgid "Only members may query archives of this room"
 msgstr "רק חברים רשאים לתשאל ארכיונים של חדר זה"
 
 #: mod_muc.erl:585
@@ -994,38 +994,38 @@ msgstr "חדר ועידה לא קיים"
 msgid "Chatrooms"
 msgstr "חדרי שיחה"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr "חדרים ריקים"
 
 # to register nickname
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr "עליך להשתמש בלקוח אשר תומך x:data כדי לרשום את השם כינוי"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "רישום שם כינוי אצל "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "הזן שם כינוי אשר ברצונך לרשום"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "שם כינוי"
 
 # note: another person > someone else
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "שם כינוי זה הינו רשום על ידי מישהו אחר"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "עליך למלא את השדה \"שם כינוי\" בתוך התבנית"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "מודול MUC של ejabberd"
 
@@ -1237,7 +1237,7 @@ msgstr "מקבל אינו מצוי בחדר הועידה"
 msgid "It is not allowed to send private messages"
 msgstr "אין זה מותר לשלוח הודעות פרטיות"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "רק נוכחים רשאים לשלוח הודעות אל הועידה"
 
@@ -1321,7 +1321,7 @@ msgstr "סינוף שגוי: ~s"
 msgid "Invalid role: ~s"
 msgstr "תפקיד שגוי: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "נדרשות הרשאות בעלים"
 
@@ -1334,7 +1334,7 @@ msgstr "תצורת חדר ~s"
 msgid "Room title"
 msgstr "כותרת חדר"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "תיאור חדר"
 
@@ -1462,35 +1462,35 @@ msgstr "אפשר רישום פעילות"
 msgid "You need an x:data capable client to configure room"
 msgstr "עליך להשתמש בלקוח אשר מסוגל להבין x:data כדי להגדיר חדר"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "מספר של נוכחים"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "פרטי, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "בקשת ביטוי"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "אשר או דחה בקשת ביטוי."
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "‏JID משתמש"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "להעניק ביטוי לאישיות זו?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "‫~s מזמינך לחדר ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "הסיסמה היא"
 

priv/msgs/id.po

@@ -28,11 +28,11 @@ msgstr "Diganti dengan koneksi baru"
 msgid "has been kicked"
 msgstr "telah dikick"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr "Daftar privasi aktif Anda telah menolak routing ztanza ini"
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr ""
 
@@ -848,11 +848,11 @@ msgid ""
 "will be unblocked at ~s UTC"
 msgstr ""
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -971,9 +971,9 @@ msgstr "Pengkodean untuk layanan ~b"
 msgid "Server ~b"
 msgstr "Layanan ~b"
 
-#: mod_mam.erl:270
+#: mod_mam.erl:541
 #, fuzzy
-msgid "Only members are allowed to query archives of this room"
+msgid "Only members may query archives of this room"
 msgstr ""
 "Hanya moderator yang diperbolehkan untuk mengubah topik dalam ruangan ini"
 
@@ -995,36 +995,36 @@ msgstr "Ruang Konferensi tidak ada"
 msgid "Chatrooms"
 msgstr "Ruangan Chat"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr "Anda memerlukan klien yang mendukung x:data untuk mendaftar julukan"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Pendaftaran Julukan pada"
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Masukkan nama julukan Anda jika ingin mendaftar"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Nama Julukan"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "Julukan tersebut telah didaftarkan oleh orang lain"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Anda harus mengisi kolom \"Julukan\" dalam formulir"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "ejabberd MUC Module"
 
@@ -1194,8 +1194,8 @@ msgstr "Lalu lintas melebihi batas"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1236,7 +1236,7 @@ msgstr "Penerima tidak berada di ruangan konferensi"
 msgid "It is not allowed to send private messages"
 msgstr "Hal ini tidak diperbolehkan untuk mengirim pesan pribadi"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Hanya penghuni yang diizinkan untuk mengirim pesan ke konferensi"
 
@@ -1322,7 +1322,7 @@ msgstr "Afiliasi tidak valid: ~s"
 msgid "Invalid role: ~s"
 msgstr "Peran tidak valid: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Hak istimewa owner dibutuhkan"
 
@@ -1334,7 +1334,7 @@ msgstr "Pengaturan ruangan ~s"
 msgid "Room title"
 msgstr "Nama Ruangan"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Keterangan ruangan"
 
@@ -1465,36 +1465,36 @@ msgstr "Aktifkan catatan"
 msgid "You need an x:data capable client to configure room"
 msgstr "Anda memerlukan x:data klien untuk dapat mengkonfigurasi ruangan"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Jumlah Penghuni"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "pribadi, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr ""
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr ""
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 #, fuzzy
 msgid "User JID"
 msgstr "Pengguna"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr ""
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s mengundang anda ke ruangan ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "kata sandi yaitu:"
 

priv/msgs/it.po

@@ -32,13 +32,13 @@ msgstr "Sostituito da una nuova connessione"
 msgid "has been kicked"
 msgstr "è stata/o espulsa/o"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr ""
 "In base alla tua attuale lista privacy questa stanza è stata esclusa dalla "
 "navigazione."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr ""
 
@@ -854,11 +854,11 @@ msgid ""
 "will be unblocked at ~s UTC"
 msgstr ""
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -978,9 +978,9 @@ msgstr "Codifica per il server ~b"
 msgid "Server ~b"
 msgstr "Server ~b"
 
-#: mod_mam.erl:270
+#: mod_mam.erl:541
 #, fuzzy
-msgid "Only members are allowed to query archives of this room"
+msgid "Only members may query archives of this room"
 msgstr ""
 "La modifica dell'oggetto di questa stanza è consentita soltanto ai moderatori"
 
@@ -1002,36 +1002,36 @@ msgstr "La stanza per conferenze non esiste"
 msgid "Chatrooms"
 msgstr "Stanze"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr "Per registrare il nickname è necessario un client che supporti x:data"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Registrazione di un nickname su "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Immettere il nickname che si vuole registrare"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Nickname"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "Questo nickname è registrato da un'altra persona"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Si deve riempire il campo \"Nickname\" nel modulo"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "Modulo MUC per ejabberd"
 
@@ -1201,8 +1201,8 @@ msgstr "Limite di traffico superato"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1242,7 +1242,7 @@ msgstr "Il destinatario non è nella stanza per conferenze"
 msgid "It is not allowed to send private messages"
 msgstr "Non è consentito l'invio di messaggi privati"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "L'invio di messaggi alla conferenza è consentito soltanto ai presenti"
 
@@ -1327,7 +1327,7 @@ msgstr "Affiliazione non valida: ~s"
 msgid "Invalid role: ~s"
 msgstr "Ruolo non valido: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Necessari i privilegi di proprietario"
 
@@ -1339,7 +1339,7 @@ msgstr "Configurazione per la stanza ~s"
 msgid "Room title"
 msgstr "Titolo della stanza"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Descrizione della stanza"
 
@@ -1471,35 +1471,35 @@ msgid "You need an x:data capable client to configure room"
 msgstr ""
 "Per la configurazione della stanza è necessario un client che supporti x:data"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Numero di presenti"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "privato, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "Richiesta di parola"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "Approva oppure respingi la richiesta di parola."
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "JID utente"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "Dare parola a questa persona?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s ti invita nella stanza ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "la password è"
 

priv/msgs/ja.msg

@@ -1,4 +1,5 @@
 %% -*- coding: latin-1 -*-
+{"Accept","許可"}.
 {"Access Configuration","アクセス設定"}.
 {"Access Control List Configuration","アクセスコントロールリスト設定"}.
 {"Access control lists","アクセスコントロールリスト"}.
@@ -72,7 +73,7 @@
 {"Deliver payloads with event notifications","イベント通知と同時にペイロードを配送する"}.
 {"Description:","説明:"}.
 {"Disc only copy","ディスクだけのコピー"}.
-{"Displayed Groups:","表示グループ"}.
+{"Displayed Groups:","表示グループ:"}.
 {"Don't tell your password to anybody, not even the administrators of the Jabber server.","パスワードは誰にも教えないようにしてください。Jabber サーバーの管理者があなたにパスワードを尋ねることはありません。"}.
 {"Dump Backup to Text File at ","テキストファイルにバックアップ: "}.
 {"Dump to Text File","テキストファイルに出力"}.
@@ -87,6 +88,7 @@
 {"ejabberd Web Admin","ejabberd ウェブ管理"}.
 {"Elements","要素"}.
 {"Email","メールアドレス"}.
+{"Empty Rooms","空のルーム"}.
 {"Enable logging","ロギングを有効"}.
 {"Enable message archiving","メッセージアーカイブを有効化"}.
 {"Encoding for server ~b","サーバーのエンコーディング ~b"}.
@@ -103,7 +105,7 @@
 {"Erlang Jabber Server","Erlang Jabber Server"}.
 {"Error","エラー"}.
 {"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","例: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
-{"Exclude Jabber IDs from CAPTCHA challenge","CAPTCHA 試験を免除する Jabber ID"}.
+{"Exclude Jabber IDs from CAPTCHA challenge","CAPTCHA 入力を免除する Jabber ID"}.
 {"Export all tables as SQL queries to a file:","すべてのテーブルをSQL形式でファイルにエクスポート: "}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","サーバーにあるすべてのユーザーデータを PIEFXIS ファイルにエクスポート (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","ホストのユーザーデータを PIEFXIS ファイルにエクスポート (XEP-0227):"}.
@@ -113,7 +115,7 @@
 {"Fill in fields to search for any matching Jabber User","項目を入力してユーザーを検索してください"}.
 {"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","項目を入力してユーザーを検索を行えます (* を使用すると部分文字列にマッチします)"}.
 {"Friday","金曜日"}.
-{"From ~s","差出人 ~s"}.
+{"From ~s","From ~s"}.
 {"From","差出人"}.
 {"Full Name","氏名"}.
 {"Get Number of Online Users","オンラインユーザー数を取得"}.
@@ -142,6 +144,7 @@
 {"Import Users from Dir at ","ディレクトリからユーザーをインポート: "}.
 {"Import Users From jabberd14 Spool Files","jabberd14 Spool ファイルからユーザーをインポート"}.
 {"Improper message type","誤ったメッセージタイプです"}.
+{"Incoming s2s Connections:","内向き s2s コネクション:"}.
 {"Incorrect password","パスワードが違います"}.
 {"Invalid affiliation: ~s","無効な分掌です: ~s"}.
 {"Invalid role: ~s","無効な役です: ~s"}.
@@ -154,6 +157,7 @@
 {"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","プライベートメッセージを送信することはできません"}.
@@ -196,6 +200,7 @@
 {"Message body","本文"}.
 {"Middle Name","ミドルネーム"}.
 {"Minimum interval between voice requests (in seconds)","発言権の要求の最小時間間隔 (秒)"}.
+{"Moderator","モデレーター"}.
 {"Moderator privileges required","モデレーター権限が必要です"}.
 {"moderators only","モデレーターにのみ"}.
 {"Modified modules","更新されたモジュール"}.
@@ -221,7 +226,7 @@
 {"Nodes","ノード"}.
 {"No limit","制限なし"}.
 {"None","なし"}.
-{"No resource provided","リソースが提供されませんでした"}.
+{"No resource provided","リソースが指定されていません"}.
 {"Not Found","見つかりません"}.
 {"Notify subscribers when items are removed from the node","アイテムがノードから消された時に購読者へ通知する"}.
 {"Notify subscribers when the node configuration changes","ノード設定に変更があった時に購読者へ通知する"}.
@@ -239,6 +244,7 @@
 {"Online Users:","オンラインユーザー:"}.
 {"Online Users","オンラインユーザー"}.
 {"Only deliver notifications to available users","有効なユーザーにのみ告知を送信する"}.
+{"Only members may query archives of this room","メンバーのみがこのルームのアーカイブを取得できます"}.
 {"Only moderators and participants are allowed to change the subject in this room","モデレーターと参加者のみがチャットルームの件名を変更できます"}.
 {"Only moderators are allowed to change the subject in this room","モデレーターのみがチャットルームの件名を変更できます"}.
 {"Only moderators can approve voice requests","モデレーターだけが発言権の要求を承認できます"}.
@@ -252,7 +258,8 @@
 {"Outgoing s2s Connections","外向き s2s コネクション"}.
 {"Owner privileges required","主宰者の権限が必要です"}.
 {"Packet","パケット"}.
-{"Password:","パスワード"}.
+{"Participant","参加者"}.
+{"Password:","パスワード:"}.
 {"Password","パスワード"}.
 {"Password ~b","パスワード ~b"}.
 {"Password Verification:","パスワード (確認):"}.
@@ -265,6 +272,8 @@
 {"Persist items to storage","アイテムをストレージに保存する"}.
 {"Ping","Ping"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","これらのオプションは組み込みの Mnesia データーベースのバックアップのみを行うことに注意してください。もし ODBC モジュールを使用している場合は、SQL データーベースのバックアップを別に行う必要があります。"}.
+{"Please specify file name.","ファイル名を指定してください。"}.
+{"Please specify file size.","ファイルサイズを指定してください。"}.
 {"Please, wait for a while before sending new voice request","新しい発言権の要求を送るまで少し間をおいてください"}.
 {"Pong","Pong"}.
 {"Port","ポート"}.
@@ -300,6 +309,7 @@
 {"Restore binary backup after next ejabberd restart (requires less memory):","ejabberd の再起動時にバイナリバックアップからリストア (メモリ少):"}.
 {"Restore binary backup immediately:","直ちにバイナリバックアップからリストア:"}.
 {"Restore plain text backup immediately:","直ちにプレーンテキストバックアップからリストア:"}.
+{"Roles for which Presence is Broadcasted","プレゼンスをブロードキャストするロール"}.
 {"Room Configuration","チャットルームの設定"}.
 {"Room creation is denied by service policy","サービスポリシーによってチャットルームの作成が禁止されています"}.
 {"Room description","チャットルームの説明"}.
@@ -322,6 +332,7 @@
 {"Send announcement to all users","すべてのユーザーにアナウンスを送信"}.
 {"September","9月"}.
 {"Server:","サーバー:"}.
+{"Server","サーバー"}.
 {"Server ~b","サーバー ~b"}.
 {"Set message of the day and send to online users","お知らせメッセージを設定し、オンラインユーザーに送信"}.
 {"Set message of the day on all hosts and send to online users","全ホストのお知らせメッセージを設定し、オンラインユーザーに送信"}.
@@ -367,7 +378,7 @@
 {"This IP address is blacklisted in ~s","このIPアドレスはアクセスを禁止されています ~s"}.
 {"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","大文字と小文字は区別しません: macbeth は MacBeth や Macbeth と同じです。"}.
 {"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","ここはこの Jabber サーバーにアカウントを作成するページです。あなたの JID (JabberID) は username@server のような形式になります。注意事項どおり、正しく項目を記入してください。"}.
-{"This page allows to unregister a Jabber account in this Jabber server.","ここはこの Jabber サーバーのアカウントを削除するページです。"}.
+{"This page allows to unregister a Jabber account in this Jabber server.","このページはサーバー上のJabberアカウントを削除するページです。"}.
 {"Thursday","木曜日"}.
 {"Time delay","遅延時間"}.
 {"Time","時間"}.
@@ -376,7 +387,7 @@
 {"Too many unacked stanzas","多くのスタンザが応答していません"}.
 {"To ~s","宛先 ~s"}.
 {"Total rooms","チャットルーム数"}.
-{"To","宛先"}.
+{"To","To"}.
 {"Traffic rate limit is exceeded","トラフィックレートの制限を超えました"}.
 {"Transactions Aborted:","トランザクションの失敗:"}.
 {"Transactions Committed:","トランザクションのコミット:"}.
@@ -394,7 +405,7 @@
 {"Update script","スクリプトの更新"}.
 {"Update","更新"}.
 {"Uptime:","起動時間:"}.
-{"Use of STARTTLS required","STARTTLS の使用が必要です"}.
+{"Use of STARTTLS required","STARTTLS の使用が必須です"}.
 {"User","ユーザー"}.
 {"User JID","ユーザー JID"}.
 {"User Management","ユーザー管理"}.
@@ -408,6 +419,7 @@
 {"Virtual Hosts","バーチャルホスト"}.
 {"Visitors are not allowed to change their nicknames in this room","傍聴者はこのチャットルームでニックネームを変更することはできません"}.
 {"Visitors are not allowed to send messages to all occupants","傍聴者はすべての在室者にメッセージを送信することはできません"}.
+{"Visitor","傍聴者"}.
 {"Voice requests are disabled in this conference","この会議では、発言権の要求はできません"}.
 {"Voice request","発言権を要求"}.
 {"Wednesday","水曜日"}.

priv/msgs/ja.po

@@ -12,11 +12,11 @@ msgstr ""
 
 #: ejabberd_c2s.erl:505 ejabberd_c2s.erl:853
 msgid "Use of STARTTLS required"
-msgstr "STARTTLS の使用が必要です"
+msgstr "STARTTLS の使用が必須です"
 
 #: ejabberd_c2s.erl:604
 msgid "No resource provided"
-msgstr "リソースが提供されませんでした"
+msgstr "リソースが指定されていません"
 
 #: ejabberd_c2s.erl:1349
 msgid "Replaced by new connection"
@@ -27,11 +27,11 @@ msgstr "新しいコネクションによって置き換えられました"
 msgid "has been kicked"
 msgstr "はキックされました"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr "あなたのプライバシーリストはこのスタンザのルーティングを拒否しました。"
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr "多くのスタンザが応答していません"
 
@@ -63,9 +63,8 @@ msgid "User"
 msgstr "ユーザー"
 
 #: ejabberd_oauth.erl:256
-#, fuzzy
 msgid "Server"
-msgstr "サーバー:"
+msgstr "サーバー"
 
 #: ejabberd_oauth.erl:259 ejabberd_web_admin.erl:1408 mod_configure.erl:1398
 #: mod_configure.erl:1485 mod_configure.erl:1889 mod_configure.erl:2123
@@ -75,7 +74,7 @@ msgstr "パスワード"
 
 #: ejabberd_oauth.erl:267
 msgid "Accept"
-msgstr ""
+msgstr "許可"
 
 #: ejabberd_web_admin.erl:202 ejabberd_web_admin.erl:214
 #: ejabberd_web_admin.erl:234 ejabberd_web_admin.erl:246
@@ -242,9 +241,8 @@ msgid "Outgoing s2s Connections:"
 msgstr "外向き s2s コネクション:"
 
 #: ejabberd_web_admin.erl:1559
-#, fuzzy
 msgid "Incoming s2s Connections:"
-msgstr "外向き s2s コネクション:"
+msgstr "内向き s2s コネクション:"
 
 #: ejabberd_web_admin.erl:1595 ejabberd_web_admin.erl:1794
 #: ejabberd_web_admin.erl:1804 ejabberd_web_admin.erl:2214 mod_roster.erl:1429
@@ -267,7 +265,7 @@ msgstr "接続リソース:"
 #: ejabberd_web_admin.erl:1686 mod_register_web.erl:239
 #: mod_register_web.erl:475
 msgid "Password:"
-msgstr "パスワード"
+msgstr "パスワード:"
 
 #: ejabberd_web_admin.erl:1693 mod_configure.erl:2117
 msgid "Remove User"
@@ -673,7 +671,7 @@ msgstr "宛先 ~s"
 
 #: mod_configure.erl:782
 msgid "From ~s"
-msgstr "差出人 ~s"
+msgstr "From ~s"
 
 #: mod_configure.erl:1002
 msgid "Database Tables Configuration at "
@@ -839,13 +837,13 @@ msgid ""
 msgstr ""
 "~p回の認証に失敗しました。このIPアドレス(~s)は~s UTCまでブロックされます。"
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
-msgstr ""
+msgstr "ファイルサイズを指定してください。"
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
-msgstr ""
+msgstr "ファイル名を指定してください。"
 
 #: mod_ip_blacklist.erl:121
 msgid "This IP address is blacklisted in ~s"
@@ -961,10 +959,9 @@ msgstr "サーバーのエンコーディング ~b"
 msgid "Server ~b"
 msgstr "サーバー ~b"
 
-#: mod_mam.erl:270
-#, fuzzy
-msgid "Only members are allowed to query archives of this room"
-msgstr "モデレーターのみがチャットルームの件名を変更できます"
+#: mod_mam.erl:541
+msgid "Only members may query archives of this room"
+msgstr "メンバーのみがこのルームのアーカイブを取得できます"
 
 #: mod_muc.erl:585
 msgid "Only service administrators are allowed to send service messages"
@@ -982,36 +979,36 @@ msgstr "会議室は存在しません"
 msgid "Chatrooms"
 msgstr "チャットルーム"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
-msgstr ""
+msgstr "空のルーム"
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr "ニックネームを登録するには x:data をサポートするクライアントが必要です"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "ニックネーム登録: "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "登録するニックネームを入力してください"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "ニックネームはほかの人によって登録されています"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "フォームの\"ニックネーム\"欄を入力する必要があります"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "ejabberd MUCモジュール"
 
@@ -1178,9 +1175,9 @@ msgstr "トラフィックレートの制限を超えました"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
-msgstr ""
+"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"
+msgstr "このルームにエラーメッセージを送ることは許可されていません。参加者(~s)はエラーメッセージを(~s)を送信してルームからキックされました。"
 
 #: mod_muc_room.erl:241
 msgid "It is not allowed to send private messages to the conference"
@@ -1219,7 +1216,7 @@ msgstr "受信者はこの会議室にいません"
 msgid "It is not allowed to send private messages"
 msgstr "プライベートメッセージを送信することはできません"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "在室者のみがこの会議にメッセージを送ることができます"
 
@@ -1301,7 +1298,7 @@ msgstr "無効な分掌です: ~s"
 msgid "Invalid role: ~s"
 msgstr "無効な役です: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "主宰者の権限が必要です"
 
@@ -1313,7 +1310,7 @@ msgstr "チャットルーム ~s の設定"
 msgid "Room title"
 msgstr "チャットルームのタイトル"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "チャットルームの説明"
 
@@ -1355,20 +1352,19 @@ msgstr "誰にでも"
 
 #: mod_muc_room.erl:3471
 msgid "Roles for which Presence is Broadcasted"
-msgstr ""
+msgstr "プレゼンスをブロードキャストするロール"
 
 #: mod_muc_room.erl:3486
-#, fuzzy
 msgid "Moderator"
-msgstr "モデレーターにのみ"
+msgstr "モデレーター"
 
 #: mod_muc_room.erl:3496
 msgid "Participant"
-msgstr ""
+msgstr "参加者"
 
 #: mod_muc_room.erl:3506
 msgid "Visitor"
-msgstr ""
+msgstr "傍聴者"
 
 #: mod_muc_room.erl:3513
 msgid "Make room members-only"
@@ -1432,7 +1428,7 @@ msgstr "メッセージアーカイブを有効化"
 
 #: mod_muc_room.erl:3612
 msgid "Exclude Jabber IDs from CAPTCHA challenge"
-msgstr "CAPTCHA 試験を免除する Jabber ID"
+msgstr "CAPTCHA 入力を免除する Jabber ID"
 
 #: mod_muc_room.erl:3621
 msgid "Enable logging"
@@ -1443,35 +1439,35 @@ msgid "You need an x:data capable client to configure room"
 msgstr ""
 "チャットルームを設定するには x:data をサポートするクライアントが必要です"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "在室者の数"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "プライベート、"
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "発言権を要求"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "発言権の要求を承認または却下します。"
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "ユーザー JID"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "この人に発言権を与えますか ?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s はあなたをチャットルーム ~s に招待しています"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "パスワードは"
 
@@ -1503,7 +1499,7 @@ msgstr "差出人"
 
 #: mod_offline.erl:813
 msgid "To"
-msgstr "宛先"
+msgstr "To"
 
 #: mod_offline.erl:814
 msgid "Packet"
@@ -1752,7 +1748,7 @@ msgstr "新しいパスワード:"
 
 #: mod_register_web.erl:463
 msgid "This page allows to unregister a Jabber account in this Jabber server."
-msgstr "ここはこの Jabber サーバーのアカウントを削除するページです。"
+msgstr "このページはサーバー上のJabberアカウントを削除するページです。"
 
 #: mod_register_web.erl:480
 msgid "Unregister"
@@ -1809,7 +1805,7 @@ msgstr "メンバー:"
 
 #: mod_shared_roster.erl:1250
 msgid "Displayed Groups:"
-msgstr "表示グループ"
+msgstr "表示グループ:"
 
 #: mod_shared_roster.erl:1259
 msgid "Group "

priv/msgs/nl.po

@@ -30,11 +30,11 @@ msgstr "Vervangen door een nieuwe verbinding"
 msgid "has been kicked"
 msgstr "is weggestuurd"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr "Uw actieve privacy-lijst verbied het routeren van dit stanza."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr "Te veel niet-bevestigde stanzas"
 
@@ -847,11 +847,11 @@ msgstr ""
 "Te veel (~p) mislukte authenticatie-pogingen van dit IP-adres (~s). Dit "
 "adres zal worden gedeblokkeerd om ~s UTC"
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -971,9 +971,9 @@ msgstr "Karakterset voor server ~b"
 msgid "Server ~b"
 msgstr "Server ~b"
 
-#: mod_mam.erl:270
+#: mod_mam.erl:541
 #, fuzzy
-msgid "Only members are allowed to query archives of this room"
+msgid "Only members may query archives of this room"
 msgstr "Alleen moderators mogen het onderwerp van deze chatruimte veranderen"
 
 #: mod_muc.erl:585
@@ -996,37 +996,37 @@ msgstr "De chatruimte bestaat niet"
 msgid "Chatrooms"
 msgstr "Groepsgesprekken"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr ""
 "U hebt een client nodig die x:data ondersteunt om een bijnaam te registreren"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Registratie van een bijnaam op "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Voer de bijnaam in die u wilt registreren"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "Deze bijnaam is al geregistreerd door iemand anders"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "U moet het veld \"bijnaam\" invullen"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "ejabberd's MUC module"
 
@@ -1195,8 +1195,8 @@ msgstr "Dataverkeerslimiet overschreden"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1236,7 +1236,7 @@ msgstr "De ontvanger is niet in de chatruimte"
 msgid "It is not allowed to send private messages"
 msgstr "Het is niet toegestaan priveberichten te sturen"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Alleen aanwezigen mogen berichten naar de chatruimte verzenden"
 
@@ -1321,7 +1321,7 @@ msgstr "Ongeldige affiliatie: ~s"
 msgid "Invalid role: ~s"
 msgstr "Ongeldige rol: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "U hebt eigenaarsprivileges nodig"
 
@@ -1333,7 +1333,7 @@ msgstr "Instellingen van chatruimte ~s"
 msgid "Room title"
 msgstr "Naam van de chatruimte"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Beschrijving"
 
@@ -1464,35 +1464,35 @@ msgstr ""
 "U hebt een client nodig die x:data ondersteunt om deze chatruimte in te "
 "stellen"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Aantal aanwezigen"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "privé, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "Stemaanvraag"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "Keur stemaanvraag goed of af."
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "JID Gebruiker"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "Stemaanvraag honoreren voor deze persoon?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s nodigt je uit voor het groepsgesprek ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "het wachtwoord is"
 

priv/msgs/no.po

@@ -28,11 +28,11 @@ msgstr "Erstattet av en ny tilkobling"
 msgid "has been kicked"
 msgstr "har blitt kastet ut"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr "Din aktive privat liste har blokkert rutingen av denne strofen."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr ""
 
@@ -842,11 +842,11 @@ msgid ""
 "will be unblocked at ~s UTC"
 msgstr ""
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -964,9 +964,9 @@ msgstr "Tekstkoding for server ~b"
 msgid "Server ~b"
 msgstr "Server ~b"
 
-#: mod_mam.erl:270
+#: mod_mam.erl:541
 #, fuzzy
-msgid "Only members are allowed to query archives of this room"
+msgid "Only members may query archives of this room"
 msgstr "Bare ordstyrer tillates å  endre emnet i dette rommet"
 
 #: mod_muc.erl:585
@@ -985,36 +985,36 @@ msgstr "Konferanserommet finnes ikke"
 msgid "Chatrooms"
 msgstr "Samtalerom"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr "Du trenger en klient som støtter x:data for å registrere kallenavnet"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Registrer Kallenavn på "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Skriv inn kallenavnet du ønsker å registrere"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "Det kallenavnet er registrert av en annen person"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Du må fylle inn feltet \"Nickname\" i skjemaet"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "ejabberd MUC modul"
 
@@ -1185,8 +1185,8 @@ msgstr "Trafikkmengde grense overskredet"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1225,7 +1225,7 @@ msgstr "Mottakeren er ikke i konferanserommet"
 msgid "It is not allowed to send private messages"
 msgstr "Det er ikke tillatt å sende private meldinger"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Bare deltakere får sende normale meldinger til konferansen"
 
@@ -1307,7 +1307,7 @@ msgstr "Ugyldig rang: ~s"
 msgid "Invalid role: ~s"
 msgstr "Ugyldig rolle: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Eierprivilegier kreves"
 
@@ -1319,7 +1319,7 @@ msgstr "Konfigurasjon for rom ~s"
 msgid "Room title"
 msgstr "Romtittel"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Rom beskrivelse"
 
@@ -1448,35 +1448,35 @@ msgstr "Slå på logging"
 msgid "You need an x:data capable client to configure room"
 msgstr "Du trenger en klient som støtter x:data for å "
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Antall deltakere"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "privat, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "Lyd forespørsel"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "Enten godkjenn eller forby lyd forespørselen"
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "Bruker JID"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "Gi lyd til denne personen?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s inviterer deg til rommet ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "passordet er"
 

priv/msgs/pl.msg

@@ -1,4 +1,5 @@
 %% -*- coding: latin-1 -*-
+{"Accept","Zaakceptuj"}.
 {"Access Configuration","Konfiguracja dostępu"}.
 {"Access Control List Configuration","Konfiguracja listy dostępowej"}.
 {"Access Control Lists","Lista dostępowa"}.
@@ -87,6 +88,7 @@
 {"ejabberd Web Admin","ejabberd: Panel Administracyjny"}.
 {"Elements","Elementy"}.
 {"Email","Email"}.
+{"Empty Rooms","Puste pokoje"}.
 {"Enable logging","Włącz logowanie"}.
 {"Enable message archiving","Włącz archiwizowanie rozmów"}.
 {"Encoding for server ~b","Kodowanie znaków dla serwera ~b"}.
@@ -142,6 +144,7 @@
 {"Import Users from Dir at ","Importuj użytkowników z katalogu na "}.
 {"Import Users From jabberd14 Spool Files","Importuj użytkowników z plików roboczych serwera jabberd14"}.
 {"Improper message type","Nieprawidłowy typ wiadomości"}.
+{"Incoming s2s Connections:","Przychodzące połączenia s2s:"}.
 {"Incorrect password","Nieprawidłowe hasło"}.
 {"Invalid affiliation: ~s","Nieprawidłowa przynależność: ~s"}.
 {"Invalid role: ~s","Nieprawidłowa rola: ~s"}.
@@ -154,6 +157,7 @@
 {"IRC username","Nazwa użytkownika IRC"}.
 {"IRC Username","Nazwa użytkownika IRC"}.
 {"is now known as","jest teraz znany jako"}.
+{"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","Użytkownik nie może wysyłać wiadomości o błędach do pokoju. Użytkownik (~s) wysłał błąd (~s) i został wyrzucony z pokoju"}.
 {"It is not allowed to send private messages of type \"groupchat\"","Nie można wysyłać prywatnych wiadomości typu \"groupchat\""}.
 {"It is not allowed to send private messages to the conference","Nie wolno wysyłac prywatnych wiadomości na konferencję"}.
 {"It is not allowed to send private messages","Wysyłanie prywatnych wiadomości jest zabronione"}.
@@ -196,6 +200,7 @@
 {"Message body","Treść wiadomości"}.
 {"Middle Name","Drugie imię"}.
 {"Minimum interval between voice requests (in seconds)","Minimalny odstęp między żądaniami głosowymi (w sekundach)"}.
+{"Moderator","Moderatorzy"}.
 {"Moderator privileges required","Wymagane uprawnienia moderatora"}.
 {"moderators only","tylko moderatorzy"}.
 {"Modified modules","Zmodyfikowane moduły"}.
@@ -239,6 +244,7 @@
 {"Online Users:","Użytkownicy zalogowani:"}.
 {"Online Users","Użytkownicy zalogowani"}.
 {"Only deliver notifications to available users","Dostarczaj powiadomienia tylko dostępnym użytkownikom"}.
+{"Only members may query archives of this room","Tylko moderatorzy mogą przeglądać archiwa tego pokoju"}.
 {"Only moderators and participants are allowed to change the subject in this room","Tylko moderatorzy i uczestnicy mogą zmienić temat tego pokoju"}.
 {"Only moderators are allowed to change the subject in this room","Tylko moderatorzy mogą zmienić temat tego pokoju"}.
 {"Only moderators can approve voice requests","Tylko moderatorzy mogą zatwierdzać żądania głosowe"}.
@@ -252,6 +258,7 @@
 {"Outgoing s2s Connections","Wychodzące połączenia s2s"}.
 {"Owner privileges required","Wymagane uprawnienia właściciela"}.
 {"Packet","Pakiet"}.
+{"Participant","Uczestnicy"}.
 {"Password ~b","Hasło ~b"}.
 {"Password:","Hasło:"}.
 {"Password","Hasło"}.
@@ -265,6 +272,8 @@
 {"Persist items to storage","Przechowuj na stałe dane PubSub"}.
 {"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.","Te opcje kopii zapasowych dotyczą tylko wbudowanej bazy danych typu Mnesia. Jeśli korzystasz z modułu ODBC, musisz wykonać kopie bazy we własnym zakresie."}.
+{"Please specify file name.","Proszę podać nazwę pliku."}.
+{"Please specify file size.","Proszę podać rozmiar pliku."}.
 {"Please, wait for a while before sending new voice request","Proszę poczekać chwile, zanim wyślesz nowe żądanie głosowe"}.
 {"Pong","Pong"}.
 {"Port ~b","Port ~b"}.
@@ -300,6 +309,7 @@
 {"Restore binary backup immediately:","Natychmiast odtwórz kopię binarną:"}.
 {"Restore plain text backup immediately:","Natychmiast odtwórz kopię z postaci tekstowej:"}.
 {"Restore","Przywróć z kopii"}.
+{"Roles for which Presence is Broadcasted","Role dla których wysyłane są statusy"}.
 {"Room Configuration","Konfiguracja pokoju"}.
 {"Room creation is denied by service policy","Zasady serwera zabraniają tworzyć nowe pokoje"}.
 {"Room description","Opis pokoju"}.
@@ -323,6 +333,7 @@
 {"September","Wrzesień"}.
 {"Server ~b","Serwer ~b"}.
 {"Server:","Serwer:"}.
+{"Server","Serwer"}.
 {"Set message of the day and send to online users","Wyślij wiadomość dnia do wszystkich zalogowanych użytkowników"}.
 {"Set message of the day on all hosts and send to online users","Ustaw wiadomość dnia dla wszystkich hostów i wyślij do zalogowanych uzytkowników"}.
 {"Shared Roster Groups","Wspólne grupy kontaktów"}.
@@ -406,6 +417,7 @@
 {"Validate","Potwierdź"}.
 {"vCard User Search","Wyszukiwanie vCard użytkowników"}.
 {"Virtual Hosts","Wirtualne Hosty"}.
+{"Visitor","Odwiedzający"}.
 {"Visitors are not allowed to change their nicknames in this room","Uczestnicy tego pokoju nie mogą zmieniać swoich nicków"}.
 {"Visitors are not allowed to send messages to all occupants","Odwiedzający nie mogą wysyłać wiadomości do wszystkich obecnych"}.
 {"Voice requests are disabled in this conference","Głosowe żądania są wyłączone w tym pokoju"}.

priv/msgs/pl.po

@@ -14,7 +14,7 @@ msgstr ""
 "X-Additional-Translator: Marcin Owsiany\n"
 "X-Additional-Translator: Andrzej Smyk\n"
 "X-Additional-Translator: Mateusz Gajewski\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.6\n"
 
 #: ejabberd_c2s.erl:505 ejabberd_c2s.erl:853
 msgid "Use of STARTTLS required"
@@ -33,11 +33,11 @@ msgstr "Połączenie zostało zastąpione"
 msgid "has been kicked"
 msgstr "został wyrzucony"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr "Aktualna lista prywatności zabrania przesyłania tej stanzy"
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr "Zbyt wiele niepotwierdzonych pakietów"
 
@@ -67,9 +67,8 @@ msgid "User"
 msgstr "Użytkownik"
 
 #: ejabberd_oauth.erl:256
-#, fuzzy
 msgid "Server"
-msgstr "Serwer:"
+msgstr "Serwer"
 
 #: ejabberd_oauth.erl:259 ejabberd_web_admin.erl:1408 mod_configure.erl:1398
 #: mod_configure.erl:1485 mod_configure.erl:1889 mod_configure.erl:2123
@@ -79,7 +78,7 @@ msgstr "Hasło"
 
 #: ejabberd_oauth.erl:267
 msgid "Accept"
-msgstr ""
+msgstr "Zaakceptuj"
 
 #: ejabberd_web_admin.erl:202 ejabberd_web_admin.erl:214
 #: ejabberd_web_admin.erl:234 ejabberd_web_admin.erl:246
@@ -151,8 +150,7 @@ msgstr "Wirtualne Hosty"
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: ejabberd_web_admin.erl:955 ejabberd_web_admin.erl:1340
-#: mod_configure.erl:524
+#: ejabberd_web_admin.erl:955 ejabberd_web_admin.erl:1340 mod_configure.erl:524
 msgid "Online Users"
 msgstr "Użytkownicy zalogowani"
 
@@ -246,9 +244,8 @@ msgid "Outgoing s2s Connections:"
 msgstr "Wychodzące połączenia s2s:"
 
 #: ejabberd_web_admin.erl:1559
-#, fuzzy
 msgid "Incoming s2s Connections:"
-msgstr "Wychodzące połączenia s2s:"
+msgstr "Przychodzące połączenia s2s:"
 
 #: ejabberd_web_admin.erl:1595 ejabberd_web_admin.erl:1794
 #: ejabberd_web_admin.erl:1804 ejabberd_web_admin.erl:2214 mod_roster.erl:1429
@@ -851,13 +848,13 @@ msgstr ""
 "Zbyt wiele (~p) nieudanych prób logowanie z tego adresu IP (~s). Ten adres "
 "zostanie odblokowany o ~s UTC"
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
-msgstr ""
+msgstr "Proszę podać rozmiar pliku."
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
-msgstr ""
+msgstr "Proszę podać nazwę pliku."
 
 #: mod_ip_blacklist.erl:121
 msgid "This IP address is blacklisted in ~s"
@@ -973,10 +970,9 @@ msgstr "Kodowanie znaków dla serwera ~b"
 msgid "Server ~b"
 msgstr "Serwer ~b"
 
-#: mod_mam.erl:270
-#, fuzzy
-msgid "Only members are allowed to query archives of this room"
-msgstr "Tylko moderatorzy mogą zmienić temat tego pokoju"
+#: mod_mam.erl:541
+msgid "Only members may query archives of this room"
+msgstr "Tylko moderatorzy mogą przeglądać archiwa tego pokoju"
 
 #: mod_muc.erl:585
 msgid "Only service administrators are allowed to send service messages"
@@ -994,36 +990,36 @@ msgstr "Pokój konferencyjny nie istnieje"
 msgid "Chatrooms"
 msgstr "Pokoje rozmów"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
-msgstr ""
+msgstr "Puste pokoje"
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr "Potrzebujesz klienta obsługującego x:data aby zarejestrować nick"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Rejestracja nazwy użytkownika na "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Wprowadz nazwę użytkownika którego chcesz zarejestrować"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Nazwa użytkownika"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "Ta nazwa użytkownika jest już zarejestrowana przez inną osobę"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Musisz wypełnić pole \"Nazwa użytkownika\" w formularzu"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "Moduł MUC"
 
@@ -1190,9 +1186,11 @@ msgstr "Limit transferu przekroczony"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
+"Użytkownik nie może wysyłać wiadomości o błędach do pokoju. Użytkownik (~s) "
+"wysłał błąd (~s) i został wyrzucony z pokoju"
 
 #: mod_muc_room.erl:241
 msgid "It is not allowed to send private messages to the conference"
@@ -1230,7 +1228,7 @@ msgstr "Odbiorcy nie ma w pokoju"
 msgid "It is not allowed to send private messages"
 msgstr "Wysyłanie prywatnych wiadomości jest zabronione"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Tylko uczestnicy mogą wysyłać wiadomości na konferencję"
 
@@ -1312,7 +1310,7 @@ msgstr "Nieprawidłowa przynależność: ~s"
 msgid "Invalid role: ~s"
 msgstr "Nieprawidłowa rola: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Wymagane uprawnienia właściciela"
 
@@ -1324,7 +1322,7 @@ msgstr "Konfiguracja pokoju ~s"
 msgid "Room title"
 msgstr "Tytuł pokoju"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Opis pokoju"
 
@@ -1366,20 +1364,19 @@ msgstr "wszystkich"
 
 #: mod_muc_room.erl:3471
 msgid "Roles for which Presence is Broadcasted"
-msgstr ""
+msgstr "Role dla których wysyłane są statusy"
 
 #: mod_muc_room.erl:3486
-#, fuzzy
 msgid "Moderator"
-msgstr "tylko moderatorzy"
+msgstr "Moderatorzy"
 
 #: mod_muc_room.erl:3496
 msgid "Participant"
-msgstr ""
+msgstr "Uczestnicy"
 
 #: mod_muc_room.erl:3506
 msgid "Visitor"
-msgstr ""
+msgstr "Odwiedzający"
 
 #: mod_muc_room.erl:3513
 msgid "Make room members-only"
@@ -1453,35 +1450,35 @@ msgstr "Włącz logowanie"
 msgid "You need an x:data capable client to configure room"
 msgstr "Potrzebujesz klienta obsługującego x:data aby skonfigurować pokój"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Liczba uczestników"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "prywatny, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "Żądanie głosowe"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "Zatwierdź lub odrzuć żądanie głosowe"
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "Użytkownik "
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "Udzielić głosu tej osobie?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s zaprasza Cię do pokoju ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "hasło to:"
 

priv/msgs/pt-br.msg

@@ -1,9 +1,10 @@
 %% -*- coding: latin-1 -*-
+{"Accept","Aceito"}.
 {"Access Configuration","Configuração de Acesso"}.
 {"Access Control List Configuration","Configuração da Lista de Controle de Acesso"}.
 {"Access control lists","Listas de Controle de Acesso"}.
 {"Access Control Lists","Listas de Controle de Acesso"}.
-{"Access denied by service policy","Aceso denegado por la política do serviço"}.
+{"Access denied by service policy","Acesso negado pela política do serviço"}.
 {"Access rules","Regras de acesso"}.
 {"Access Rules","Regras de Acesso"}.
 {"Action on user","Ação no usuário"}.
@@ -23,11 +24,11 @@
 {"Allow visitors to change nickname","Permitir mudança de apelido aos visitantes"}.
 {"Allow visitors to send private messages to","Permitir visitantes enviar mensagem privada para"}.
 {"Allow visitors to send status text in presence updates","Permitir atualizações de status aos visitantes"}.
-{"Allow visitors to send voice requests","Permitir aos visitantes o envio de convites"}.
+{"Allow visitors to send voice requests","Permitir aos visitantes o envio de requisições de voz"}.
 {"All Users","Todos os usuários"}.
 {"Announcements","Anúncios"}.
 {"anyone","qualquer um"}.
-{"A password is required to enter this room","Se necessita senha para entrar em esta sala"}.
+{"A password is required to enter this room","Se necessita senha para entrar nesta sala"}.
 {"April","Abril"}.
 {"August","Agosto"}.
 {"Backup Management","Gestão de Backup"}.
@@ -43,7 +44,7 @@
 {"Chatroom configuration modified","Configuração da sala de bate-papo modificada"}.
 {"Chatroom is created","A sala de chat está criada"}.
 {"Chatroom is destroyed","A sala de chat está destruída"}.
-{"Chatroom is started","A sala de chat está inciada"}.
+{"Chatroom is started","A sala de chat está iniciada"}.
 {"Chatroom is stopped","A sala de chat está parada"}.
 {"Chatrooms","Salas de Chat"}.
 {"Choose a username and password to register with this server","Escolha um nome de usuário e senha para registrar-se neste servidor"}.
@@ -52,7 +53,7 @@
 {"Choose whether to approve this entity's subscription.","Aprovar esta assinatura."}.
 {"City","Cidade"}.
 {"Commands","Comandos"}.
-{"Conference room does not exist","La sala de conferencias não existe"}.
+{"Conference room does not exist","A sala de conferência não existe"}.
 {"Configuration","Configuração"}.
 {"Configuration of room ~s","Configuração para ~s"}.
 {"Connected Resources:","Recursos conectados:"}.
@@ -60,7 +61,7 @@
 {"Country","País"}.
 {"CPU Time:","Tempo de CPU"}.
 {"Database","Base de dados"}.
-{"Database Tables at ~p","Tabelas do bancod de dados em ~p"}.
+{"Database Tables at ~p","Tabelas da Base de dados em ~p"}.
 {"Database Tables Configuration at ","Configuração de Tabelas de Base de dados em "}.
 {"December","Dezembro"}.
 {"Default users as participants","Usuários padrões como participantes"}.
@@ -71,9 +72,9 @@
 {"Deliver event notifications","Entregar as notificações de evento"}.
 {"Deliver payloads with event notifications","Enviar payloads junto com as notificações de eventos"}.
 {"Description:","Descrição:"}.
-{"Disc only copy","Somente copia em disco"}.
+{"Disc only copy","Somente cópia em disco"}.
 {"Displayed Groups:","Grupos Exibidos:"}.
-{"Don't tell your password to anybody, not even the administrators of the Jabber server.","Não revele o seu computador a ninguém, mesmo para o administrador deste servidor Jabber."}.
+{"Don't tell your password to anybody, not even the administrators of the Jabber server.","Não revele a sua senha a ninguém, nem mesmo para o administrador deste servidor Jabber."}.
 {"Dump Backup to Text File at ","Exportar backup para texto em "}.
 {"Dump to Text File","Exportar para arquivo texto"}.
 {"Edit Properties","Editar propriedades"}.
@@ -87,6 +88,7 @@
 {"ejabberd Web Admin","ejabberd Web Admin"}.
 {"Elements","Elementos"}.
 {"Email","Email"}.
+{"Empty Rooms","Salas vazias"}.
 {"Enable logging","Permitir criação de logs"}.
 {"Enable message archiving","Habilitar arquivamento de mensagens"}.
 {"Encoding for server ~b","Codificação para o servidor ~b"}.
@@ -99,7 +101,7 @@
 {"Enter path to text file","Introduza caminho para o arquivo texto"}.
 {"Enter the text you see","Insira o texto que você vê"}.
 {"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.","Insira o nome de usuário e codificações que você deseja usar para conectar-se aos servidores de IRC. Depois, presione 'Next' ('Próximo') para exibir mais campos que devem ser preenchidos. Ao final, pressione 'Complete' ('Completar') para salvar a configuração."}.
-{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Insira o nome de usuário, codificações, portas e senhas que vocêdeseja para usar nos servidores IRC"}.
+{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Insira o nome de usuário, codificações, portas e senhas que você deseja para usar nos servidores IRC"}.
 {"Erlang Jabber Server","Servidor Jabber em Erlang"}.
 {"Error","Erro"}.
 {"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Exemplo: [{\"irc.teste.net\", \"koi8-r\"}, 6667, \"senha\"}, {\"dominio.foo.net\", \"iso8859-1\", 7000}, {\"irc.servidordeteste.net\", \"utf-8\"}]."}.
@@ -121,7 +123,7 @@
 {"Get User Last Login Time","Obter a Data do Último Login"}.
 {"Get User Password","Obter Senha do Usuário"}.
 {"Get User Statistics","Obter Estatísticas do Usuário"}.
-{"Grant voice to this person?","Dar 'voice' a esta usuário?"}.
+{"Grant voice to this person?","Dar voz a esta pessoa?"}.
 {"Group ","Grupo "}.
 {"Groups","Grupos"}.
 {"has been banned","foi banido"}.
@@ -129,7 +131,7 @@
 {"has been kicked because of a system shutdown","foi desconectado porque o sistema foi desligado"}.
 {"has been kicked because the room has been changed to members-only","foi desconectado porque a política da sala mudou, só membros são permitidos"}.
 {"has been kicked","foi removido"}.
-{" has set the subject to: "," a posto o assunto: "}.
+{" has set the subject to: "," mudou o assunto para: "}.
 {"Host","Máquina"}.
 {"If you don't see the CAPTCHA image here, visit the web page.","Se você não conseguir ver o CAPTCHA aqui, visite a web page."}.
 {"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 você deseja especificar portas diferentes, senhas ou codifações para servidores de IRC, complete esta lista com os valores no formato: '{\"servidor IRC\", \"codificação\", porta, \"senha\"}'. Por padrão, este serviço usa a codificação \"~s\", porta \"~p\", e senha em branco (vazia)"}.
@@ -142,6 +144,7 @@
 {"Import Users from Dir at ","Importar usuários a partir do diretório em "}.
 {"Import Users From jabberd14 Spool Files","Importar usuários de arquivos jabberd14 (spool files)"}.
 {"Improper message type","Tipo de mensagem incorreto"}.
+{"Incoming s2s Connections:","Conexões que entram de s2s"}.
 {"Incorrect password","Senha incorreta"}.
 {"Invalid affiliation: ~s","Afiliação não válida: ~s"}.
 {"Invalid role: ~s","Cargo (role) é não válido: ~s"}.
@@ -154,8 +157,9 @@
 {"IRC username","Usuário IRC"}.
 {"IRC Username","Usuário IRC"}.
 {"is now known as","é agora conhecido como"}.
+{"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","Não é permitido o envio de mensagens de erro a esta sala. O membro (~s) enviou uma mensagem de erro (~s) e foi desconectado (\"kicked\")."}.
 {"It is not allowed to send private messages","Não é permitido enviar mensagens privadas"}.
-{"It is not allowed to send private messages of type \"groupchat\"","No está permitido enviar mensagens privados do tipo \"groupchat\""}.
+{"It is not allowed to send private messages of type \"groupchat\"","Não é permitido enviar mensagens privadas do tipo \"groupchat\""}.
 {"It is not allowed to send private messages to the conference","Impedir o envio de mensagens privadas para a sala"}.
 {"Jabber Account Registration","Registros de Contas Jabber"}.
 {"Jabber ID","ID Jabber"}.
@@ -181,7 +185,7 @@
 {"Make room CAPTCHA protected","Tornar protegida a senha da sala"}.
 {"Make room members-only","Tornar sala apenas para membros"}.
 {"Make room moderated","Tornar a sala moderada"}.
-{"Make room password protected","Tornar protegida a senha da sala"}.
+{"Make room password protected","Tornar sala protegida à senha"}.
 {"Make room persistent","Tornar sala persistente"}.
 {"Make room public searchable","Tornar sala pública possível de ser encontrada"}.
 {"March","Março"}.
@@ -189,13 +193,14 @@
 {"Max # of items to persist","Máximo # de elementos que persistem"}.
 {"Max payload size in bytes","Máximo tamanho do payload em bytes"}.
 {"May","Maio"}.
-{"Membership is required to enter this room","Necessitas ser membro de esta sala para poder entrar"}.
+{"Membership is required to enter this room","Necessitas 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.","Memorize a sua senha, ou escreva-a em um papel e guarde-o em um lugar seguro. Jabber não é uma maneira automatizada para recuperar a sua senha, se você a esquecer eventualmente."}.
 {"Memory","Memória"}.
 {"Message body","Corpo da mensagem"}.
 {"Middle Name","Nome do meio"}.
 {"Minimum interval between voice requests (in seconds)","O intervalo mínimo entre requisições de voz (em segundos)"}.
+{"Moderator","Moderador"}.
 {"Moderator privileges required","Se necessita privilégios de moderador"}.
 {"moderators only","apenas moderadores"}.
 {"Modified modules","Módulos atualizados"}.
@@ -211,7 +216,7 @@
 {"New Password:","Nova Senha:"}.
 {"Nickname","Apelido"}.
 {"Nickname Registration at ","Registro do apelido em "}.
-{"Nickname ~s does not exist in the room","O nick ~s não existe em la sala"}.
+{"Nickname ~s does not exist in the room","O nick ~s não existe na sala"}.
 {"nobody","ninguém"}.
 {"No body provided for announce message","Nenhum corpo de texto fornecido para anunciar mensagem"}.
 {"No Data","Nenhum dado"}.
@@ -238,20 +243,22 @@
 {"Online","Conectado"}.
 {"Online Users","Usuários conectados"}.
 {"Online Users:","Usuários online"}.
-{"Only deliver notifications to available users","Solo enviar notificações aos usuários disponíveis"}.
+{"Only deliver notifications to available users","Somente enviar notificações aos usuários disponíveis"}.
+{"Only members may query archives of this room","Somente os membros podem procurar nos arquivos desta sala"}.
 {"Only moderators and participants are allowed to change the subject in this room","Somente os moderadores e os participamentes podem alterar o assunto desta sala"}.
 {"Only moderators are allowed to change the subject in this room","Somente os moderadores podem alterar o assunto desta sala"}.
 {"Only moderators can approve voice requests","Somente moderadores podem aprovar requisições de voz"}.
-{"Only occupants are allowed to send messages to the conference","Solo os ocupantes podem enviar mensagens a la sala"}.
-{"Only occupants are allowed to send queries to the conference","Solo os ocupantes podem enviar consultas a la sala"}.
+{"Only occupants are allowed to send messages to the conference","Somente os ocupantes podem enviar mensagens à sala"}.
+{"Only occupants are allowed to send queries to the conference","Somente os ocupantes podem enviar consultas à sala"}.
 {"Only service administrators are allowed to send service messages","Apenas administradores possuem permissão para enviar mensagens de serviço"}.
 {"Options","Opções"}.
 {"Organization Name","Nome da organização"}.
 {"Organization Unit","Departamento/Unidade"}.
 {"Outgoing s2s Connections","Conexões que partam de s2s"}.
 {"Outgoing s2s Connections:","Conexões que partem de s2s"}.
-{"Owner privileges required","Se requere privilégios de proprietário da sala"}.
+{"Owner privileges required","Se requer privilégios de proprietário da sala"}.
 {"Packet","Pacote"}.
+{"Participant","Participante"}.
 {"Password ~b","Senha ~b"}.
 {"Password:","Senha:"}.
 {"Password","Senha"}.
@@ -265,6 +272,8 @@
 {"Persist items to storage","Persistir elementos ao armazenar"}.
 {"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.","Observe que tais opções farão backup apenas da base de dados Mnesia. Caso você esteja utilizando o modulo ODBC, você precisará fazer backup de sua base de dados SQL separadamente."}.
+{"Please specify file name.","Por favor informe o nome do arquivo."}.
+{"Please specify file size.","Por favor informe o tamanho do arquivo."}.
 {"Please, wait for a while before sending new voice request","Por favor, espere antes de enviar uma nova requisição de voz"}.
 {"Pong","Pong"}.
 {"Port ~b","Porta ~b"}.
@@ -276,18 +285,18 @@
 {"PubSub subscriber request","PubSub requisição de assinante"}.
 {"Purge all items when the relevant publisher goes offline","Descartar todos os itens quando o publicante principal estiver offline"}.
 {"Queries to the conference members are not allowed in this room","Nesta sala não se permite consultas aos membros da sala"}.
-{"RAM and disc copy","Copias na RAM e disco rígido"}.
-{"RAM copy","Copia em RAM"}.
+{"RAM and disc copy","Cópias na RAM e disco rígido"}.
+{"RAM copy","Cópia em RAM"}.
 {"Raw","Intocado"}.
 {"Really delete message of the day?","Deletar realmente a mensagem do dia?"}.
-{"Recipient is not in the conference room","O receptor não está em la sala de conferencia"}.
+{"Recipient is not in the conference room","O receptor não está na sala de conferência"}.
 {"Register a Jabber account","Registrar uma conta Jabber"}.
 {"Registered nicknames","Usuários registrados"}.
 {"Registered Users:","Usuários registrados"}.
 {"Registered Users","Usuários Registrados"}.
 {"Register","Registrar"}.
 {"Registration in mod_irc for ","Registro em mod_irc para "}.
-{"Remote copy","Copia remota"}.
+{"Remote copy","Cópia remota"}.
 {"Remove All Offline Messages","Remover Todas as Mensagens Offline"}.
 {"Remove","Remover"}.
 {"Remove User","Remover usuário"}.
@@ -300,8 +309,9 @@
 {"Restore binary backup immediately:","Restaurar backup binário imediatamente"}.
 {"Restore plain text backup immediately:","Restaurar backup formato texto imediatamente:"}.
 {"Restore","Restaurar"}.
+{"Roles for which Presence is Broadcasted","Para quem a presença será notificada"}.
 {"Room Configuration","Configuração de salas"}.
-{"Room creation is denied by service policy","Se te a denegado criar la sala por política do serviço"}.
+{"Room creation is denied by service policy","Sala não pode ser criada devido à política do serviço"}.
 {"Room description","Descrição da Sala"}.
 {"Room Occupants","Número de participantes"}.
 {"Room title","Título da sala"}.
@@ -310,7 +320,7 @@
 {"Roster of ","Lista de contatos de "}.
 {"Roster size","Tamanho da Lista"}.
 {"RPC Call Error","Erro de chamada RPC"}.
-{"Running Nodes","Nos em execução"}.
+{"Running Nodes","Nós em execução"}.
 {"~s access rule configuration","Configuração da Regra de Acesso ~s"}.
 {"Saturday","Sábado"}.
 {"Script check","Verificação de Script"}.
@@ -323,6 +333,7 @@
 {"September","Setembro"}.
 {"Server ~b","Servidor ~b"}.
 {"Server:","Servidor:"}.
+{"Server","Servidor"}.
 {"Set message of the day and send to online users","Definir mensagem do dia e enviar a todos usuários online"}.
 {"Set message of the day on all hosts and send to online users","Definir mensagem do dia em todos os hosts e enviar para os usuários online"}.
 {"Shared Roster Groups","Grupos Shared Roster"}.
@@ -361,9 +372,9 @@
 {"the password is","a senha é"}.
 {"The password is too weak","Senha considerada fraca'"}.
 {"The password of your Jabber account was successfully changed.","A senha da sua conta Jabber foi mudada com sucesso."}.
-{"There was an error changing the password: ","Houveram erros ao mudar a senha: "}.
-{"There was an error creating the account: ","Houveram erras ao criar esta conta: "}.
-{"There was an error deleting the account: ","Erro ao deletar esta conta: "}.
+{"There was an error changing the password: ","Houve um erro ao mudar a senha: "}.
+{"There was an error creating the account: ","Houve um erro ao criar esta conta: "}.
+{"There was an error deleting the account: ","Houve um erro ao deletar esta conta: "}.
 {"This IP address is blacklisted in ~s","Este endereço IP está bloqueado em ~s"}.
 {"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Não é 'case insensitive': macbeth é o mesmo que MacBeth e ainda Macbeth. "}.
 {"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Esta pagina aceita criações de novas contas Jabber neste servidor. A sua JID (Identificador Jabber) será da seguinte forma: 'usuário@servidor'. Por favor, leia cuidadosamente as instruções para preencher corretamente os campos."}.
@@ -372,7 +383,7 @@
 {"Time delay","Intervalo (Tempo)"}.
 {"Time","Tempo"}.
 {"Too many CAPTCHA requests","Número excessivo de requisições para o CAPTCHA"}.
-{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Número excessivo (~p) de tentativas falhas de autenticação (~s). O endereço serádesbloqueado as ~s UTC"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Número excessivo (~p) de tentativas falhas de autenticação (~s). O endereço será desbloqueado às ~s UTC"}.
 {"Too many unacked stanzas","número excessivo de instâncias sem confirmação"}.
 {"To","Para"}.
 {"To ~s","Para ~s"}.
@@ -399,30 +410,31 @@
 {"User Management","Gerenciamento de Usuários"}.
 {"Username:","Usuário:"}.
 {"Users are not allowed to register accounts so quickly","Usuários não estão autorizados a registrar contas imediatamente"}.
-{"Users Last Activity","Ultimas atividades dos usuários"}.
+{"Users Last Activity","Últimas atividades dos usuários"}.
 {"User ~s","Usuário ~s"}.
 {"Users","Usuários"}.
 {"User","Usuário"}.
 {"Validate","Validar"}.
 {"vCard User Search","Busca de Usuário vCard"}.
 {"Virtual Hosts","Hosts virtuais"}.
-{"Visitors are not allowed to change their nicknames in this room","Nesta sala, os visitantes não pode mudar seus apelidos"}.
+{"Visitors are not allowed to change their nicknames in this room","Nesta sala, os visitantes não podem mudar seus apelidos"}.
 {"Visitors are not allowed to send messages to all occupants","Os visitantes não podem enviar mensagens a todos os ocupantes"}.
+{"Visitor","Visitante"}.
 {"Voice request","Requisição de voz"}.
-{"Voice requests are disabled in this conference","Requisições de voz estào desabilitadas nesta conferência"}.
+{"Voice requests are disabled in this conference","Requisições de voz estão desabilitadas nesta conferência"}.
 {"Wednesday","Quarta"}.
 {"When to send the last published item","Quando enviar o último tópico publicado"}.
 {"Whether to allow subscriptions","Permitir subscrições"}.
 {"You can later change your password using a Jabber client.","Mais tarde você pode alterar a sua senha usando um cliente Jabber."}.
-{"You have been banned from this room","As sido bloqueado em esta sala"}.
+{"You have been banned from this room","Você foi banido desta sala"}.
 {"You must fill in field \"Nickname\" in the form","Você deve completar o campo \"Apelido\" no formulário"}.
 {"You need a client that supports x:data and CAPTCHA to register","Você precisa de um cliente com suporte de x:data para poder registrar o nick"}.
 {"You need a client that supports x:data to register the nickname","Você precisa de um cliente com suporte a x:data para registrar o seu apelido"}.
-{"You need an x:data capable client to configure mod_irc settings","Necessitas um cliente com suporte de x:data para configurar las opções de mod_irc"}.
-{"You need an x:data capable client to configure room","Necessitas um cliente com suporte de x:data para configurar la sala"}.
+{"You need an x:data capable client to configure mod_irc settings","Necessitas um cliente com suporte de x:data para configurar as opções de mod_irc"}.
+{"You need an x:data capable client to configure room","Necessitas um cliente com suporte de x:data para configurar a sala"}.
 {"You need an x:data capable client to search","Necessitas um cliente com suporte de x:data para poder buscar"}.
 {"Your active privacy list has denied the routing of this stanza.","Sua lista de privacidade ativa negou o roteamento deste."}.
 {"Your contact offline message queue is full. The message has been discarded.","Sua fila de mensagens offline esta cheia. Sua mensagem foi descartada"}.
-{"Your Jabber account was successfully created.","Sua conta jabber foi criada corretamente."}.
+{"Your Jabber account was successfully created.","Sua conta jabber foi criada com sucesso."}.
 {"Your Jabber account was successfully deleted.","Sua conta Jabber foi deletada com sucesso."}.
 {"Your messages to ~s are being blocked. To unblock them, visit ~s","Suas mensagens para ~s estão bloqueadas. Para desbloqueá-las, visite: ~s"}.

priv/msgs/pt.po

@@ -24,11 +24,11 @@ msgstr ""
 msgid "has been kicked"
 msgstr ""
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr ""
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr ""
 
@@ -887,11 +887,11 @@ msgid ""
 "will be unblocked at ~s UTC"
 msgstr ""
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -1014,9 +1014,9 @@ msgstr ""
 msgid "Server ~b"
 msgstr ""
 
-#: mod_mam.erl:270
+#: mod_mam.erl:541
 #, fuzzy
-msgid "Only members are allowed to query archives of this room"
+msgid "Only members may query archives of this room"
 msgstr "Só os moderadores podem mudar o tópico desta sala"
 
 #: mod_muc.erl:585
@@ -1038,40 +1038,40 @@ msgstr "A sala não existe"
 msgid "Chatrooms"
 msgstr ""
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 #, fuzzy
 msgid "You need a client that supports x:data to register the nickname"
 msgstr ""
 "É necessário um cliente com suporte de x:data para poder registar a alcunha"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Registo da alcunha em "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Introduza a alcunha que quer registar"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Alcunha"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 #, fuzzy
 msgid "That nickname is registered by another person"
 msgstr "A alcunha já está registada por outra pessoa"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 #, fuzzy
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Deve preencher o campo \"alcunha\" no formulário"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "Módulo MUC de ejabberd"
 
@@ -1243,8 +1243,8 @@ msgstr ""
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1285,7 +1285,7 @@ msgstr "O destinatário não está na sala"
 msgid "It is not allowed to send private messages"
 msgstr "Impedir o envio de mensagens privadas para a sala"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Só os ocupantes podem enviar mensagens para a sala"
 
@@ -1373,7 +1373,7 @@ msgstr "Afiliação inválida: ~s"
 msgid "Invalid role: ~s"
 msgstr "Papel inválido: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "São necessários privilégios de dono"
 
@@ -1386,7 +1386,7 @@ msgstr "Configuração para "
 msgid "Room title"
 msgstr "Título da sala"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 #, fuzzy
 msgid "Room description"
 msgstr "Subscrição"
@@ -1531,36 +1531,36 @@ msgstr "Guardar históricos?"
 msgid "You need an x:data capable client to configure room"
 msgstr "É necessário um cliente com suporte de x:data para configurar a sala"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr ""
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "privado"
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr ""
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr ""
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 #, fuzzy
 msgid "User JID"
 msgstr "Utilizador"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr ""
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr ""
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 #, fuzzy
 msgid "the password is"
 msgstr "Mudar palavra-chave"

priv/msgs/ru.po

@@ -34,12 +34,12 @@ msgstr "Заменено новым соединением"
 msgid "has been kicked"
 msgstr "выгнали из комнаты"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr ""
 "Маршрутизация этой строфы запрещена вашим активным списком приватности."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr "Слишком много неподтверждённых пакетов"
 
@@ -854,11 +854,11 @@ msgstr ""
 "Слишком много (~p) неудачных попыток аутентификации с этого IP-адреса (~s). "
 "Адрес будет разблокирован в ~s UTC"
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -976,9 +976,9 @@ msgstr "Кодировка сервера ~b"
 msgid "Server ~b"
 msgstr "Сервер ~b"
 
-#: mod_mam.erl:270
+#: mod_mam.erl:541
 #, fuzzy
-msgid "Only members are allowed to query archives of this room"
+msgid "Only members may query archives of this room"
 msgstr "Только модераторы могут изменять тему в этой комнате"
 
 #: mod_muc.erl:585
@@ -997,36 +997,36 @@ msgstr "Конференция не существует"
 msgid "Chatrooms"
 msgstr "Комнаты"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr "Чтобы зарегистрировать псевдоним, требуется x:data-совместимый клиент"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Регистрация псевдонима на "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Введите псевдоним, который Вы хотели бы зарегистрировать"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "Этот псевдоним зарегистрирован кем-то другим"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Вы должны заполнить поле \"Псевдоним\" в форме"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "ejabberd MUC модуль"
 
@@ -1193,8 +1193,8 @@ msgstr "Превышен лимит скорости посылки информ
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1234,7 +1234,7 @@ msgstr "Адресата нет в конференции"
 msgid "It is not allowed to send private messages"
 msgstr "Запрещено посылать приватные сообщения"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Только присутствующим разрешается посылать сообщения в конференцию"
 
@@ -1316,7 +1316,7 @@ msgstr "Недопустимый ранг: ~s"
 msgid "Invalid role: ~s"
 msgstr "Недопустимая роль: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Требуются права владельца"
 
@@ -1328,7 +1328,7 @@ msgstr "Конфигурация комнаты ~s"
 msgid "Room title"
 msgstr "Название комнаты"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Описание комнаты"
 
@@ -1458,35 +1458,35 @@ msgstr "Включить журналирование"
 msgid "You need an x:data capable client to configure room"
 msgstr "Чтобы сконфигурировать комнату, требуется x:data-совместимый клиент"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Число присутствующих"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "приватная, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "Запрос на право голоса"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "Подтвердите или отклоните право голоса."
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "JID пользователя"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "Предоставить голос?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s приглашает вас в комнату ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "пароль:"
 

priv/msgs/sk.po

@@ -29,11 +29,11 @@ msgstr "Nahradené novým spojením"
 msgid "has been kicked"
 msgstr "bol(a) vyhodený(á) z miestnosti"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr "Aktívny list súkromia zbránil v smerovaní tejto stanzy."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr ""
 
@@ -847,11 +847,11 @@ msgid ""
 "will be unblocked at ~s UTC"
 msgstr ""
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -969,9 +969,9 @@ msgstr "Kódovanie pre server ~b"
 msgid "Server ~b"
 msgstr "Server ~b"
 
-#: mod_mam.erl:270
+#: mod_mam.erl:541
 #, fuzzy
-msgid "Only members are allowed to query archives of this room"
+msgid "Only members may query archives of this room"
 msgstr "Len moderátori majú povolené meniť tému miestnosti"
 
 #: mod_muc.erl:585
@@ -990,36 +990,36 @@ msgstr "Diskusná miestnosť neexistuje"
 msgid "Chatrooms"
 msgstr "Diskusné miestnosti"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr "Na registráciu prezývky potrebujete klienta podporujúceho z x:data"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Registrácia prezývky na "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Zadajte prezývku, ktorú chcete registrovať"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "Prezývka je už zaregistrovaná inou osobou"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Musíte vyplniť políčko \"Prezývka\" vo formulári"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "ejabberd MUC modul"
 
@@ -1189,8 +1189,8 @@ msgstr "Bol prekročený prenosový limit"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1229,7 +1229,7 @@ msgstr "Príjemca sa nenachádza v konferenčnej miestnosti"
 msgid "It is not allowed to send private messages"
 msgstr "Nieje povolené posielať súkromné správy"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Len členovia majú povolené zasielať správy do konferencie"
 
@@ -1313,7 +1313,7 @@ msgstr "Neplatné priradenie: ~s"
 msgid "Invalid role: ~s"
 msgstr "Neplatná rola: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Sú vyžadované práva vlastníka"
 
@@ -1325,7 +1325,7 @@ msgstr "Konfigurácia miestnosti ~s"
 msgid "Room title"
 msgstr "Názov miestnosti"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Popis miestnosti"
 
@@ -1454,35 +1454,35 @@ msgstr "Zapnúť zaznamenávanie histórie"
 msgid "You need an x:data capable client to configure room"
 msgstr "Na konfiguráciu miestnosti potrebujete klienta podporujúceho x:data"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Počet zúčastnených"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "súkromná, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "Žiadosť o Voice"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "Povolte alebo zamietnite žiadosť o Voice."
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "Používateľ "
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "Prideltiť Voice tejto osobe?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s Vás pozýva do miestnosti ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "heslo je"
 

priv/msgs/sv.po

@@ -28,11 +28,11 @@ msgstr "Ersatt av ny anslutning"
 msgid "has been kicked"
 msgstr "har blivit kickad"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr ""
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr ""
 
@@ -844,11 +844,11 @@ msgid ""
 "will be unblocked at ~s UTC"
 msgstr ""
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -965,9 +965,9 @@ msgstr "Encoding för server ~b"
 msgid "Server ~b"
 msgstr "Server ~b"
 
-#: mod_mam.erl:270
+#: mod_mam.erl:541
 #, fuzzy
-msgid "Only members are allowed to query archives of this room"
+msgid "Only members may query archives of this room"
 msgstr "Endast moderatorer får ändra ämnet i det här rummet"
 
 #: mod_muc.erl:585
@@ -986,37 +986,37 @@ msgstr "Rummet finns inte"
 msgid "Chatrooms"
 msgstr "Chattrum"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 #, fuzzy
 msgid "You need a client that supports x:data to register the nickname"
 msgstr "Du behöver en klient som stödjer x:data för att registrera smeknamn"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Registrera smeknamn på "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Skriv in smeknamnet du vill registrera"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "Smeknamnet är reserverat"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Du måste fylla i fält \"smeknamn\" i formen"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "ejabberd MUC modul"
 
@@ -1190,8 +1190,8 @@ msgstr "Trafikgränsen har överstigits"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1233,7 +1233,7 @@ msgstr "Mottagaren finns inte i rummet"
 msgid "It is not allowed to send private messages"
 msgstr "Det ar inte tillåtet att skicka privata meddelanden"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Utomstående får inte skicka medelanden till den här konferensen"
 
@@ -1321,7 +1321,7 @@ msgstr "Ogiltlig rang: ~s"
 msgid "Invalid role: ~s"
 msgstr "Ogiltlig roll: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Ägarprivilegier krävs"
 
@@ -1333,7 +1333,7 @@ msgstr "Konfiguration för ~s"
 msgid "Room title"
 msgstr "Rumstitel"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 #, fuzzy
 msgid "Room description"
 msgstr "Beskrivning:"
@@ -1466,36 +1466,36 @@ msgstr "Möjliggör login"
 msgid "You need an x:data capable client to configure room"
 msgstr "Du behöver en klient som stödjer x:data för att konfiguera detta rum"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Antal besökare"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "privat, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr ""
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr ""
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 #, fuzzy
 msgid "User JID"
 msgstr "Användare "
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr ""
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s bjöd in dig till rummet ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "Lösenordet är"
 

priv/msgs/th.po

@@ -24,11 +24,11 @@ msgstr "แทนที่ด้วยการเชื่อมต่อให
 msgid "has been kicked"
 msgstr "ถูกไล่ออก"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr ""
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr ""
 
@@ -845,11 +845,11 @@ msgid ""
 "will be unblocked at ~s UTC"
 msgstr ""
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -969,9 +969,9 @@ msgstr ""
 msgid "Server ~b"
 msgstr ""
 
-#: mod_mam.erl:270
+#: mod_mam.erl:541
 #, fuzzy
-msgid "Only members are allowed to query archives of this room"
+msgid "Only members may query archives of this room"
 msgstr "ผู้ดูแลการสนทนาเท่านั้นที่ได้รับอนุญาตให้เปลี่ยนหัวข้อในห้องนี้"
 
 #: mod_muc.erl:585
@@ -990,38 +990,38 @@ msgstr "ไม่มีห้องประชุม"
 msgid "Chatrooms"
 msgstr "ห้องสนทนา"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 #, fuzzy
 msgid "You need a client that supports x:data to register the nickname"
 msgstr "คุณต้องใช้ไคลเอ็นต์ที่รองรับ x:data เพื่อลงทะเบียนชื่อเล่น"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "การลงทะเบียนชื่อเล่นที่ "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "ป้อนชื่อเล่นที่คุณต้องการลงทะเบียน"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "ชื่อเล่น"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 #, fuzzy
 msgid "That nickname is registered by another person"
 msgstr "ชื่อเล่นถูกลงทะเบียนใช้งานโดยบุคคลอื่น"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "คุณต้องกรอกฟิลด์ \"Nickname\" ในแบบฟอร์ม"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "ejabberd MUC module"
 
@@ -1196,8 +1196,8 @@ msgstr "อัตราของปริมาณการเข้าใช้
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1238,7 +1238,7 @@ msgstr "ผู้รับไม่ได้อยู่ในห้องปร
 msgid "It is not allowed to send private messages"
 msgstr "ไม่อนุญาตให้ส่งข้อความส่วนตัวไปยังห้องประชุม"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "ผู้ครอบครองห้องเท่านั้นที่ได้รับอนุญาตให้ส่งข้อความไปยังห้องประชุม"
 
@@ -1326,7 +1326,7 @@ msgstr "การเข้าร่วมที่ไม่ถูกต้อง
 msgid "Invalid role: ~s"
 msgstr "บทบาทไม่ถูกต้อง: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "ต้องมีสิทธิพิเศษของเจ้าของ"
 
@@ -1339,7 +1339,7 @@ msgstr "การกำหนดค่าสำหรับ "
 msgid "Room title"
 msgstr "ชื่อห้อง"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 #, fuzzy
 msgid "Room description"
 msgstr "รายละเอียด:"
@@ -1476,36 +1476,36 @@ msgstr "เปิดใช้งานการบันทึก"
 msgid "You need an x:data capable client to configure room"
 msgstr "คุณต้องใช้ไคลเอ็นต์ที่รองรับ x:data เพื่อกำหนดค่าห้องสนทนา "
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "จำนวนผู้ครอบครองห้อง"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "ส่วนตัว, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr ""
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr ""
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 #, fuzzy
 msgid "User JID"
 msgstr "ผู้ใช้"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr ""
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s เชิญคุณเข้าร่วมสนทนาในห้อง ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "รหัสผ่านคือ"
 

priv/msgs/tr.po

@@ -30,11 +30,11 @@ msgstr "Eski bağlantı yenisi ile değiştirildi"
 msgid "has been kicked"
 msgstr "odadan atıldı"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr "Etkin mahremiyet listeniz bu bölümün yönlendirilmesini engelledi."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr ""
 
@@ -853,11 +853,11 @@ msgid ""
 "will be unblocked at ~s UTC"
 msgstr ""
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -977,9 +977,9 @@ msgstr "Sunucu için kodlama ~b"
 msgid "Server ~b"
 msgstr "Sunucu ~b"
 
-#: mod_mam.erl:270
+#: mod_mam.erl:541
 #, fuzzy
-msgid "Only members are allowed to query archives of this room"
+msgid "Only members may query archives of this room"
 msgstr "Sadece moderatörlerin bu odanın konusunu değiştirmesine izin veriliyor"
 
 #: mod_muc.erl:585
@@ -998,38 +998,38 @@ msgstr "Konferans odası bulunamadı"
 msgid "Chatrooms"
 msgstr "Sohbet Odaları"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr ""
 "Takma isminizi kaydettirmek için x:data destekleyen bir istemciye "
 "gereksinimiz var"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Takma İsim Kaydı : "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Kaydettirmek istediğiniz takma ismi giriniz"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Takma isim"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "O takma isim başka biri tarafından kaydettirilmiş"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Formda \"Takma isim\" alanını doldurmanız gerekiyor"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "ejabberd MUC modülü"
 
@@ -1199,8 +1199,8 @@ msgstr "Trafik oran sınırı aşıldı"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1239,7 +1239,7 @@ msgstr "Alıcı konferans odasında değil"
 msgid "It is not allowed to send private messages"
 msgstr "Özel mesaj gönderilmesine izin verilmiyor"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Sadece oda sakinlerinin konferansa mesaj göndermesine izin veriliyor"
 
@@ -1325,7 +1325,7 @@ msgstr "Geçersiz ilişki: ~s"
 msgid "Invalid role: ~s"
 msgstr "Geçersiz rol: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Sahip yetkileri gerekli"
 
@@ -1337,7 +1337,7 @@ msgstr "~s odasının ayarları"
 msgid "Room title"
 msgstr "Oda başlığı"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Oda tanımı"
 
@@ -1469,35 +1469,35 @@ msgid "You need an x:data capable client to configure room"
 msgstr ""
 "Odayı ayarlamak için x:data becerisine sahip bir istemciye gereksinimiz var"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Oda sakini sayısı"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "özel"
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "Ses isteği"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "Ses isteğini kabul edin ya da reddedin"
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
 msgstr "Kullanıcı JID"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "Bu kişiye ses verelim mi?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s sizi ~s odasına davet ediyor"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "parola :"
 

priv/msgs/uk.msg

@@ -1,4 +1,5 @@
 %% -*- coding: latin-1 -*-
+{"Accept","Прийняти"}.
 {"Access Configuration","Конфігурація доступу"}.
 {"Access Control List Configuration","Конфігурація списків керування доступом"}.
 {"Access control lists","Списки керування доступом"}.
@@ -21,7 +22,9 @@
 {"Allow users to send invites","Дозволити користувачам надсилати запрошення"}.
 {"Allow users to send private messages","Дозволити приватні повідомлення"}.
 {"Allow visitors to change nickname","Дозволити відвідувачам змінювати псевдонім"}.
+{"Allow visitors to send private messages to","Дозволити відвідувачам відсилати приватні повідомлення"}.
 {"Allow visitors to send status text in presence updates","Дозволити відвідувачам відсилати текст статусу в оновленнях присутності"}.
+{"Allow visitors to send voice requests","Дозволити відвідувачам надсилати голосові запрошення"}.
 {"All Users","Всі користувачі"}.
 {"Announcements","Сповіщення"}.
 {"anyone","всім учасникам"}.
@@ -29,6 +32,7 @@
 {"April","квітня"}.
 {"August","серпня"}.
 {"Backup Management","Керування резервним копіюванням"}.
+{"Backup of ~p","Резервне копіювання ~p"}.
 {"Backup to File at ","Резервне копіювання в файл на "}.
 {"Backup","Резервне копіювання"}.
 {"Bad format","Неправильний формат"}.
@@ -56,6 +60,7 @@
 {"Connections parameters","Параметри з'єднання"}.
 {"Country","Країна"}.
 {"CPU Time:","Процесорний час:"}.
+{"Database Tables at ~p","Таблиці бази даних на ~p"}.
 {"Database Tables Configuration at ","Конфігурація таблиць бази даних на "}.
 {"Database","База даних"}.
 {"December","грудня"}.
@@ -73,15 +78,19 @@
 {"Dump Backup to Text File at ","Копіювання в текстовий файл на "}.
 {"Dump to Text File","Копіювання в текстовий файл"}.
 {"Edit Properties","Змінити параметри"}.
+{"Either approve or decline the voice request.","Підтвердить або відхилите голосовий запит"}.
 {"ejabberd IRC module","ejabberd IRC модуль"}.
 {"ejabberd MUC module","ejabberd MUC модуль"}.
+{"ejabberd Multicast service","Мультікаст ejabberd сервіс"}.
 {"ejabberd Publish-Subscribe module","Модуль ejabberd Публікації-Підписки"}.
 {"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 Bytestreams модуль"}.
 {"ejabberd vCard module","ejabberd vCard модуль"}.
 {"ejabberd Web Admin","Веб-інтерфейс Адміністрування ejabberd"}.
 {"Elements","Елементи"}.
 {"Email","Електронна пошта"}.
+{"Empty Rooms","Порожні кімнати"}.
 {"Enable logging","Включити журнал роботи"}.
+{"Enable message archiving","Ввімкнути архівацію повідомлень"}.
 {"Encoding for server ~b","Кодування для сервера ~b"}.
 {"End User Session","Закінчити Сеанс Користувача"}.
 {"Enter list of {Module, [Options]}","Введіть перелік такого виду {Module, [Options]}"}.
@@ -97,8 +106,10 @@
 {"Error","Помилка"}.
 {"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Приклад:  [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
 {"Exclude Jabber IDs from CAPTCHA challenge","Пропускати ці Jabber ID без CAPTCHA-запиту"}.
+{"Export all tables as SQL queries to a file:","Експорт усіх таблиць, як SQL запити, у файл"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Експорт даних всіх користувачів сервера до файлу PIEFXIS (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Експорт даних користувачів домена до файлу PIEFXIS (XEP-0227):"}.
+{"Failed to extract JID from your voice request approval","Помилка витягнення JID з вашого схвалення голосового запиту"}.
 {"Family Name","Прізвище"}.
 {"February","лютого"}.
 {"Fill in fields to search for any matching Jabber User","Заповніть поля для пошуку користувача Jabber"}.
@@ -112,6 +123,7 @@
 {"Get User Last Login Time","Отримати Час Останнього Підключення Користувача"}.
 {"Get User Password","Отримати Пароль Користувача"}.
 {"Get User Statistics","Отримати Статистику по Користувачу"}.
+{"Grant voice to this person?","Надати голос персоні?"}.
 {"Groups","Групи"}.
 {"Group ","Група "}.
 {"has been banned","заборонили вхід в кімнату"}.
@@ -130,8 +142,9 @@
 {"Import users data from a PIEFXIS file (XEP-0227):","Імпорт даних користовучів з файлу PIEFXIS (XEP-0227):"}.
 {"Import users data from jabberd14 spool directory:","Імпорт користувачів з діректорії спула jabberd14:"}.
 {"Import Users from Dir at ","Імпортування користувача з директорії на "}.
-{"Import Users From jabberd14 Spool Files","Імпорт користувачів зі спулу jabberd14"}.
+{"Import Users From jabberd14 Spool Files","Імпорт користувачів з  jabberd14 файлів \"Spool\""}.
 {"Improper message type","Неправильний тип повідомлення"}.
+{"Incoming s2s Connections:","Вхідні s2s-з'єднання:"}.
 {"Incorrect password","Неправильний пароль"}.
 {"Invalid affiliation: ~s","Недопустимий ранг: ~s"}.
 {"Invalid role: ~s","Недопустима роль: ~s"}.
@@ -144,6 +157,7 @@
 {"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","Приватні повідомлення не дозволені"}.
@@ -165,6 +179,7 @@
 {"Listened Ports at ","Відкриті порти на "}.
 {"Listened Ports","Відкриті порти"}.
 {"List of modules to start","Список завантажуваних модулів"}.
+{"List of rooms","Перелік кімнат"}.
 {"Low level update script","Низькорівневий сценарій поновлення"}.
 {"Make participants list public","Зробити список учасників видимим всім"}.
 {"Make room CAPTCHA protected","Зробити кімнату захищеною капчею"}.
@@ -184,12 +199,17 @@
 {"Memory","Пам'ять"}.
 {"Message body","Тіло повідомлення"}.
 {"Middle Name","По-батькові"}.
+{"Minimum interval between voice requests (in seconds)","Мінімальний інтервал між голосовими запитами (в секундах)"}.
 {"Moderator privileges required","Необхідні права модератора"}.
 {"moderators only","тільки модераторам"}.
+{"Moderator","Модератор"}.
 {"Modified modules","Змінені модулі"}.
+{"Modules at ~p","Модулі на ~p"}.
 {"Modules","Модулі"}.
 {"Module","Модуль"}.
 {"Monday","Понеділок"}.
+{"Multicast","Мультікаст"}.
+{"Multi-User Chat","Багато-користувальницький чат"}.
 {"Name:","Назва:"}.
 {"Name","Назва"}.
 {"Never","Ніколи"}.
@@ -198,9 +218,11 @@
 {"Nickname ~s does not exist in the room","Псевдонім ~s в кімнаті відсутній"}.
 {"Nickname","Псевдонім"}.
 {"No body provided for announce message","Тіло оголошення має бути непустим"}.
+{"nobody","ніхто"}.
 {"No Data","Немає даних"}.
 {"Node ID","ID вузла"}.
 {"Node not found","Вузол не знайдено"}.
+{"Node ~p","Вузол ~p"}.
 {"Nodes","Вузли"}.
 {"No limit","Без обмежень"}.
 {"None","Немає"}.
@@ -222,8 +244,10 @@
 {"Online Users","Підключені користувачі"}.
 {"Online","Підключений"}.
 {"Only deliver notifications to available users","Доставляти повідомленнями тільки доступним користувачам"}.
+{"Only members may query archives of this room","Тільки модератори можуть запитувати архіви цієї кімнати"}.
 {"Only moderators and participants are allowed to change the subject in this room","Тільки модератори та учасники можуть змінювати тему в цій кімнаті"}.
 {"Only moderators are allowed to change the subject in this room","Тільки модератори можуть змінювати тему в цій кімнаті"}.
+{"Only moderators can approve voice requests","Тільки модератори можуть схвалювати голосові запити"}.
 {"Only occupants are allowed to send messages to the conference","Тільки присутнім дозволяється надсилати повідомленняя в конференцію"}.
 {"Only occupants are allowed to send queries to the conference","Тільки присутнім дозволяється відправляти запити в конференцію"}.
 {"Only service administrators are allowed to send service messages","Тільки адміністратор сервісу може надсилати службові повідомлення"}.
@@ -234,6 +258,7 @@
 {"Outgoing s2s Connections","Вихідні s2s-з'єднання"}.
 {"Owner privileges required","Необхідні права власника"}.
 {"Packet","Пакет"}.
+{"Participant","Учасник"}.
 {"Password ~b","Пароль ~b"}.
 {"Password Verification:","Перевірка Пароля:"}.
 {"Password Verification","Перевірка Пароля"}.
@@ -243,9 +268,13 @@
 {"Path to File","Шлях до файла"}.
 {"Pending","Очікування"}.
 {"Period: ","Період"}.
+{"Permanent rooms","Постійні кімнати"}.
 {"Persist items to storage","Зберегати публікації до сховища"}.
 {"Ping","Пінг"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Зауважте, що ця опція відповідає за резервне копіювання тільки вбудованної бази даних Mnesia. Якщо Ви також використовуєте інше сховище для даних (наприклад за допомогою модуля ODBC), то його резервне копіювання потрібно робити окремо."}.
+{"Please specify file name.","Будь ласка вкажіть ім'я файлу."}.
+{"Please specify file size.","Будь ласка вкажіть розмір файлу."}.
+{"Please, wait for a while before sending new voice request","Будь ласка, почекайте деякий час перед тим, як знову відправляти голосовий запит"}.
 {"Pong","Понг"}.
 {"Port ~b","Порт ~b"}.
 {"Port","Порт"}.
@@ -259,9 +288,10 @@
 {"RAM and disc copy","ОЗП та диск"}.
 {"RAM copy","ОЗП"}.
 {"Raw","необроблений формат"}.
-{"Really delete message of the day?","Насправді видалити повідомлення дня?"}.
+{"Really delete message of the day?","Насправді, видалити повідомлення дня?"}.
 {"Recipient is not in the conference room","Адресата немає в конференції"}.
 {"Register a Jabber account","Зареєструвати Jabber-акаунт"}.
+{"Registered nicknames","Зареєстровані імена"}.
 {"Registered Users:","Зареєстровані користувачі:"}.
 {"Registered Users","Зареєстровані користувачі"}.
 {"Register","Реєстрація"}.
@@ -279,6 +309,7 @@
 {"Restore binary backup immediately:","Відновити з бінарної резервної копії негайно:"}.
 {"Restore plain text backup immediately:","Відновити з текстової резервної копії негайно:"}.
 {"Restore","Відновлення з резервної копії"}.
+{"Roles for which Presence is Broadcasted","Ролі для яких поширюється наявність"}.
 {"Room Configuration","Конфігурація кімнати"}.
 {"Room creation is denied by service policy","Створювати конференцію заборонено політикою служби"}.
 {"Room description","Опис кімнати"}.
@@ -302,6 +333,7 @@
 {"September","вересня"}.
 {"Server ~b","Сервер ~b"}.
 {"Server:","Сервер:"}.
+{"Server","Сервер:"}.
 {"Set message of the day and send to online users","Встановити повідомлення дня та надіслати його підключеним користувачам"}.
 {"Set message of the day on all hosts and send to online users","Встановити повідомлення дня на всіх хостах та надійслати його підключеним користувачам"}.
 {"Shared Roster Groups","Спільні групи контактів"}.
@@ -343,6 +375,7 @@
 {"There was an error changing the password: ","Помилка при зміні пароля: "}.
 {"There was an error creating the account: ","Помилка при створенні акаунту:"}.
 {"There was an error deleting the account: ","Помилка при видаленні акаунту: "}.
+{"This IP address is blacklisted in ~s","Ця IP адреса у чорному списку ~s"}.
 {"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 на цьому сервері. Ваш JID (ідентифікатор Jabber) матиме вигляд \"користувач@сервер\". Щоб вірно заповнити поля нижче, будь ласка, уважно читайте інструкції до них."}.
 {"This page allows to unregister a Jabber account in this Jabber server.","Ця сторінка дозволяє видалити свій акаунт з Jabber-сервера."}.
@@ -350,7 +383,10 @@
 {"Time delay","Час затримки"}.
 {"Time","Час"}.
 {"Too many CAPTCHA requests","Надто багато CAPTCHA-запитів"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Забагато  (~p) помилок авторизації з цієї IP адреси (~s). Адресу буде розблоковано о ~s UTC"}.
+{"Too many unacked stanzas","Занадто багато пакетів без відповідей"}.
 {"To ~s","До ~s"}.
+{"Total rooms","Всього кімнат"}.
 {"To","Кому"}.
 {"Traffic rate limit is exceeded","Швидкість передачі інформації було перевищено"}.
 {"Transactions Aborted:","Транзакції відмінені:"}.
@@ -364,15 +400,18 @@
 {"Unregister","Видалити"}.
 {"Update message of the day (don't send)","Оновити повідомлення дня (не надсилати)"}.
 {"Update message of the day on all hosts (don't send)","Оновити повідомлення дня на всіх хостах (не надсилати)"}.
-{"Update plan","План поновлення"}.
+{"Update plan","План оновлення"}.
+{"Update ~p","Оновлення ~p"}.
 {"Update script","Сценарій поновлення"}.
 {"Update","Обновити"}.
 {"Uptime:","Час роботи:"}.
 {"Use of STARTTLS required","Ви мусите використовувати STARTTLS"}.
+{"User JID","JID Користувача"}.
 {"User Management","Управління Користувачами"}.
 {"Username:","Ім'я користувача:"}.
 {"Users are not allowed to register accounts so quickly","Користувачам не дозволено так часто реєструвати облікові записи"}.
 {"Users Last Activity","Статистика останнього підключення користувачів"}.
+{"User ~s","Користувач ~s"}.
 {"Users","Користувачі"}.
 {"User","Користувач"}.
 {"Validate","Затвердити"}.
@@ -380,6 +419,9 @@
 {"Virtual Hosts","віртуальні хости"}.
 {"Visitors are not allowed to change their nicknames in this room","Відвідувачам не дозволяється змінювати псевдонім в цій кімнаті"}.
 {"Visitors are not allowed to send messages to all occupants","Відвідувачам не дозволяється надсилати повідомлення всім присутнім"}.
+{"Visitor","Відвідувач"}.
+{"Voice requests are disabled in this conference","Голосові запити відключені в цій конференції"}.
+{"Voice request","Голосовий запит"}.
 {"Wednesday","Середа"}.
 {"When to send the last published item","Коли надсилати останній опублікований елемент"}.
 {"Whether to allow subscriptions","Дозволяти підписку"}.

priv/msgs/uk.po

@@ -5,14 +5,16 @@ msgstr ""
 "PO-Revision-Date: \n"
 "Last-Translator: Konstantin Khomoutov <flatworm@users.sourceforge.net>\n"
 "Language-Team: \n"
-"Language: \n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Language: Ukrainian (українська)\n"
+"X-Additional-Translator: Oleg Deordiev\n"
 "X-Additional-Translator: Ruslan Rakhmanin\n"
 "X-Additional-Translator: Stoune\n"
 "X-Additional-Translator: Sergei Golovan\n"
+"X-Generator: Poedit 1.8.6\n"
 
 #: ejabberd_c2s.erl:505 ejabberd_c2s.erl:853
 msgid "Use of STARTTLS required"
@@ -31,13 +33,13 @@ msgstr "Замінено новим з'єднанням"
 msgid "has been kicked"
 msgstr "вигнали з кімнати"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr "Маршрутизація цієї строфи була відмінена активним списком приватності."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
-msgstr ""
+msgstr "Занадто багато пакетів без відповідей"
 
 #: ejabberd_captcha.erl:122 ejabberd_captcha.erl:245 ejabberd_captcha.erl:284
 msgid "Enter the text you see"
@@ -65,7 +67,6 @@ msgid "User"
 msgstr "Користувач"
 
 #: ejabberd_oauth.erl:256
-#, fuzzy
 msgid "Server"
 msgstr "Сервер:"
 
@@ -77,7 +78,7 @@ msgstr "Пароль"
 
 #: ejabberd_oauth.erl:267
 msgid "Accept"
-msgstr ""
+msgstr "Прийняти"
 
 #: ejabberd_web_admin.erl:202 ejabberd_web_admin.erl:214
 #: ejabberd_web_admin.erl:234 ejabberd_web_admin.erl:246
@@ -149,8 +150,7 @@ msgstr "віртуальні хости"
 msgid "Users"
 msgstr "Користувачі"
 
-#: ejabberd_web_admin.erl:955 ejabberd_web_admin.erl:1340
-#: mod_configure.erl:524
+#: ejabberd_web_admin.erl:955 ejabberd_web_admin.erl:1340 mod_configure.erl:524
 msgid "Online Users"
 msgstr "Підключені користувачі"
 
@@ -244,9 +244,8 @@ msgid "Outgoing s2s Connections:"
 msgstr "Вихідні s2s-з'єднання:"
 
 #: ejabberd_web_admin.erl:1559
-#, fuzzy
 msgid "Incoming s2s Connections:"
-msgstr "Вихідні s2s-з'єднання:"
+msgstr "Вхідні s2s-з'єднання:"
 
 #: ejabberd_web_admin.erl:1595 ejabberd_web_admin.erl:1794
 #: ejabberd_web_admin.erl:1804 ejabberd_web_admin.erl:2214 mod_roster.erl:1429
@@ -259,9 +258,8 @@ msgid "Change Password"
 msgstr "Змінити пароль"
 
 #: ejabberd_web_admin.erl:1673
-#, fuzzy
 msgid "User ~s"
-msgstr "Користувач "
+msgstr "Користувач ~s"
 
 #: ejabberd_web_admin.erl:1684
 msgid "Connected Resources:"
@@ -293,9 +291,8 @@ msgid "Stopped Nodes"
 msgstr "Зупинені вузли"
 
 #: ejabberd_web_admin.erl:1833 ejabberd_web_admin.erl:1858
-#, fuzzy
 msgid "Node ~p"
-msgstr "Вузол "
+msgstr "Вузол ~p"
 
 #: ejabberd_web_admin.erl:1842 mod_configure.erl:150 mod_configure.erl:611
 msgid "Database"
@@ -332,9 +329,8 @@ msgid "RPC Call Error"
 msgstr "Помилка виклику RPC"
 
 #: ejabberd_web_admin.erl:1917
-#, fuzzy
 msgid "Database Tables at ~p"
-msgstr "Таблиці бази даних на "
+msgstr "Таблиці бази даних на ~p"
 
 #: ejabberd_web_admin.erl:1927 mod_vcard.erl:490 mod_vcard.erl:616
 msgid "Name"
@@ -357,9 +353,8 @@ msgid "Error"
 msgstr "Помилка"
 
 #: ejabberd_web_admin.erl:1955
-#, fuzzy
 msgid "Backup of ~p"
-msgstr "Резервне копіювання "
+msgstr "Резервне копіювання ~p"
 
 #: ejabberd_web_admin.erl:1959
 msgid ""
@@ -418,7 +413,7 @@ msgstr "Експорт даних користувачів домена до ф
 
 #: ejabberd_web_admin.erl:2060
 msgid "Export all tables as SQL queries to a file:"
-msgstr ""
+msgstr "Експорт усіх таблиць, як SQL запити, у файл"
 
 #: ejabberd_web_admin.erl:2076
 msgid "Import user data from jabberd14 spool file:"
@@ -433,9 +428,8 @@ msgid "Listened Ports at "
 msgstr "Відкриті порти на "
 
 #: ejabberd_web_admin.erl:2144
-#, fuzzy
 msgid "Modules at ~p"
-msgstr "Модулі на "
+msgstr "Модулі на ~p"
 
 #: ejabberd_web_admin.erl:2175
 msgid "Statistics of ~p"
@@ -466,13 +460,12 @@ msgid "Transactions Logged:"
 msgstr "Транзакції запротокольовані:"
 
 #: ejabberd_web_admin.erl:2243
-#, fuzzy
 msgid "Update ~p"
-msgstr "Поновлення "
+msgstr "Оновлення ~p"
 
 #: ejabberd_web_admin.erl:2254
 msgid "Update plan"
-msgstr "План поновлення"
+msgstr "План оновлення"
 
 #: ejabberd_web_admin.erl:2255
 msgid "Modified modules"
@@ -528,7 +521,7 @@ msgstr "Понг"
 
 #: mod_announce.erl:523
 msgid "Really delete message of the day?"
-msgstr "Насправді видалити повідомлення дня?"
+msgstr "Насправді, видалити повідомлення дня?"
 
 #: mod_announce.erl:536 mod_configure.erl:1238 mod_configure.erl:1298
 msgid "Subject"
@@ -678,7 +671,7 @@ msgstr "Керування резервним копіюванням"
 
 #: mod_configure.erl:617
 msgid "Import Users From jabberd14 Spool Files"
-msgstr "Імпорт користувачів зі спулу jabberd14"
+msgstr "Імпорт користувачів з  jabberd14 файлів \"Spool\""
 
 #: mod_configure.erl:762
 msgid "To ~s"
@@ -850,18 +843,20 @@ msgid ""
 "Too many (~p) failed authentications from this IP address (~s). The address "
 "will be unblocked at ~s UTC"
 msgstr ""
+"Забагато  (~p) помилок авторизації з цієї IP адреси (~s). Адресу буде "
+"розблоковано о ~s UTC"
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
-msgstr ""
+msgstr "Будь ласка вкажіть розмір файлу."
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
-msgstr ""
+msgstr "Будь ласка вкажіть ім'я файлу."
 
 #: mod_ip_blacklist.erl:121
 msgid "This IP address is blacklisted in ~s"
-msgstr ""
+msgstr "Ця IP адреса у чорному списку ~s"
 
 #: mod_irc.erl:220 mod_muc.erl:467
 msgid "Access denied by service policy"
@@ -975,10 +970,9 @@ msgstr "Кодування для сервера ~b"
 msgid "Server ~b"
 msgstr "Сервер ~b"
 
-#: mod_mam.erl:270
-#, fuzzy
-msgid "Only members are allowed to query archives of this room"
-msgstr "Тільки модератори можуть змінювати тему в цій кімнаті"
+#: mod_mam.erl:541
+msgid "Only members may query archives of this room"
+msgstr "Тільки модератори можуть запитувати архіви цієї кімнати"
 
 #: mod_muc.erl:585
 msgid "Only service administrators are allowed to send service messages"
@@ -996,64 +990,61 @@ msgstr "Конференція не існує"
 msgid "Chatrooms"
 msgstr "Кімнати"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
-msgstr ""
+msgstr "Порожні кімнати"
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr ""
 "Для реєстрації псевдоніму необхідно використовувати клієнт з підтримкою x:"
 "data"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Реєстрація псевдоніма на "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Введіть псевдонім, який ви хочете зареєструвати"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Псевдонім"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "Псевдонім зареєстровано кимось іншим"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Вам необхідно заповнити поле \"Псевдонім\" у формі"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "ejabberd MUC модуль"
 
 #: mod_muc_admin.erl:231 mod_muc_admin.erl:234 mod_muc_admin.erl:246
 #: mod_muc_admin.erl:320
 msgid "Multi-User Chat"
-msgstr ""
+msgstr "Багато-користувальницький чат"
 
 #: mod_muc_admin.erl:249
-#, fuzzy
 msgid "Total rooms"
-msgstr "Кімнати"
+msgstr "Всього кімнат"
 
 #: mod_muc_admin.erl:250
-#, fuzzy
 msgid "Permanent rooms"
-msgstr "вийшов(ла) з кімнати"
+msgstr "Постійні кімнати"
 
 #: mod_muc_admin.erl:251
-#, fuzzy
 msgid "Registered nicknames"
-msgstr "Зареєстровані користувачі"
+msgstr "Зареєстровані імена"
 
 #: mod_muc_admin.erl:254
 msgid "List of rooms"
-msgstr ""
+msgstr "Перелік кімнат"
 
 #: mod_muc_log.erl:398 mod_muc_log.erl:407
 msgid "Chatroom configuration modified"
@@ -1197,9 +1188,11 @@ msgstr "Швидкість передачі інформації було пер
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
+"Не дозволяється відправляти помилкові повідомлення в кімнату. Учасник (~s) "
+"відправив помилкове повідомлення (~s), та був виганий з кімнати"
 
 #: mod_muc_room.erl:241
 msgid "It is not allowed to send private messages to the conference"
@@ -1208,19 +1201,20 @@ msgstr "Не дозволяється надсилати приватні пов
 #: mod_muc_room.erl:316
 msgid "Please, wait for a while before sending new voice request"
 msgstr ""
+"Будь ласка, почекайте деякий час перед тим, як знову відправляти голосовий "
+"запит"
 
 #: mod_muc_room.erl:329
 msgid "Voice requests are disabled in this conference"
-msgstr ""
+msgstr "Голосові запити відключені в цій конференції"
 
 #: mod_muc_room.erl:347
 msgid "Failed to extract JID from your voice request approval"
-msgstr ""
+msgstr "Помилка витягнення JID з вашого схвалення голосового запиту"
 
 #: mod_muc_room.erl:377
-#, fuzzy
 msgid "Only moderators can approve voice requests"
-msgstr "Дозволити користувачам надсилати запрошення"
+msgstr "Тільки модератори можуть схвалювати голосові запити"
 
 #: mod_muc_room.erl:389
 msgid "Improper message type"
@@ -1238,7 +1232,7 @@ msgstr "Адресата немає в конференції"
 msgid "It is not allowed to send private messages"
 msgstr "Приватні повідомлення не дозволені"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Тільки присутнім дозволяється надсилати повідомленняя в конференцію"
 
@@ -1320,7 +1314,7 @@ msgstr "Недопустимий ранг: ~s"
 msgid "Invalid role: ~s"
 msgstr "Недопустима роль: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Необхідні права власника"
 
@@ -1332,7 +1326,7 @@ msgstr "Конфігурація кімнати ~s"
 msgid "Room title"
 msgstr "Назва кімнати"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "Опис кімнати"
 
@@ -1374,20 +1368,19 @@ msgstr "всім учасникам"
 
 #: mod_muc_room.erl:3471
 msgid "Roles for which Presence is Broadcasted"
-msgstr ""
+msgstr "Ролі для яких поширюється наявність"
 
 #: mod_muc_room.erl:3486
-#, fuzzy
 msgid "Moderator"
-msgstr "тільки модераторам"
+msgstr "Модератор"
 
 #: mod_muc_room.erl:3496
 msgid "Participant"
-msgstr ""
+msgstr "Учасник"
 
 #: mod_muc_room.erl:3506
 msgid "Visitor"
-msgstr ""
+msgstr "Відвідувач"
 
 #: mod_muc_room.erl:3513
 msgid "Make room members-only"
@@ -1410,13 +1403,12 @@ msgid "Allow users to send private messages"
 msgstr "Дозволити приватні повідомлення"
 
 #: mod_muc_room.erl:3533
-#, fuzzy
 msgid "Allow visitors to send private messages to"
-msgstr "Дозволити приватні повідомлення"
+msgstr "Дозволити відвідувачам відсилати приватні повідомлення"
 
 #: mod_muc_room.erl:3551
 msgid "nobody"
-msgstr ""
+msgstr "ніхто"
 
 #: mod_muc_room.erl:3576
 msgid "Allow users to query other users"
@@ -1436,13 +1428,12 @@ msgid "Allow visitors to change nickname"
 msgstr "Дозволити відвідувачам змінювати псевдонім"
 
 #: mod_muc_room.erl:3589
-#, fuzzy
 msgid "Allow visitors to send voice requests"
-msgstr "Дозволити користувачам надсилати запрошення"
+msgstr "Дозволити відвідувачам надсилати голосові запрошення"
 
 #: mod_muc_room.erl:3592
 msgid "Minimum interval between voice requests (in seconds)"
-msgstr ""
+msgstr "Мінімальний інтервал між голосовими запитами (в секундах)"
 
 #: mod_muc_room.erl:3599
 msgid "Make room CAPTCHA protected"
@@ -1450,7 +1441,7 @@ msgstr "Зробити кімнату захищеною капчею"
 
 #: mod_muc_room.erl:3606
 msgid "Enable message archiving"
-msgstr ""
+msgstr "Ввімкнути архівацію повідомлень"
 
 #: mod_muc_room.erl:3612
 msgid "Exclude Jabber IDs from CAPTCHA challenge"
@@ -1466,46 +1457,45 @@ msgstr ""
 "Для конфігурування кімнати потрібно використовувати клієнт з підтримкою x:"
 "data"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Кількість присутніх"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "приватна, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
-msgstr ""
+msgstr "Голосовий запит"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
-msgstr ""
+msgstr "Підтвердить або відхилите голосовий запит"
 
-#: mod_muc_room.erl:4349
-#, fuzzy
+#: mod_muc_room.erl:4351
 msgid "User JID"
-msgstr "Користувач "
+msgstr "JID Користувача"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
-msgstr ""
+msgstr "Надати голос персоні?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s запрошує вас до кімнати ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "пароль:"
 
 #: mod_multicast.erl:291
 msgid "Multicast"
-msgstr ""
+msgstr "Мультікаст"
 
 #: mod_multicast.erl:306
 msgid "ejabberd Multicast service"
-msgstr ""
+msgstr "Мультікаст ejabberd сервіс"
 
 #: mod_offline.erl:647
 msgid ""

priv/msgs/vi.po

@@ -24,11 +24,11 @@ msgstr "Được thay thế bởi kết nối mới"
 msgid "has been kicked"
 msgstr "đã bị đẩy ra khỏi"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr ""
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
 msgstr ""
 
@@ -850,11 +850,11 @@ msgid ""
 "will be unblocked at ~s UTC"
 msgstr ""
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
 msgstr ""
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
 msgstr ""
 
@@ -980,9 +980,9 @@ msgstr ""
 msgid "Server ~b"
 msgstr ""
 
-#: mod_mam.erl:270
+#: mod_mam.erl:541
 #, fuzzy
-msgid "Only members are allowed to query archives of this room"
+msgid "Only members may query archives of this room"
 msgstr "Chỉ có những người điều phối được phép thay đổi chủ đề trong phòng này"
 
 #: mod_muc.erl:585
@@ -1001,40 +1001,40 @@ msgstr "Phòng họp không tồn tại"
 msgid "Chatrooms"
 msgstr "Phòng trò chuyện"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
 msgstr ""
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 #, fuzzy
 msgid "You need a client that supports x:data to register the nickname"
 msgstr ""
 "Bạn cần có một trình ứng dụng khách hỗ trợ định dạng dữ liệu x: để đăng ký "
 "bí danh"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Đăng Ký Bí Danh tại"
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Nhập bí danh bạn muốn đăng ký"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Bí danh"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 #, fuzzy
 msgid "That nickname is registered by another person"
 msgstr "Một người khác đã đăng ký bí danh này rồi"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Bạn phải điền thông tin vào ô \"Nickname\" trong biểu mẫu này"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "Môdun ejabberd MUC Bản quyền"
 
@@ -1209,8 +1209,8 @@ msgstr "Quá giới hạn tỷ lệ lưu lượng truyền tải"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
 
 #: mod_muc_room.erl:241
@@ -1251,7 +1251,7 @@ msgstr "Người nhận không có trong phòng họp"
 msgid "It is not allowed to send private messages"
 msgstr "Không được phép gửi những thư riêng đến phòng họp"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Chỉ có những đối tượng tham gia mới được phép gửi thư đến phòng họp"
 
@@ -1343,7 +1343,7 @@ msgstr "Tư cách không hợp lệ: ~s"
 msgid "Invalid role: ~s"
 msgstr "Vai trò không hợp lệ: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "Yêu cầu đặc quyền của người sở hữu"
 
@@ -1356,7 +1356,7 @@ msgstr "Cấu hình cho "
 msgid "Room title"
 msgstr "Tên phòng"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 #, fuzzy
 msgid "Room description"
 msgstr "Miêu tả:"
@@ -1495,36 +1495,36 @@ msgstr ""
 "Bạn cần có một trình ứng dụng khách hỗ trợ định dạng dữ liệu x: để xác định "
 "cấu hình phòng họp"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Số người tham dự"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "riêng,"
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr ""
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr ""
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 #, fuzzy
 msgid "User JID"
 msgstr "Người sử dụng "
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr ""
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s mời bạn vào phòng ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "mật khẩu là"
 

priv/msgs/wa.msg

@@ -1,4 +1,5 @@
 %% -*- coding: latin-1 -*-
+{"Accept","Accepter"}.
 {"Access Configuration","Apontiaedje des accès"}.
 {"Access Control List Configuration","Apontiaedje des droets (ACL)"}.
 {"Access control lists","Droets (ACL)"}.
@@ -16,24 +17,35 @@
 {"A friendly name for the node","On no uzeu-ahessåve pol nuk"}.
 {"All activity","Dispoy todi"}.
 {"Allow this Jabber ID to subscribe to this pubsub node?","Permete ki ci Jabber ID ci si poye abouner a ç' nuk eplaidaedje-abounmint ci?"}.
+{"Allow users to change the subject","Les uzeus polèt candjî l' tite"}.
 {"Allow users to query other users","Les uzeus polèt cweri ls ôtes uzeus"}.
 {"Allow users to send invites","Les uzeus polèt evoyî priyaedjes"}.
 {"Allow users to send private messages","Les uzeus polèt evoyî des messaedjes privés"}.
 {"Allow visitors to change nickname","Permete ki les viziteus candjexhe leus metous nos"}.
+{"Allow visitors to send private messages to","Les uzeus polèt evoyî des messaedjes privés"}.
 {"Allow visitors to send status text in presence updates","Permete ki les viziteus evoyexhe des tecse d' estat dins leus messaedjes di prezince"}.
+{"Allow visitors to send voice requests","Les uzeus polèt evoyî des dmandes di vwès"}.
 {"All Users","Tos les uzeus"}.
 {"Announcements","Anonces"}.
 {"anyone","tot l' minme kî"}.
+{"A password is required to enter this room","I fåt dner on scret po poleur intrer dins cisse såle ci"}.
 {"April","avri"}.
 {"August","awousse"}.
 {"Backup","Copeye di såvrité"}.
 {"Backup Management","Manaedjaedje des copeyes di såvrité"}.
+{"Backup of ~p","Copeye di såvrité po ~p"}.
 {"Backup to File at ","Fé ene copeye di såvrité dins on fitchî so "}.
 {"Bad format","Mwais fôrmat"}.
 {"Birthday","Date d' askepiaedje"}.
+{"CAPTCHA web page","Pådje web CAPTCHA"}.
 {"Change Password","Candjî l' sicret"}.
 {"Change User Password","Candjî l' sicret d' l' uzeu"}.
+{"Characters not allowed:","Caracteres nén permetous:"}.
 {"Chatroom configuration modified","L' apontiaedje del såle di berdelaedje a candjî"}.
+{"Chatroom is created","Li såle di berdelaedje est ahivêye"}.
+{"Chatroom is destroyed","Li såle di berdelaedje est distrûte"}.
+{"Chatroom is started","Li såle di berdelaedje est enondêye"}.
+{"Chatroom is stopped","Li såle di berdelaedje est ahotêye"}.
 {"Chatrooms","Såles di berdelaedje"}.
 {"Choose a username and password to register with this server","Tchoezixhoz on no d' uzeu eyet on scret po vs edjîstrer so ç' sierveu ci"}.
 {"Choose modules to stop","Tchoezixhoz les modules a-z arester"}.
@@ -43,10 +55,13 @@
 {"Commands","Comandes"}.
 {"Conference room does not exist","Li såle di conferince n' egzistêye nén"}.
 {"Configuration","Apontiaedjes"}.
+{"Configuration of room ~s","Apontiaedje del såle ~s"}.
 {"Connected Resources:","Raloyî avou les rsoûces:"}.
+{"Connections parameters","Parametes des raloyaedjes"}.
 {"Country","Payis"}.
 {"CPU Time:","Tins CPU:"}.
 {"Database","Båze di dnêyes"}.
+{"Database Tables at ~p","Tåves del båze di dnêyes so ~p"}.
 {"Database Tables Configuration at ","Apontiaedje des tåves del båze di dnêyes so "}.
 {"December","decimbe"}.
 {"Default users as participants","Les uzeus sont des pårticipants come prémetowe dujhance"}.
@@ -59,17 +74,24 @@
 {"Description:","Discrijhaedje:"}.
 {"Disc only copy","Copeye seulmint sol deure plake"}.
 {"Displayed Groups:","Groupes håynés:"}.
+{"Don't tell your password to anybody, not even the administrators of the Jabber server.","Ni dnez vosse sicret a nolu, nén ddja ås manaedjeus do sierveu Jabber."}.
 {"Dump Backup to Text File at ","Copeye di såvritè viè on fitchî tecse so "}.
 {"Dump to Text File","Schaper en on fitchî tecse"}.
 {"Edit Properties","Candjî les prôpietés"}.
+{"Either approve or decline the voice request.","Aprover oudonbén rifuzer li dmande di vwès."}.
 {"ejabberd IRC module","Module IRC po ejabberd"}.
 {"ejabberd MUC module","Module MUC (såles di berdelaedje) po ejabberd"}.
+{"ejabberd Multicast service","siervice multicast d' ejabberd"}.
 {"ejabberd Publish-Subscribe module","Module d' eplaidaedje-abounmint po ejabberd"}.
 {"ejabberd SOCKS5 Bytestreams module","Module SOCKS5 Bytestreams po ejabberd"}.
 {"ejabberd vCard module","Module vCard ejabberd"}.
 {"ejabberd Web Admin","Manaedjeu waibe ejabberd"}.
+{"Elements","Elemints"}.
 {"Email","Emile"}.
+{"Empty Rooms","Såles vudes"}.
 {"Enable logging","Mete en alaedje li djournå"}.
+{"Enable message archiving","Mete en alaedje l' årtchivaedje des messaedjes"}.
+{"Encoding for server ~b","Ecôdaedje pol sierveu ~b"}.
 {"End User Session","Fini l' session d' l' uzeu"}.
 {"Enter list of {Module, [Options]}","Dinez ene djivêye del cogne {Module, [Tchuzes]}"}.
 {"Enter nickname you want to register","Dinez l' metou no ki vos vloz edjîstrer"}.
@@ -77,7 +99,17 @@
 {"Enter path to jabberd14 spool dir","Dinez l' tchimin viè l' ridant di spool jabberd14"}.
 {"Enter path to jabberd14 spool file","Dinez l' tchimin viè l' fitchî di spool jabberd14"}.
 {"Enter path to text file","Dinez l' tchimin viè l' fitchî tecse"}.
+{"Enter the text you see","Tapez l' tecse ki vos voeyoz"}.
+{"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.","Dinez les nos d' uzeu et ls ecôdaedjes ki vos vloz eployî po vs raloyî åzès sierveus IRC  Clitchîz so «Shuvant» po-z aveur di pus di tchamps a rimpli.  Clitchîz so «Fini» po schaper les apontiaedjes."}.
+{"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","Dinez l' no d' uzeu, les ecôdaedjes, les pôrts et les screts ki vos vloz eployî po vs raloyî åzès sierveus IRC"}.
 {"Erlang Jabber Server","Sierveu Jabber Erlang"}.
+{"Error","Aroke"}.
+{"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","Egzimpe: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
+{"Exclude Jabber IDs from CAPTCHA challenge","Esclure les IDs Jabber des kesses CAPTCHA"}.
+{"Export all tables as SQL queries to a file:","Espoirter totes les tåves, come des cmandes SQL, viè on fitchî"}.
+{"Export data of all users in the server to PIEFXIS files (XEP-0227):","Espoirter les dnêyes di tos les uzeus do sierveu viè des fitchîs PIEFXIS (XEP-0227):"}.
+{"Export data of users in a host to PIEFXIS files (XEP-0227):","Espoirter les dnêyes di tos les uzeus do sierveu viè des fitchîs PIEFXIS (XEP-0227):"}.
+{"Failed to extract JID from your voice request approval","Nén moyén di rsaetchî on JID foû d' l' aprovaedje di vosse dimande di vwès"}.
 {"Family Name","No d' famile"}.
 {"February","fevrî"}.
 {"Fill in fields to search for any matching Jabber User","Rimplixhoz les tchamps po cweri èn uzeu Jabber"}.
@@ -91,6 +123,7 @@
 {"Get User Last Login Time","Riçure li date/eure do dierin elodjaedje di l' uzeu"}.
 {"Get User Password","Riçure sicret d' l' uzeu"}.
 {"Get User Statistics","Riçure les statistikes di l' uzeu"}.
+{"Grant voice to this person?","Permete li vwès po cisse djin ci?"}.
 {"Group ","Groupe "}.
 {"Groups","Groupes"}.
 {"has been banned","a stî bani"}.
@@ -100,26 +133,42 @@
 {"has been kicked because the room has been changed to members-only","a stî pité evoye cåze ki l' såle a stî ristrindowe åzès mimbes seulmint"}.
 {" has set the subject to: "," a candjî l' tite a: "}.
 {"Host","Sierveu"}.
+{"If you don't see the CAPTCHA image here, visit the web page.","Si vos n' voeyoz nole imådje CAPTCHA chal, vizitez l' pådje waibe."}.
+{"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 vos vloz dner des pôrts, sicrets ou ecôdaedjes diferins po les sierveus IRC, rimplixhoz cisse djivêye ci avou des valixhances del cogne «{\"sierveu irc\", \"ecôdaedje\", pôrt, \"sicret\"}». Les prémetowès valixhances do siervice sont «~s» po l' ecôdaedje, «~p» pol pôrt, et on vude sicret."}.
 {"Import Directory","Sititchî d' on ridant"}.
 {"Import File","Sititchî d' on fitchî"}.
+{"Import user data from jabberd14 spool file:","Sititchî des dnêyes uzeus foû d' on fitchî spoûle jabberd14:"}.
 {"Import User from File at ","Sititchî uzeu d' on fitchî so "}.
+{"Import users data from a PIEFXIS file (XEP-0227):","Sititchî des dnêyes uzeus foû d' on fitchî PIEFXIS (XEP-0227):"}.
+{"Import users data from jabberd14 spool directory:","Sititchî des dnêyes uzeus foû d' on ridant spoûle jabberd14:"}.
 {"Import Users from Dir at ","Sitichî des uzeus d' on ridant so "}.
 {"Import Users From jabberd14 Spool Files","Sititchî des uzeus Jabberd 1.4"}.
 {"Improper message type","Sôre di messaedje nén valide"}.
+{"Incoming s2s Connections:","Raloyaedjes s2s en intrêye:"}.
 {"Incorrect password","Sicret nén corek"}.
 {"Invalid affiliation: ~s","Afiyaedje nén valide: ~s"}.
 {"Invalid role: ~s","Role nén valide: ~s"}.
 {"IP addresses","Adresses IP"}.
+{"IP","IP"}.
+{"IRC channel (don't put the first #)","Canå IRC (èn nén mete li prumî #)"}.
+{"IRC server","Sierveu IRC"}.
+{"IRC settings","Apontiaedjes IRC"}.
 {"IRC Transport","Transpoirt IRC"}.
+{"IRC username","No d' uzeu IRC"}.
 {"IRC Username","No d' uzeu IRC"}.
 {"is now known as","est asteure kinoxhou come"}.
+{"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","On n' pout nén evoyî des messaedjes d' aroke sol såle. Li pårticipan (~s) a-st evoyî on messaedje d' aroke (~s) ey a stî tapé foû."}.
 {"It is not allowed to send private messages","Ci n' est nén permetou d' evoyî des messaedjes privés"}.
 {"It is not allowed to send private messages of type \"groupchat\"","C' est nén possibe d' evoyî des messaedjes privés del sôre «groupchat»"}.
 {"It is not allowed to send private messages to the conference","On n' pout nén evoyî des messaedjes privés dins cisse conferince ci"}.
+{"Jabber Account Registration","Edjîstraedje di conte Jabber"}.
 {"Jabber ID","ID Jabber"}.
 {"Jabber ID ~s is invalid","Li Jabber ID ~s n' est nén valide"}.
 {"January","djanvî"}.
+{"Join IRC channel","Radjonde canå IRC"}.
 {"joins the room","arive sol såle"}.
+{"Join the IRC channel here.","Radjonde li canå IRC droci."}.
+{"Join the IRC channel in this Jabber ID: ~s","Radjonde li canå IRC e cist ID Jabber: ~s"}.
 {"July","djulete"}.
 {"June","djun"}.
 {"Last Activity","Dierinne activité"}.
@@ -130,8 +179,10 @@
 {"Listened Ports at ","Pôrts drovous so "}.
 {"Listened Ports","Pôrts drovous"}.
 {"List of modules to start","Djivêye di modules a-z enonder"}.
+{"List of rooms","Djivêye des såles"}.
 {"Low level update script","Sicripe di metaedje a djoû d' bas livea"}.
 {"Make participants list public","Rinde publike li djivêye des pårticipants"}.
+{"Make room CAPTCHA protected","Rinde li såle di berdelaedje protedjeye pa CAPTCHA"}.
 {"Make room members-only","Rinde li såle di berdelaedje ristrindowe ås mimbes seulmint"}.
 {"Make room moderated","Rinde li såle di berdelaedje moderêye"}.
 {"Make room password protected","Rinde li såle di berdelaedje protedjeye pa scret"}.
@@ -142,29 +193,41 @@
 {"Max # of items to persist","Nombe macsimoms di cayets permanints"}.
 {"Max payload size in bytes","Contnou macsimom en octets"}.
 {"May","may"}.
+{"Membership is required to enter this room","I fåt esse mimbe po poleur intrer dins cisse såle ci"}.
 {"Members:","Mimbes:"}.
+{"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.","Rimimbrez vosse sicret, ou scrijhoz l' so on papî ki vos wådroz en ene place bén a hoûte, ca avou Jabber i n' a pont moyén di rapexhî vosse sicret si vos l' rovyîz."}.
 {"Memory","Memwere"}.
 {"Message body","Coir do messaedje"}.
 {"Middle Name","No do mitan"}.
+{"Minimum interval between voice requests (in seconds)","Tins minimom etur deus dmandes di vwès (e segondes)"}.
+{"Moderator","Moderateu"}.
 {"Moderator privileges required","I fåt des priviledjes di moderateu"}.
 {"moderators only","les moderateus seulmint"}.
+{"Modified modules","Modules di candjîs"}.
 {"Module","Module"}.
+{"Modules at ~p","Modules so ~p"}.
 {"Modules","Modules"}.
 {"Monday","londi"}.
+{"Multicast","Multicast"}.
+{"Multi-User Chat","Berdelaedje a sacwants"}.
 {"Name","No"}.
 {"Name:","Pitit no:"}.
 {"Never","Måy"}.
+{"New Password:","Novea scret:"}.
 {"Nickname","Metou no"}.
 {"Nickname Registration at ","Edjîstraedje di metou no amon "}.
 {"Nickname ~s does not exist in the room","Li metou no ~s n' egzistêye nén dins l' såle"}.
+{"nobody","nolu"}.
 {"No body provided for announce message","I n' a nou coir do messaedje po ciste anonce la"}.
 {"No Data","Nole dinêye disponibe"}.
 {"Node ID","ID d' nuk"}.
 {"Node not found","Nuk nén trové"}.
+{"Node ~p","Nuk ~p"}.
 {"Nodes","Nuks"}.
 {"No limit","Pont d' limite"}.
 {"None","Nole"}.
 {"No resource provided","Nole rissoûce di dnêye"}.
+{"Not Found","Nén trové"}.
 {"Notify subscribers when items are removed from the node","Notifyî åzès abounés cwand des cayets sont oisté foû do nuk"}.
 {"Notify subscribers when the node configuration changes","Notifyî åzès abounés cwand l' apontiaedje do nuk candje"}.
 {"Notify subscribers when the node is deleted","Notifyî åzès abounés cwand l' nuk est disfacé"}.
@@ -176,10 +239,15 @@
 {"Offline Messages:","Messaedjes ki ratindèt:"}.
 {"Offline Messages","Messaedjes ki ratindèt"}.
 {"OK","'l est bon"}.
+{"Old Password:","Vî scret:"}.
 {"Online","Raloyî"}.
 {"Online Users:","Uzeus raloyîs:"}.
 {"Online Users","Uzeus raloyîs"}.
 {"Only deliver notifications to available users","Seulmint evoyî des notifiaedje åzès uzeus disponibes"}.
+{"Only members may query archives of this room","Seulmint les mimbes polèt cweri les årtchives dins cisse såle ci"}.
+{"Only moderators and participants are allowed to change the subject in this room","Seulmint les moderateus et les pårticipants polèt candjî l' sudjet dins cisse såle ci"}.
+{"Only moderators are allowed to change the subject in this room","Seulmint les moderateus polèt candjî l' sudjet dins cisse såle ci"}.
+{"Only moderators can approve voice requests","Seulmint les moderateus polèt aprover des dmandes di vwès"}.
 {"Only occupants are allowed to send messages to the conference","Seulmint les prezints polèt evoyî des messaedjes al conferince"}.
 {"Only occupants are allowed to send queries to the conference","Seulmint les prezints polèt evoyî des cweraedjes sol conferince"}.
 {"Only service administrators are allowed to send service messages","Seulmint les manaedjeus d' siervices polèt evoyî des messaedjes di siervice"}.
@@ -190,31 +258,46 @@
 {"Outgoing s2s Connections","Raloyaedjes s2s e rexhowe"}.
 {"Owner privileges required","I fåt des priviledjes di prôpietaire"}.
 {"Packet","Paket"}.
+{"Participant","Pårticipant"}.
+{"Password ~b","Sicret ~b"}.
 {"Password:","Sicret:"}.
 {"Password","Sicret"}.
+{"Password Verification:","Acertinaedje do scret:"}.
 {"Password Verification","Acertinaedje do scret"}.
 {"Path to Dir","Tchimin viè l' ridant"}.
 {"Path to File","Tchimin viè l' fitchî"}.
 {"Pending","Ratindant"}.
 {"Period: ","Termene:"}.
+{"Permanent rooms","Såles tofer la"}.
 {"Persist items to storage","Cayets permanints a wårder"}.
 {"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.","Notez ki ces tchuzes la vont seulmint fé ene copeye di såvrité del båze di dnêyes Mnesia costrûte å dvins do programe. Si vos eployîz ene difoûtrinne båze di dnêyes avou l' module ODBC, vos dvoz fé ene copeye di såvrité del båze SQL da vosse sepårumint."}.
+{"Please specify file name.","Dinez l' no do fitchî."}.
+{"Please specify file size.","Dinez l' grandeu do fitchî."}.
+{"Please, wait for a while before sending new voice request","Ratindez ene miete s' i vs plait divant d' rivoyî ene nouve dimande di vwès"}.
 {"Pong","Pong"}.
+{"Port ~b","Pôrt ~b"}.
 {"Port","Pôrt"}.
 {"Present real Jabber IDs to","Mostrer les vraiys Jabber IDs a"}.
 {"private, ","privé, "}.
+{"Protocol","Protocole"}.
 {"Publish-Subscribe","Eplaidaedje-abounmint"}.
 {"PubSub subscriber request","Dimande d' eplaidaedje-abounmint d' èn abouné"}.
+{"Purge all items when the relevant publisher goes offline","Purdjî tos les cayets cwand l' eplaideu aloyî va foû raloyaedje"}.
 {"Queries to the conference members are not allowed in this room","Les cweraedjes des mimbes del conferince ni sont nén permetous dins cisse såle ci"}.
 {"RAM and disc copy","Copeye e memwere (RAM) et sol deure plake"}.
 {"RAM copy","Copeye e memwere (RAM)"}.
 {"Raw","Dinêyes brutes"}.
 {"Really delete message of the day?","Voloz vs vormint disfacer l' messaedje do djoû?"}.
 {"Recipient is not in the conference room","Li riçuveu n' est nén dins l' såle di conferince"}.
+{"Register a Jabber account","Edjîstrer on conte Jabber"}.
+{"Register","Edjîstrer"}.
+{"Registered nicknames","Metous nos edjistrés"}.
 {"Registered Users:","Uzeus edjistrés:"}.
 {"Registered Users","Uzeus edjistrés"}.
 {"Registration in mod_irc for ","Edjîstraedje dins mod_irc po "}.
 {"Remote copy","Copeye å lon"}.
+{"Remove All Offline Messages","Oister tos les messaedjes ki ratindèt"}.
 {"Remove","Oister"}.
 {"Remove User","Disfacer l' uzeu"}.
 {"Replaced by new connection","Replaecî pa on novea raloyaedje"}.
@@ -226,8 +309,11 @@
 {"Restore binary backup immediately:","Rapexhî do côp foû d' ene copeye di såvrité binaire:"}.
 {"Restore plain text backup immediately:","Rapexhî do côp foû d' ene copeye di såvrité tecse:"}.
 {"Restore","Rapexhî"}.
+{"Roles for which Presence is Broadcasted","Roles ki leu prezince est difuzêye"}.
 {"Room Configuration","Apontiaedje del såle"}.
 {"Room creation is denied by service policy","L' ahivaedje del såle est rfuzé pal politike do siervice"}.
+{"Room description","Discrijhaedje del såle"}.
+{"Room Occupants","Prezints el såle"}.
 {"Room title","Tite del såle"}.
 {"Roster","Djivêye des soçons"}.
 {"Roster groups allowed to subscribe","Pårtaedjîs groupes di soçons k' on s' î pout abouner"}.
@@ -245,6 +331,9 @@
 {"Send announcement to all users","Evoyî l' anonce a tos les uzeus"}.
 {"Send announcement to all users on all hosts","Evoyî l' anonce a tos les uzeus so tos les lodjoes"}.
 {"September","setimbe"}.
+{"Server ~b","Sierveu ~b"}.
+{"Server:","Sierveu:"}.
+{"Server","Sierveu"}.
 {"Set message of the day and send to online users","Defini l' messaedje do djoû et l' evoyî åzès uzeus raloyîs"}.
 {"Set message of the day on all hosts and send to online users","Defini l' messaedje do djoû so tos les lodjoes et l' evoyî åzès uzeus raloyîs"}.
 {"Shared Roster Groups","Pårtaedjîs groupes ezès djivêyes di soçons"}.
@@ -252,7 +341,9 @@
 {"Show Ordinary Table","Mostrer crexhince"}.
 {"Shut Down Service","Arester siervice"}.
 {"~s invites you to the room ~s","~s vos preye sol såle ~s"}.
+{"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Des cliyints Jabber k' i gn a polèt wårder vosse sicret sol copiutrece, mins vos n' duvrîz fé çoula ki sol copiutrece da vosse, po des råjhons di såvrité."}.
 {"Specify the access model","Sipecifyî l' modele d' accès"}.
+{"Specify the event message type","Sipecifyî l' sôre do messaedje d' evenmint"}.
 {"Specify the publisher model","Dinez l' modele d' eplaideu"}.
 {"~s's Offline Messages Queue","messaedjes ki ratindèt el cawêye po ~s"}.
 {"Start","Enonder"}.
@@ -273,27 +364,54 @@
 {"Subscriber Address","Adresse di l' abouné"}.
 {"Subscription","Abounmimnt"}.
 {"Sunday","dimegne"}.
+{"That nickname is already in use by another occupant","Li metou no est ddja eployî pa ene ôte sakî sol såle"}.
+{"That nickname is registered by another person","Li metou no est ddja edjîstré pa ene ôte sakî"}.
+{"The CAPTCHA is valid.","Li CAPTCHA est valide."}.
+{"The CAPTCHA verification has failed","Li verifiaedje CAPTCHA a fwait berwete"}.
+{"The collections with which a node is affiliated","Les ramexhnêyes k' on nuk est afiyî avou"}.
 {"the password is","li scret est"}.
+{"The password is too weak","li scret est trop flåw"}.
+{"The password of your Jabber account was successfully changed.","Li scret do conte Jabber da vosse a stî candjî comifåt."}.
+{"There was an error changing the password: ","Åk n' a nén stî tot candjant l' sicret: "}.
+{"There was an error creating the account: ","Åk n' a nén stî tot ahivant l' conte: "}.
+{"There was an error deleting the account: ","Åk n' a nén stî tot disfaçant l' conte: "}.
+{"This IP address is blacklisted in ~s","Ciste adresse IP est so ene noere djivêye e ~s"}.
+{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Pont d' diferince etur les grandes et ptitès letes: «macbeth» est l' minme ki «MacBeth» ou co «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.","Cisse pådje permete d' ahiver on conte Jabber so ç' sierveu Jabber ci. Li JID (IDintifieu Jabber) da vosse serè del cogne: noduzeu@sierveu. Lijhoz atintivmint les instruccions po bén rimpli les tchamps."}.
+{"This page allows to unregister a Jabber account in this Jabber server.","Cisse pådje permete di disdjîstrer on conte Jabber so ç' sierveu ci."}.
 {"Thursday","djudi"}.
 {"Time","Date"}.
 {"Time delay","Tårdjaedje"}.
+{"Too many CAPTCHA requests","Pår trop di dmandes CAPTCHA"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","I gn a-st avou pår trop (~p) d' otintifiaedjes k' ont fwait berwete vinant di ciste adresse IP la (~s). L' adresse serè disblokêye a ~s UTC"}.
+{"Too many unacked stanzas","Pår trop di messaedjes sins acertinaedje di rçuvaedje"}.
 {"To","Po"}.
 {"To ~s","Viè ~s"}.
+{"Total rooms","Totå di såles"}.
 {"Traffic rate limit is exceeded","Li limite pol volume di trafik a stî passêye"}.
 {"Transactions Aborted:","Transaccions arestêyes:"}.
 {"Transactions Committed:","Transaccions evoyeyes:"}.
 {"Transactions Logged:","Transaccions wårdêyes e djournå:"}.
 {"Transactions Restarted:","Transaccions renondêyes:"}.
 {"Tuesday","mårdi"}.
+{"Unable to generate a CAPTCHA","Nén moyén di djenerer on CAPTCHA"}.
+{"Unauthorized","Nén otorijhî"}.
+{"Unregister a Jabber account","Disdjîstrer on conte Jabber"}.
+{"Unregister","Disdjîstrer"}.
 {"Update message of the day (don't send)","Mete a djoû l' messaedje do djoû (nén l' evoyî)"}.
 {"Update message of the day on all hosts (don't send)","Mete a djoû l' messaedje do djoû so tos les lodjoes (nén l' evoyî)"}.
 {"Update","Mete a djoû"}.
 {"Update plan","Plan d' metaedje a djoû"}.
+{"Update ~p","Metaedje a djoû di ~p"}.
 {"Update script","Sicripe di metaedje a djoû"}.
 {"Uptime:","Tins dispoy l' enondaedje:"}.
 {"Use of STARTTLS required","L' eployaedje di STARTTL est oblidjî"}.
+{"User JID","JID d' l' uzeu"}.
 {"User Management","Manaedjaedje des uzeus"}.
+{"Username:","No d' uzeu:"}.
+{"Users are not allowed to register accounts so quickly","Les noveas uzeus n' si polèt nén edjîstrer si raddimint"}.
 {"Users Last Activity","Dierinne activité des uzeus"}.
+{"User ~s","Uzeu ~s"}.
 {"Users","Uzeus"}.
 {"User","Uzeu"}.
 {"Validate","Valider"}.
@@ -301,12 +419,22 @@
 {"Virtual Hosts","Forveyous sierveus"}.
 {"Visitors are not allowed to change their nicknames in this room","Les viziteus èn polèt nén candjî leus metous no po ç' såle ci"}.
 {"Visitors are not allowed to send messages to all occupants","Les viziteus n' polèt nén evoyî des messaedjes a tos les prezints"}.
+{"Visitor","Viziteu"}.
+{"Voice request","Dimande di vwès"}.
+{"Voice requests are disabled in this conference","Les dmandes di vwès sont dismetowes e cisse conferince ci"}.
 {"Wednesday","mierkidi"}.
 {"When to send the last published item","Cwand evoyî l' dierin cayet eplaidî"}.
 {"Whether to allow subscriptions","Si on permete les abounmints"}.
+{"You can later change your password using a Jabber client.","Vos ploz candjî vosse sicret pus tård avou on cliyint Jabber."}.
 {"You have been banned from this room","Vos avoz stî bani di cisse såle ci"}.
 {"You must fill in field \"Nickname\" in the form","Vos dvoz rimpli l' tchamp «Metou no» dins l' formiulaire"}.
+{"You need a client that supports x:data and CAPTCHA to register","Vos avoz mezåjhe d' on cliyint ki sopoite x:data eyet CAPTCHA po vs edjîstrer"}.
+{"You need a client that supports x:data to register the nickname","Vos avoz mezåjhe d' on cliyint ki sopoite x:data po-z edjîstrer l' metou no"}.
 {"You need an x:data capable client to configure mod_irc settings","Vos avoz mezåjhe d' on cliyint ki sopoite x:data po candjî ls apontiaedjes di mod_irc"}.
 {"You need an x:data capable client to configure room","I vs fåt on cliyint ki sopoite x:data por vos poleur apontyî l' såle"}.
 {"You need an x:data capable client to search","Vos avoz mezåjhe d' on cliyint ki sopoite x:data po fé on cweraedje"}.
+{"Your active privacy list has denied the routing of this stanza.","Vosse djivêye di privaceye active a rfuzé l' evoyaedje di ç' messaedje ci."}.
 {"Your contact offline message queue is full. The message has been discarded.","Li cawêye di messaedjes e môde disraloyî di vosse soçon est plinne. Li messaedje a stî tapé å diale."}.
+{"Your Jabber account was successfully created.","Li conte Jabber da vosse a stî ahivé comifåt."}.
+{"Your Jabber account was successfully deleted.","Li conte Jabber da vosse a stî disfacé comifåt."}.
+{"Your messages to ~s are being blocked. To unblock them, visit ~s","Vos messaedjes po ~s sont blokés. Po les disbloker, alez vey ~s"}.

priv/msgs/wa.po

@@ -1,11 +1,16 @@
+# Pablo Saratxaga <pablo@walon.org>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.1.0-alpha\n"
-"Last-Translator: Pablo Saratxaga\n"
+"PO-Revision-Date: 2015-01-18 12:19+0000\n"
+"Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
+"Language-Team: Pablo Saratxaga <pablo@walon.org>\n"
+"Language: wa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Language: Walon (Walloon)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ejabberd_c2s.erl:505 ejabberd_c2s.erl:853
 msgid "Use of STARTTLS required"
@@ -24,34 +29,33 @@ msgstr "Replaecî pa on novea raloyaedje"
 msgid "has been kicked"
 msgstr "a stî pité evoye"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
-msgstr ""
+msgstr "Vosse djivêye di privaceye active a rfuzé l' evoyaedje di ç' messaedje ci."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
-msgstr ""
+msgstr "Pår trop di messaedjes sins acertinaedje di rçuvaedje"
 
 #: ejabberd_captcha.erl:122 ejabberd_captcha.erl:245 ejabberd_captcha.erl:284
-#, fuzzy
 msgid "Enter the text you see"
-msgstr "Dinez l' tchimin viè l' fitchî tecse"
+msgstr "Tapez l' tecse ki vos voeyoz"
 
 #: ejabberd_captcha.erl:147
 msgid "Your messages to ~s are being blocked. To unblock them, visit ~s"
-msgstr ""
+msgstr "Vos messaedjes po ~s sont blokés. Po les disbloker, alez vey ~s"
 
 #: ejabberd_captcha.erl:192
 msgid "If you don't see the CAPTCHA image here, visit the web page."
-msgstr ""
+msgstr "Si vos n' voeyoz nole imådje CAPTCHA chal, vizitez l' pådje waibe."
 
 #: ejabberd_captcha.erl:227
 msgid "CAPTCHA web page"
-msgstr ""
+msgstr "Pådje web CAPTCHA"
 
 #: ejabberd_captcha.erl:381
 msgid "The CAPTCHA is valid."
-msgstr ""
+msgstr "Li CAPTCHA est valide."
 
 #: ejabberd_oauth.erl:253 ejabberd_web_admin.erl:1403
 #: ejabberd_web_admin.erl:1458 mod_register.erl:265 mod_vcard.erl:490
@@ -59,9 +63,8 @@ msgid "User"
 msgstr "Uzeu"
 
 #: ejabberd_oauth.erl:256
-#, fuzzy
 msgid "Server"
-msgstr "Måy"
+msgstr "Sierveu"
 
 #: ejabberd_oauth.erl:259 ejabberd_web_admin.erl:1408 mod_configure.erl:1398
 #: mod_configure.erl:1485 mod_configure.erl:1889 mod_configure.erl:2123
@@ -71,12 +74,12 @@ msgstr "Sicret"
 
 #: ejabberd_oauth.erl:267
 msgid "Accept"
-msgstr ""
+msgstr "Accepter"
 
 #: ejabberd_web_admin.erl:202 ejabberd_web_admin.erl:214
 #: ejabberd_web_admin.erl:234 ejabberd_web_admin.erl:246
 msgid "Unauthorized"
-msgstr ""
+msgstr "Nén otorijhî"
 
 #: ejabberd_web_admin.erl:303 ejabberd_web_admin.erl:335
 msgid "ejabberd Web Admin"
@@ -182,9 +185,8 @@ msgid "Statistics"
 msgstr "Sitatistikes"
 
 #: ejabberd_web_admin.erl:1014
-#, fuzzy
 msgid "Not Found"
-msgstr "Nuk nén trové"
+msgstr "Nén trové"
 
 #: ejabberd_web_admin.erl:1027
 msgid "Node not found"
@@ -239,9 +241,8 @@ msgid "Outgoing s2s Connections:"
 msgstr "Raloyaedjes s2s e rexhowe:"
 
 #: ejabberd_web_admin.erl:1559
-#, fuzzy
 msgid "Incoming s2s Connections:"
-msgstr "Raloyaedjes s2s e rexhowe:"
+msgstr "Raloyaedjes s2s en intrêye:"
 
 #: ejabberd_web_admin.erl:1595 ejabberd_web_admin.erl:1794
 #: ejabberd_web_admin.erl:1804 ejabberd_web_admin.erl:2214 mod_roster.erl:1429
@@ -254,9 +255,8 @@ msgid "Change Password"
 msgstr "Candjî l' sicret"
 
 #: ejabberd_web_admin.erl:1673
-#, fuzzy
 msgid "User ~s"
-msgstr "Uzeu "
+msgstr "Uzeu ~s"
 
 #: ejabberd_web_admin.erl:1684
 msgid "Connected Resources:"
@@ -288,9 +288,8 @@ msgid "Stopped Nodes"
 msgstr "Nuks essoctés"
 
 #: ejabberd_web_admin.erl:1833 ejabberd_web_admin.erl:1858
-#, fuzzy
 msgid "Node ~p"
-msgstr "Nuk "
+msgstr "Nuk ~p"
 
 #: ejabberd_web_admin.erl:1842 mod_configure.erl:150 mod_configure.erl:611
 msgid "Database"
@@ -327,9 +326,8 @@ msgid "RPC Call Error"
 msgstr "Aroke di houcaedje RPC"
 
 #: ejabberd_web_admin.erl:1917
-#, fuzzy
 msgid "Database Tables at ~p"
-msgstr "Tåves del båze di dnêyes so "
+msgstr "Tåves del båze di dnêyes so ~p"
 
 #: ejabberd_web_admin.erl:1927 mod_vcard.erl:490 mod_vcard.erl:616
 msgid "Name"
@@ -341,7 +339,7 @@ msgstr "Sôre di wårdaedje"
 
 #: ejabberd_web_admin.erl:1929
 msgid "Elements"
-msgstr ""
+msgstr "Elemints"
 
 #: ejabberd_web_admin.erl:1930
 msgid "Memory"
@@ -349,15 +347,13 @@ msgstr "Memwere"
 
 #: ejabberd_web_admin.erl:1952 ejabberd_web_admin.erl:2123
 msgid "Error"
-msgstr ""
+msgstr "Aroke"
 
 #: ejabberd_web_admin.erl:1955
-#, fuzzy
 msgid "Backup of ~p"
-msgstr "Copeye di såvrité po "
+msgstr "Copeye di såvrité po ~p"
 
 #: ejabberd_web_admin.erl:1959
-#, fuzzy
 msgid ""
 "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 "
@@ -402,38 +398,35 @@ msgstr "Rapexhî do côp foû d' ene copeye di såvrité tecse:"
 
 #: ejabberd_web_admin.erl:2019
 msgid "Import users data from a PIEFXIS file (XEP-0227):"
-msgstr ""
+msgstr "Sititchî des dnêyes uzeus foû d' on fitchî PIEFXIS (XEP-0227):"
 
 #: ejabberd_web_admin.erl:2032
 msgid "Export data of all users in the server to PIEFXIS files (XEP-0227):"
-msgstr ""
+msgstr "Espoirter les dnêyes di tos les uzeus do sierveu viè des fitchîs PIEFXIS (XEP-0227):"
 
 #: ejabberd_web_admin.erl:2044
 msgid "Export data of users in a host to PIEFXIS files (XEP-0227):"
-msgstr ""
+msgstr "Espoirter les dnêyes di tos les uzeus do sierveu viè des fitchîs PIEFXIS (XEP-0227):"
 
 #: ejabberd_web_admin.erl:2060
 msgid "Export all tables as SQL queries to a file:"
-msgstr ""
+msgstr "Espoirter totes les tåves, come des cmandes SQL, viè on fitchî"
 
 #: ejabberd_web_admin.erl:2076
-#, fuzzy
 msgid "Import user data from jabberd14 spool file:"
-msgstr "Sititchî des uzeus Jabberd 1.4"
+msgstr "Sititchî des dnêyes uzeus foû d' on fitchî spoûle jabberd14:"
 
 #: ejabberd_web_admin.erl:2087
-#, fuzzy
 msgid "Import users data from jabberd14 spool directory:"
-msgstr "Sititchî des uzeus Jabberd 1.4"
+msgstr "Sititchî des dnêyes uzeus foû d' on ridant spoûle jabberd14:"
 
 #: ejabberd_web_admin.erl:2115
 msgid "Listened Ports at "
 msgstr "Pôrts drovous so "
 
 #: ejabberd_web_admin.erl:2144
-#, fuzzy
 msgid "Modules at ~p"
-msgstr "Modules so "
+msgstr "Modules so ~p"
 
 #: ejabberd_web_admin.erl:2175
 msgid "Statistics of ~p"
@@ -464,18 +457,16 @@ msgid "Transactions Logged:"
 msgstr "Transaccions wårdêyes e djournå:"
 
 #: ejabberd_web_admin.erl:2243
-#, fuzzy
 msgid "Update ~p"
-msgstr "Metaedje a djoû "
+msgstr "Metaedje a djoû di ~p"
 
 #: ejabberd_web_admin.erl:2254
 msgid "Update plan"
 msgstr "Plan d' metaedje a djoû"
 
 #: ejabberd_web_admin.erl:2255
-#, fuzzy
 msgid "Modified modules"
-msgstr "Modules metous a djoû"
+msgstr "Modules di candjîs"
 
 #: ejabberd_web_admin.erl:2256
 msgid "Update script"
@@ -491,16 +482,15 @@ msgstr "Acertinaedje do scripe"
 
 #: ejabberd_web_admin.erl:2438
 msgid "IP"
-msgstr ""
+msgstr "IP"
 
 #: ejabberd_web_admin.erl:2438
 msgid "Port"
 msgstr "Pôrt"
 
 #: ejabberd_web_admin.erl:2439
-#, fuzzy
 msgid "Protocol"
-msgstr "Pôrt"
+msgstr "Protocole"
 
 #: ejabberd_web_admin.erl:2440 ejabberd_web_admin.erl:2595
 msgid "Module"
@@ -847,18 +837,20 @@ msgid ""
 "Too many (~p) failed authentications from this IP address (~s). The address "
 "will be unblocked at ~s UTC"
 msgstr ""
+"I gn a-st avou pår trop (~p) d' otintifiaedjes k' ont fwait berwete vinant "
+"di ciste adresse IP la (~s). L' adresse serè disblokêye a ~s UTC"
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
-msgstr ""
+msgstr "Dinez l' grandeu do fitchî."
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
-msgstr ""
+msgstr "Dinez l' no do fitchî."
 
 #: mod_ip_blacklist.erl:121
 msgid "This IP address is blacklisted in ~s"
-msgstr ""
+msgstr "Ciste adresse IP est so ene noere djivêye e ~s"
 
 #: mod_irc.erl:220 mod_muc.erl:467
 msgid "Access denied by service policy"
@@ -883,105 +875,98 @@ msgid "Registration in mod_irc for "
 msgstr "Edjîstraedje dins mod_irc po "
 
 #: mod_irc.erl:659
-#, fuzzy
 msgid ""
 "Enter username, encodings, ports and passwords you wish to use for "
 "connecting to IRC servers"
 msgstr ""
-"Dinez les nos d' uzeu et ls ecôdaedjes ki vos vloz eployî po vs raloyî åzès "
-"sierveus IRC"
+"Dinez l' no d' uzeu, les ecôdaedjes, les pôrts et les screts ki vos vloz "
+"eployî po vs raloyî åzès sierveus IRC"
 
 #: mod_irc.erl:667
 msgid "IRC Username"
 msgstr "No d' uzeu IRC"
 
 #: mod_irc.erl:682
-#, fuzzy
 msgid ""
 "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."
 msgstr ""
-"Si vos vloz dner des ecôdaedjes diferins po les sierveus IRC, rimplixhoz "
-"cisse djivêye ci avou des valixhances del cogne «{\"sierveu irc\", "
-"\"ecôdaedje\"}». Li prémetou ecôdaedje do siervice c' est «~s»."
+"Si vos vloz dner des pôrts, sicrets ou ecôdaedjes diferins po les sierveus "
+"IRC, rimplixhoz cisse djivêye ci avou des valixhances del cogne «{\"sierveu "
+"irc\", \"ecôdaedje\", pôrt, \"sicret\"}». Les prémetowès valixhances do "
+"siervice sont «~s» po l' ecôdaedje, «~p» pol pôrt, et on vude sicret."
 
 #: mod_irc.erl:704
-#, fuzzy
 msgid ""
 "Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef."
 "net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."
 msgstr ""
-"Egzimpe: [{\"irc.lucky.net\", \"koi8-r\"}, {\"vendetta.fef.net\", "
-"\"iso8859-1\"}]."
+"Egzimpe: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef."
+"net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."
 
 #: mod_irc.erl:713
 msgid "Connections parameters"
-msgstr ""
+msgstr "Parametes des raloyaedjes"
 
 #: mod_irc.erl:886
 msgid "Join IRC channel"
-msgstr ""
+msgstr "Radjonde canå IRC"
 
 #: mod_irc.erl:893
 msgid "IRC channel (don't put the first #)"
-msgstr ""
+msgstr "Canå IRC (èn nén mete li prumî #)"
 
 #: mod_irc.erl:903
-#, fuzzy
 msgid "IRC server"
-msgstr "No d' uzeu IRC"
+msgstr "Sierveu IRC"
 
 #: mod_irc.erl:950 mod_irc.erl:958
 msgid "Join the IRC channel here."
-msgstr ""
+msgstr "Radjonde li canå IRC droci."
 
 #: mod_irc.erl:967
 msgid "Join the IRC channel in this Jabber ID: ~s"
-msgstr ""
+msgstr "Radjonde li canå IRC e cist ID Jabber: ~s"
 
 #: mod_irc.erl:1046
 msgid "IRC settings"
-msgstr ""
+msgstr "Apontiaedjes IRC"
 
 #: mod_irc.erl:1051
-#, fuzzy
 msgid ""
 "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."
 msgstr ""
 "Dinez les nos d' uzeu et ls ecôdaedjes ki vos vloz eployî po vs raloyî åzès "
-"sierveus IRC"
+"sierveus IRC  Clitchîz so «Shuvant» po-z aveur di pus di tchamps a rimpli.  "
+"Clitchîz so «Fini» po schaper les apontiaedjes."
 
 #: mod_irc.erl:1060
-#, fuzzy
 msgid "IRC username"
 msgstr "No d' uzeu IRC"
 
 #: mod_irc.erl:1126
-#, fuzzy
 msgid "Password ~b"
-msgstr "Sicret"
+msgstr "Sicret ~b"
 
 #: mod_irc.erl:1137
-#, fuzzy
 msgid "Port ~b"
-msgstr "Pôrt"
+msgstr "Pôrt ~b"
 
 #: mod_irc.erl:1150
 msgid "Encoding for server ~b"
-msgstr ""
+msgstr "Ecôdaedje pol sierveu ~b"
 
 #: mod_irc.erl:1171
 msgid "Server ~b"
-msgstr ""
+msgstr "Sierveu ~b"
 
-#: mod_mam.erl:270
-#, fuzzy
-msgid "Only members are allowed to query archives of this room"
-msgstr "Seulmint les moderateus polèt candjî l' sudjet dins cisse såle ci"
+#: mod_mam.erl:541
+msgid "Only members may query archives of this room"
+msgstr "Seulmint les mimbes polèt cweri les årtchives dins cisse såle ci"
 
 #: mod_muc.erl:585
 msgid "Only service administrators are allowed to send service messages"
@@ -1000,65 +985,60 @@ msgstr "Li såle di conferince n' egzistêye nén"
 msgid "Chatrooms"
 msgstr "Såles di berdelaedje"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
-msgstr ""
+msgstr "Såles vudes"
 
-#: mod_muc.erl:931
-#, fuzzy
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr ""
-"Vos avoz mezåjhe d' on cliyint ki sopoite x:data po-z edjîstrer on metou no"
+"Vos avoz mezåjhe d' on cliyint ki sopoite x:data po-z edjîstrer l' metou no"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
 msgstr "Edjîstraedje di metou no amon "
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "Dinez l' metou no ki vos vloz edjîstrer"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "Metou no"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
-#, fuzzy
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "Li metou no est ddja edjîstré pa ene ôte sakî"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "Vos dvoz rimpli l' tchamp «Metou no» dins l' formiulaire"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "Module MUC (såles di berdelaedje) po ejabberd"
 
 #: mod_muc_admin.erl:231 mod_muc_admin.erl:234 mod_muc_admin.erl:246
 #: mod_muc_admin.erl:320
 msgid "Multi-User Chat"
-msgstr ""
+msgstr "Berdelaedje a sacwants"
 
 #: mod_muc_admin.erl:249
-#, fuzzy
 msgid "Total rooms"
-msgstr "Såles di berdelaedje"
+msgstr "Totå di såles"
 
 #: mod_muc_admin.erl:250
-#, fuzzy
 msgid "Permanent rooms"
-msgstr "cwite li såle"
+msgstr "Såles tofer la"
 
 #: mod_muc_admin.erl:251
-#, fuzzy
 msgid "Registered nicknames"
-msgstr "Uzeus edjistrés"
+msgstr "Metous nos edjistrés"
 
 #: mod_muc_admin.erl:254
 msgid "List of rooms"
-msgstr ""
+msgstr "Djivêye des såles"
 
 #: mod_muc_log.erl:398 mod_muc_log.erl:407
 msgid "Chatroom configuration modified"
@@ -1098,24 +1078,20 @@ msgid " has set the subject to: "
 msgstr " a candjî l' tite a: "
 
 #: mod_muc_log.erl:493
-#, fuzzy
 msgid "Chatroom is created"
-msgstr "Såles di berdelaedje"
+msgstr "Li såle di berdelaedje est ahivêye"
 
 #: mod_muc_log.erl:495
-#, fuzzy
 msgid "Chatroom is destroyed"
-msgstr "Såles di berdelaedje"
+msgstr "Li såle di berdelaedje est distrûte"
 
 #: mod_muc_log.erl:497
-#, fuzzy
 msgid "Chatroom is started"
-msgstr "Såles di berdelaedje"
+msgstr "Li såle di berdelaedje est enondêye"
 
 #: mod_muc_log.erl:499
-#, fuzzy
 msgid "Chatroom is stopped"
-msgstr "Såles di berdelaedje"
+msgstr "Li såle di berdelaedje est ahotêye"
 
 #: mod_muc_log.erl:503
 msgid "Monday"
@@ -1198,9 +1174,8 @@ msgid "Room Configuration"
 msgstr "Apontiaedje del såle"
 
 #: mod_muc_log.erl:932
-#, fuzzy
 msgid "Room Occupants"
-msgstr "Nombe di prezints"
+msgstr "Prezints el såle"
 
 #: mod_muc_room.erl:163
 msgid "Traffic rate limit is exceeded"
@@ -1208,9 +1183,11 @@ msgstr "Li limite pol volume di trafik a stî passêye"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
+"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"
 msgstr ""
+"On n' pout nén evoyî des messaedjes d' aroke sol såle. Li pårticipan (~s) "
+"a-st evoyî on messaedje d' aroke (~s) ey a stî tapé foû."
 
 #: mod_muc_room.erl:241
 msgid "It is not allowed to send private messages to the conference"
@@ -1218,20 +1195,20 @@ msgstr "On n' pout nén evoyî des messaedjes privés dins cisse conferince ci"
 
 #: mod_muc_room.erl:316
 msgid "Please, wait for a while before sending new voice request"
-msgstr ""
+msgstr "Ratindez ene miete s' i vs plait divant d' rivoyî ene nouve "
+"dimande di vwès"
 
 #: mod_muc_room.erl:329
 msgid "Voice requests are disabled in this conference"
-msgstr ""
+msgstr "Les dmandes di vwès sont dismetowes e cisse conferince ci"
 
 #: mod_muc_room.erl:347
 msgid "Failed to extract JID from your voice request approval"
-msgstr ""
+msgstr "Nén moyén di rsaetchî on JID foû d' l' aprovaedje di vosse dimande di vwès"
 
 #: mod_muc_room.erl:377
-#, fuzzy
 msgid "Only moderators can approve voice requests"
-msgstr "Les uzeus polèt evoyî priyaedjes"
+msgstr "Seulmint les moderateus polèt aprover des dmandes di vwès"
 
 #: mod_muc_room.erl:389
 msgid "Improper message type"
@@ -1249,7 +1226,7 @@ msgstr "Li riçuveu n' est nén dins l' såle di conferince"
 msgid "It is not allowed to send private messages"
 msgstr "Ci n' est nén permetou d' evoyî des messaedjes privés"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "Seulmint les prezints polèt evoyî des messaedjes al conferince"
 
@@ -1264,7 +1241,6 @@ msgstr ""
 "såle ci"
 
 #: mod_muc_room.erl:961
-#, fuzzy
 msgid ""
 "Only moderators and participants are allowed to change the subject in this "
 "room"
@@ -1273,7 +1249,6 @@ msgstr ""
 "cisse såle ci"
 
 #: mod_muc_room.erl:966
-#, fuzzy
 msgid "Only moderators are allowed to change the subject in this room"
 msgstr "Seulmint les moderateus polèt candjî l' sudjet dins cisse såle ci"
 
@@ -1286,7 +1261,6 @@ msgid "Visitors are not allowed to change their nicknames in this room"
 msgstr "Les viziteus èn polèt nén candjî leus metous no po ç' såle ci"
 
 #: mod_muc_room.erl:1093 mod_muc_room.erl:1835
-#, fuzzy
 msgid "That nickname is already in use by another occupant"
 msgstr "Li metou no est ddja eployî pa ene ôte sakî sol såle"
 
@@ -1295,22 +1269,20 @@ msgid "You have been banned from this room"
 msgstr "Vos avoz stî bani di cisse såle ci"
 
 #: mod_muc_room.erl:1826
-#, fuzzy
 msgid "Membership is required to enter this room"
 msgstr "I fåt esse mimbe po poleur intrer dins cisse såle ci"
 
 #: mod_muc_room.erl:1872
-#, fuzzy
 msgid "A password is required to enter this room"
 msgstr "I fåt dner on scret po poleur intrer dins cisse såle ci"
 
 #: mod_muc_room.erl:1898 mod_register.erl:295
 msgid "Too many CAPTCHA requests"
-msgstr ""
+msgstr "Pår trop di dmandes CAPTCHA"
 
 #: mod_muc_room.erl:1908 mod_register.erl:301
 msgid "Unable to generate a CAPTCHA"
-msgstr ""
+msgstr "Nén moyén di djenerer on CAPTCHA"
 
 #: mod_muc_room.erl:1919
 msgid "Incorrect password"
@@ -1340,23 +1312,21 @@ msgstr "Afiyaedje nén valide: ~s"
 msgid "Invalid role: ~s"
 msgstr "Role nén valide: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "I fåt des priviledjes di prôpietaire"
 
 #: mod_muc_room.erl:3348
-#, fuzzy
 msgid "Configuration of room ~s"
-msgstr "Apontiaedje po "
+msgstr "Apontiaedje del såle ~s"
 
 #: mod_muc_room.erl:3359
 msgid "Room title"
 msgstr "Tite del såle"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
-#, fuzzy
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
-msgstr "Discrijhaedje:"
+msgstr "Discrijhaedje del såle"
 
 #: mod_muc_room.erl:3369
 msgid "Make room persistent"
@@ -1396,20 +1366,19 @@ msgstr "tot l' minme kî"
 
 #: mod_muc_room.erl:3471
 msgid "Roles for which Presence is Broadcasted"
-msgstr ""
+msgstr "Roles ki leu prezince est difuzêye"
 
 #: mod_muc_room.erl:3486
-#, fuzzy
 msgid "Moderator"
-msgstr "les moderateus seulmint"
+msgstr "Moderateu"
 
 #: mod_muc_room.erl:3496
 msgid "Participant"
-msgstr ""
+msgstr "Pårticipant"
 
 #: mod_muc_room.erl:3506
 msgid "Visitor"
-msgstr ""
+msgstr "Viziteu"
 
 #: mod_muc_room.erl:3513
 msgid "Make room members-only"
@@ -1424,7 +1393,6 @@ msgid "Default users as participants"
 msgstr "Les uzeus sont des pårticipants come prémetowe dujhance"
 
 #: mod_muc_room.erl:3522
-#, fuzzy
 msgid "Allow users to change the subject"
 msgstr "Les uzeus polèt candjî l' tite"
 
@@ -1433,13 +1401,12 @@ msgid "Allow users to send private messages"
 msgstr "Les uzeus polèt evoyî des messaedjes privés"
 
 #: mod_muc_room.erl:3533
-#, fuzzy
 msgid "Allow visitors to send private messages to"
 msgstr "Les uzeus polèt evoyî des messaedjes privés"
 
 #: mod_muc_room.erl:3551
 msgid "nobody"
-msgstr ""
+msgstr "nolu"
 
 #: mod_muc_room.erl:3576
 msgid "Allow users to query other users"
@@ -1460,26 +1427,24 @@ msgid "Allow visitors to change nickname"
 msgstr "Permete ki les viziteus candjexhe leus metous nos"
 
 #: mod_muc_room.erl:3589
-#, fuzzy
 msgid "Allow visitors to send voice requests"
-msgstr "Les uzeus polèt evoyî priyaedjes"
+msgstr "Les uzeus polèt evoyî des dmandes di vwès"
 
 #: mod_muc_room.erl:3592
 msgid "Minimum interval between voice requests (in seconds)"
-msgstr ""
+msgstr "Tins minimom etur deus dmandes di vwès (e segondes)"
 
 #: mod_muc_room.erl:3599
-#, fuzzy
 msgid "Make room CAPTCHA protected"
-msgstr "Rinde li såle di berdelaedje protedjeye pa scret"
+msgstr "Rinde li såle di berdelaedje protedjeye pa CAPTCHA"
 
 #: mod_muc_room.erl:3606
 msgid "Enable message archiving"
-msgstr ""
+msgstr "Mete en alaedje l' årtchivaedje des messaedjes"
 
 #: mod_muc_room.erl:3612
 msgid "Exclude Jabber IDs from CAPTCHA challenge"
-msgstr ""
+msgstr "Esclure les IDs Jabber des kesses CAPTCHA"
 
 #: mod_muc_room.erl:3621
 msgid "Enable logging"
@@ -1489,46 +1454,45 @@ msgstr "Mete en alaedje li djournå"
 msgid "You need an x:data capable client to configure room"
 msgstr "I vs fåt on cliyint ki sopoite x:data por vos poleur apontyî l' såle"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "Nombe di prezints"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "privé, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
-msgstr ""
+msgstr "Dimande di vwès"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
-msgstr ""
+msgstr "Aprover oudonbén rifuzer li dmande di vwès."
 
-#: mod_muc_room.erl:4349
-#, fuzzy
+#: mod_muc_room.erl:4351
 msgid "User JID"
-msgstr "Uzeu "
+msgstr "JID d' l' uzeu"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
-msgstr ""
+msgstr "Permete li vwès po cisse djin ci?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
 msgstr "~s vos preye sol såle ~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "li scret est"
 
 #: mod_multicast.erl:291
 msgid "Multicast"
-msgstr ""
+msgstr "Multicast"
 
 #: mod_multicast.erl:306
 msgid "ejabberd Multicast service"
-msgstr ""
+msgstr "siervice multicast d' ejabberd"
 
 #: mod_offline.erl:647
 msgid ""
@@ -1562,9 +1526,8 @@ msgid "Offline Messages:"
 msgstr "Messaedjes ki ratindèt:"
 
 #: mod_offline.erl:996
-#, fuzzy
 msgid "Remove All Offline Messages"
-msgstr "Messaedjes ki ratindèt"
+msgstr "Oister tos les messaedjes ki ratindèt"
 
 #: mod_proxy65_service.erl:248
 msgid "ejabberd SOCKS5 Bytestreams module"
@@ -1649,12 +1612,11 @@ msgstr "Dinez l' modele d' eplaideu"
 
 #: mod_pubsub.erl:3769
 msgid "Purge all items when the relevant publisher goes offline"
-msgstr ""
+msgstr "Purdjî tos les cayets cwand l' eplaideu aloyî va foû raloyaedje"
 
 #: mod_pubsub.erl:3771
-#, fuzzy
 msgid "Specify the event message type"
-msgstr "Sipecifyî l' modele d' accès"
+msgstr "Sipecifyî l' sôre do messaedje d' evenmint"
 
 #: mod_pubsub.erl:3773
 msgid "Max payload size in bytes"
@@ -1670,17 +1632,16 @@ msgstr "Seulmint evoyî des notifiaedje åzès uzeus disponibes"
 
 #: mod_pubsub.erl:3779
 msgid "The collections with which a node is affiliated"
-msgstr ""
+msgstr "Les ramexhnêyes k' on nuk est afiyî avou"
 
 #: mod_register.erl:209
 msgid "The CAPTCHA verification has failed"
-msgstr ""
+msgstr "Li verifiaedje CAPTCHA a fwait berwete"
 
 #: mod_register.erl:253
-#, fuzzy
 msgid "You need a client that supports x:data and CAPTCHA to register"
 msgstr ""
-"Vos avoz mezåjhe d' on cliyint ki sopoite x:data po-z edjîstrer on metou no"
+"Vos avoz mezåjhe d' on cliyint ki sopoite x:data eyet CAPTCHA po vs edjîstrer"
 
 #: mod_register.erl:259 mod_register.erl:320
 msgid "Choose a username and password to register with this server"
@@ -1688,50 +1649,48 @@ msgstr ""
 "Tchoezixhoz on no d' uzeu eyet on scret po vs edjîstrer so ç' sierveu ci"
 
 #: mod_register.erl:373 mod_register.erl:421
-#, fuzzy
 msgid "The password is too weak"
-msgstr "li scret est"
+msgstr "li scret est trop flåw"
 
 #: mod_register.erl:426
-#, fuzzy
 msgid "Users are not allowed to register accounts so quickly"
 msgstr "Les noveas uzeus n' si polèt nén edjîstrer si raddimint"
 
 #: mod_register_web.erl:105
 msgid "Your Jabber account was successfully created."
-msgstr ""
+msgstr "Li conte Jabber da vosse a stî ahivé comifåt."
 
 #: mod_register_web.erl:110
 msgid "There was an error creating the account: "
-msgstr ""
+msgstr "Åk n' a nén stî tot ahivant l' conte: "
 
 #: mod_register_web.erl:119
 msgid "Your Jabber account was successfully deleted."
-msgstr ""
+msgstr "Li conte Jabber da vosse a stî disfacé comifåt."
 
 #: mod_register_web.erl:124
 msgid "There was an error deleting the account: "
-msgstr ""
+msgstr "Åk n' a nén stî tot disfaçant l' conte: "
 
 #: mod_register_web.erl:135
 msgid "The password of your Jabber account was successfully changed."
-msgstr ""
+msgstr "Li scret do conte Jabber da vosse a stî candjî comifåt."
 
 #: mod_register_web.erl:140
 msgid "There was an error changing the password: "
-msgstr ""
+msgstr "Åk n' a nén stî tot candjant l' sicret: "
 
 #: mod_register_web.erl:175 mod_register_web.erl:183
 msgid "Jabber Account Registration"
-msgstr ""
+msgstr "Edjîstraedje di conte Jabber"
 
 #: mod_register_web.erl:186 mod_register_web.erl:204 mod_register_web.erl:212
 msgid "Register a Jabber account"
-msgstr ""
+msgstr "Edjîstrer on conte Jabber"
 
 #: mod_register_web.erl:191 mod_register_web.erl:453 mod_register_web.erl:461
 msgid "Unregister a Jabber account"
-msgstr ""
+msgstr "Disdjîstrer on conte Jabber"
 
 #: mod_register_web.erl:214
 msgid ""
@@ -1739,40 +1698,45 @@ msgid ""
 "(Jabber IDentifier) will be of the form: username@server. Please read "
 "carefully the instructions to fill correctly the fields."
 msgstr ""
+"Cisse pådje permete d' ahiver on conte Jabber so ç' sierveu Jabber ci. "
+"Li JID (IDintifieu Jabber) da vosse serè del cogne: noduzeu@sierveu. Lijhoz "
+"atintivmint les instruccions po bén rimpli les tchamps."
 
 #: mod_register_web.erl:224 mod_register_web.erl:360 mod_register_web.erl:469
-#, fuzzy
 msgid "Username:"
-msgstr "No d' uzeu IRC"
+msgstr "No d' uzeu:"
 
 #: mod_register_web.erl:230
 msgid "This is case insensitive: macbeth is the same that MacBeth and Macbeth."
-msgstr ""
+msgstr "Pont d' diferince etur les grandes et ptitès letes: «macbeth» est l' minme ki «MacBeth» ou co «Macbeth»"
 
 #: mod_register_web.erl:233
 msgid "Characters not allowed:"
-msgstr ""
+msgstr "Caracteres nén permetous:"
 
 #: mod_register_web.erl:236 mod_register_web.erl:364 mod_register_web.erl:473
-#, fuzzy
 msgid "Server:"
-msgstr "Måy"
+msgstr "Sierveu:"
 
 #: mod_register_web.erl:245
 msgid ""
 "Don't tell your password to anybody, not even the administrators of the "
 "Jabber server."
 msgstr ""
+"Ni dnez vosse sicret a nolu, nén ddja ås manaedjeus do sierveu Jabber."
 
 #: mod_register_web.erl:249
 msgid "You can later change your password using a Jabber client."
-msgstr ""
+msgstr "Vos ploz candjî vosse sicret pus tård avou on cliyint Jabber."
 
 #: mod_register_web.erl:252
 msgid ""
 "Some Jabber clients can store your password in the computer, but you should "
 "do this only in your personal computer for safety reasons."
 msgstr ""
+"Des cliyints Jabber k' i gn a polèt wårder vosse sicret sol copiutrece, mins "
+"vos n' duvrîz fé çoula ki sol copiutrece da vosse, po des råjhons di "
+"såvrité."
 
 #: mod_register_web.erl:256
 msgid ""
@@ -1780,34 +1744,33 @@ msgid ""
 "Jabber there isn't an automated way to recover your password if you forget "
 "it."
 msgstr ""
+"Rimimbrez vosse sicret, ou scrijhoz l' so on papî ki vos wådroz en ene "
+"place bén a hoûte, ca avou Jabber i n' a pont moyén di rapexhî vosse "
+"sicret si vos l' rovyîz."
 
 #: mod_register_web.erl:262 mod_register_web.erl:374
-#, fuzzy
 msgid "Password Verification:"
-msgstr "Acertinaedje do scret"
+msgstr "Acertinaedje do scret:"
 
 #: mod_register_web.erl:269
-#, fuzzy
 msgid "Register"
-msgstr "Djivêye des soçons"
+msgstr "Edjîstrer"
 
 #: mod_register_web.erl:366
-#, fuzzy
 msgid "Old Password:"
-msgstr "Sicret:"
+msgstr "Vî scret:"
 
 #: mod_register_web.erl:370
-#, fuzzy
 msgid "New Password:"
-msgstr "Sicret:"
+msgstr "Novea scret:"
 
 #: mod_register_web.erl:463
 msgid "This page allows to unregister a Jabber account in this Jabber server."
-msgstr ""
+msgstr "Cisse pådje permete di disdjîstrer on conte Jabber so ç' sierveu ci."
 
 #: mod_register_web.erl:480
 msgid "Unregister"
-msgstr ""
+msgstr "Disdjîstrer"
 
 #: mod_roster.erl:1436
 msgid "Subscription"
@@ -1977,3 +1940,4 @@ msgstr "Rimplixhoz les tchamps po cweri èn uzeu Jabber"
 
 #~ msgid "Size"
 #~ msgstr "Grandeu"
+

priv/msgs/zh.msg

@@ -1,4 +1,5 @@
 %% -*- coding: latin-1 -*-
+{"Accept","接受"}.
 {"Access Configuration","访问配置"}.
 {"Access Control List Configuration","访问控制列表(ACL)配置"}.
 {"Access control lists","访问控制列表(ACL)"}.
@@ -7,7 +8,7 @@
 {"Access rules","访问规则"}.
 {"Access Rules","访问规则"}.
 {"Action on user","对用户的动作"}.
-{"Add Jabber ID","添加 Jabber ID"}.
+{"Add Jabber ID","添加Jabber ID"}.
 {"Add New","添加新用户"}.
 {"Add User","添加用户"}.
 {"Administration of ","管理"}.
@@ -15,7 +16,7 @@
 {"Administrator privileges required","需要管理员权限"}.
 {"A friendly name for the node","该节点的友好名称"}.
 {"All activity","所有活动"}.
-{"Allow this Jabber ID to subscribe to this pubsub node?","允许该 Jabber ID 订阅该 pubsub 节点?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","允许该Jabber ID订阅该pubsub节点?"}.
 {"Allow users to change the subject","允许用户更改主题"}.
 {"Allow users to query other users","允许用户查询其它用户"}.
 {"Allow users to send invites","允许用户发送邀请"}.
@@ -31,6 +32,7 @@
 {"April","四月"}.
 {"August","八月"}.
 {"Backup Management","备份管理"}.
+{"Backup of ~p","~p的备份"}.
 {"Backup to File at ","备份文件位于"}.
 {"Backup","备份"}.
 {"Bad format","格式错误"}.
@@ -52,12 +54,13 @@
 {"City","城市"}.
 {"Commands","命令"}.
 {"Conference room does not exist","会议室不存在"}.
-{"Configuration of room ~s","房间 ~s 的配置 "}.
+{"Configuration of room ~s","房间~s的配置 "}.
 {"Configuration","配置"}.
 {"Connected Resources:","已连接资源:"}.
 {"Connections parameters","连接参数"}.
 {"Country","国家"}.
-{"CPU Time:","CPU 时间："}.
+{"CPU Time:","CPU时间："}.
+{"Database Tables at ~p","位于~p的数据库表"}.
 {"Database Tables Configuration at ","数据库表格配置位于"}.
 {"Database","数据库"}.
 {"December","十二月"}.
@@ -71,42 +74,46 @@
 {"Description:","描述:"}.
 {"Disc only copy","仅磁盘复制"}.
 {"Displayed Groups:","已显示的组:"}.
-{"Don't tell your password to anybody, not even the administrators of the Jabber server.","不要将密码告诉任何人, 就算是 Jabber 服务器的管理员也不可以."}.
+{"Don't tell your password to anybody, not even the administrators of the Jabber server.","不要将密码告诉任何人, 就算是Jabber服务器的管理员也不可以."}.
 {"Dump Backup to Text File at ","转储备份到文本文件于"}.
 {"Dump to Text File","转储到文本文件"}.
 {"Edit Properties","编辑属性"}.
 {"Either approve or decline the voice request.","接受或拒绝声音请求"}.
 {"ejabberd IRC module","ejabberd IRC 模块"}.
 {"ejabberd MUC module","ejabberd MUC 模块"}.
+{"ejabberd Multicast service","ejabberd多重映射服务"}.
 {"ejabberd Publish-Subscribe module","ejabberd 发行-订阅模块"}.
 {"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 字节流模块"}.
-{"ejabberd vCard module","ejabberd vCard 模块"}.
-{"ejabberd Web Admin","ejabberd 网页管理"}.
+{"ejabberd vCard module","ejabberd vCard模块"}.
+{"ejabberd Web Admin","ejabberd网页管理"}.
 {"Elements","元素"}.
 {"Email","电子邮件"}.
+{"Empty Rooms","空房间"}.
 {"Enable logging","启用服务器端聊天记录"}.
-{"Encoding for server ~b","服务器 ~b 的编码"}.
+{"Enable message archiving","启用消息归档"}.
+{"Encoding for server ~b","服务器~b的编码"}.
 {"End User Session","结束用户会话"}.
 {"Enter list of {Module, [Options]}","请输入{模块, [选项]}列表"}.
 {"Enter nickname you want to register","请输入您想要注册的昵称"}.
 {"Enter path to backup file","请输入备份文件的路径"}.
-{"Enter path to jabberd14 spool dir","请输入 jabberd14 spool 目录的路径"}.
+{"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 服务器的用户名和编码. 按 '下一步' 获取更多待填字段. 按 '完成' 保存设置."}.
 {"Enter username, encodings, ports and passwords you wish to use for connecting to IRC servers","请输入您想使用的用来连接到IRC服务器的用户名, 编码, 端口和密码."}.
-{"Erlang Jabber Server","Erlang Jabber 服务器"}.
+{"Erlang Jabber Server","Erlang Jabber服务器"}.
 {"Error","错误"}.
 {"Example: [{\"irc.lucky.net\", \"koi8-r\", 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}].","例如: [{\"irc.lucky.net\", \"koi8-r\"}, 6667, \"secret\"}, {\"vendetta.fef.net\", \"iso8859-1\", 7000}, {\"irc.sometestserver.net\", \"utf-8\"}]."}.
-{"Exclude Jabber IDs from CAPTCHA challenge","从验证码挑战中排除 Jabber ID"}.
+{"Exclude Jabber IDs from CAPTCHA challenge","从验证码挑战中排除Jabber ID"}.
+{"Export all tables as SQL queries to a file:","将所有表以SQL查询语句导出到文件:"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","将服务器上所有用户的数据导出到 PIEFXIS 文件 (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","将某主机的用户数据导出到 PIEFXIS 文件 (XEP-0227):"}.
 {"Failed to extract JID from your voice request approval","无法从你的声音请求确认信息中提取JID"}.
 {"Family Name","姓氏"}.
 {"February","二月"}.
-{"Fill in fields to search for any matching Jabber User","填充字段以搜索任何匹配的 Jabber 用户"}.
-{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","填充表单以搜索任何匹配的 Jabber 用户(在字段末添加*来匹配子串)"}.
+{"Fill in fields to search for any matching Jabber User","填充字段以搜索任何匹配的Jabber用户"}.
+{"Fill in the form to search for any matching Jabber User (Add * to the end of field to match substring)","填充表单以搜索任何匹配的Jabber用户(在字段末添加*来匹配子串)"}.
 {"Friday","星期五"}.
 {"From ~s","来自~s"}.
 {"From","从"}.
@@ -131,35 +138,37 @@
 {"Import Directory","导入目录"}.
 {"Import File","导入文件"}.
 {"Import user data from jabberd14 spool file:","从 jabberd14 Spool 文件导入用户数据:"}.
-{"Import User from File at ","导入用户的文件位于 "}.
+{"Import User from File at ","导入用户的文件位于"}.
 {"Import users data from a PIEFXIS file (XEP-0227):","从 PIEFXIS 文件 (XEP-0227) 导入用户数据:"}.
-{"Import users data from jabberd14 spool directory:","从 jabberd14 Spool 目录导入用户数据:"}.
-{"Import Users from Dir at ","导入用户的目录位于 "}.
+{"Import users data from jabberd14 spool directory:","从jabberd14 Spool目录导入用户数据:"}.
+{"Import Users from Dir at ","导入用户的目录位于"}.
 {"Import Users From jabberd14 Spool Files","从 jabberd14 Spool 文件导入用户"}.
 {"Improper message type","不恰当的消息类型"}.
+{"Incoming s2s Connections:","入站 s2s 连接:"}.
 {"Incorrect password","密码不正确"}.
 {"Invalid affiliation: ~s","无效加入: ~s"}.
 {"Invalid role: ~s","无效角色: ~s"}.
-{"IP addresses","IP 地址"}.
+{"IP 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 用户名"}.
+{"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\"","\"群组聊天\"类型不允许发送私聊消息"}.
 {"It is not allowed to send private messages to the conference","不允许向会议发送私聊消息"}.
 {"It is not allowed to send private messages","不可以发送私聊消息"}.
-{"Jabber Account Registration","Jabber 帐户注册"}.
+{"Jabber Account Registration","Jabber帐户注册"}.
 {"Jabber ID","Jabber ID"}.
 {"Jabber ID ~s is invalid","Jabber ID ~s 无效"}.
 {"January","一月"}.
-{"Join IRC channel","加入 IRC 频道"}.
+{"Join IRC channel","加入IRC频道"}.
 {"joins the room","加入房间"}.
-{"Join the IRC channel here.","在这里加入 IRC 频道."}.
-{"Join the IRC channel in this Jabber ID: ~s","用此 Jabber ID: ~s  加入 IRC 频道"}.
+{"Join the IRC channel here.","在这里加入IRC频道."}.
+{"Join the IRC channel in this Jabber ID: ~s","用此Jabber ID ~s加入IRC频道"}.
 {"July","七月"}.
 {"June","六月"}.
 {"Last Activity","上次活动"}.
@@ -167,9 +176,10 @@
 {"Last month","上个月"}.
 {"Last year","上一年"}.
 {"leaves the room","离开房间"}.
-{"Listened Ports at ","监听的端口位于 "}.
+{"Listened Ports at ","监听的端口位于"}.
 {"Listened Ports","被监听的端口"}.
 {"List of modules to start","要启动的模块列表"}.
+{"List of rooms","房间列表"}.
 {"Low level update script","低级别更新脚本"}.
 {"Make participants list public","公开参与人列表"}.
 {"Make room CAPTCHA protected","保护房间验证码"}.
@@ -185,29 +195,34 @@
 {"May","五月"}.
 {"Membership is required to enter this room","进入此房间需要会员身份"}.
 {"Members:","会员:"}.
-{"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","记住你的密码, 或将其记到纸上并放于安全位置. 如果你忘记了密码, Jabber 也没有自动恢复密码的方式."}.
+{"Memorize your password, or write it in a paper placed in a safe place. In Jabber there isn't an automated way to recover your password if you forget it.","记住你的密码, 或将其记到纸上并放于安全位置. 如果你忘记了密码, Jabber也没有自动恢复密码的方式."}.
 {"Memory","内存"}.
 {"Message body","消息主体"}.
 {"Middle Name","中间名"}.
 {"Minimum interval between voice requests (in seconds)","声音请求的最小间隔(以秒为单位)"}.
 {"Moderator privileges required","需要主持人权限"}.
 {"moderators only","仅主持人"}.
+{"Moderator","主持人"}.
 {"Modified modules","被修改模块"}.
+{"Modules at ~p","位于~p的模块"}.
 {"Modules","模块"}.
 {"Module","模块"}.
 {"Monday","星期一"}.
+{"Multicast","多重映射"}.
+{"Multi-User Chat","多用户聊天"}.
 {"Name:","姓名:"}.
 {"Name","姓名"}.
 {"Never","从未"}.
-{"New Password:","新密码: "}.
-{"Nickname Registration at ","昵称注册于 "}.
-{"Nickname ~s does not exist in the room","昵称 ~s 不在该房间"}.
+{"New Password:","新密码:"}.
+{"Nickname Registration at ","昵称注册于"}.
+{"Nickname ~s does not exist in the room","昵称~s不在该房间"}.
 {"Nickname","昵称"}.
 {"No body provided for announce message","通知消息无正文内容"}.
 {"nobody","没有人"}.
 {"No Data","没有数据"}.
-{"Node ID","节点 ID"}.
+{"Node ID","节点ID"}.
 {"Node not found","没有找到节点"}.
+{"Node ~p","节点~p"}.
 {"Nodes","节点"}.
 {"No limit","不限"}.
 {"None","无"}.
@@ -229,6 +244,7 @@
 {"Online Users","在线用户"}.
 {"Online","在线"}.
 {"Only deliver notifications to available users","仅将通知发送给可发送的用户"}.
+{"Only members may query archives of this room","只有会员可以查询本房间的存档"}.
 {"Only moderators and participants are allowed to change the subject in this room","只有主持人和参与人可以在此房间里更改主题"}.
 {"Only moderators are allowed to change the subject in this room","只有主持人可以在此房间里更改主题"}.
 {"Only moderators can approve voice requests","仅主持人能确认声音请求"}.
@@ -242,7 +258,8 @@
 {"Outgoing s2s Connections","出站 s2s 连接"}.
 {"Owner privileges required","需要持有人权限"}.
 {"Packet","数据包"}.
-{"Password ~b","~b 的密码"}.
+{"Participant","参与人"}.
+{"Password ~b","~b的密码"}.
 {"Password Verification:","密码确认:"}.
 {"Password Verification","确认密码"}.
 {"Password:","密码:"}.
@@ -251,18 +268,21 @@
 {"Path to File","文件路径"}.
 {"Pending","挂起"}.
 {"Period: ","持续时间: "}.
+{"Permanent rooms","永久房间"}.
 {"Persist items to storage","持久化内容条目"}.
 {"Ping","Ping"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","注意：这些选项仅将备份内置的 Mnesia 数据库. 如果您正在使用 ODBC 模块, 您还需要分别备份您的数据库."}.
+{"Please specify file name.","请指定文件名称."}.
+{"Please specify file size.","请指定文件大小."}.
 {"Please, wait for a while before sending new voice request","请稍后再发送新的声音请求"}.
 {"Pong","Pong"}.
-{"Port ~b","~b 的端口"}.
+{"Port ~b","~b的端口"}.
 {"Port","端口"}.
-{"Present real Jabber IDs to","将真实 Jabber ID 显示给"}.
+{"Present real Jabber IDs to","将真实Jabber ID显示给"}.
 {"private, ","保密, "}.
 {"Protocol","协议"}.
 {"Publish-Subscribe","发行-订阅"}.
-{"PubSub subscriber request","PubSub 订阅人请求"}.
+{"PubSub subscriber request","PubSub订阅人请求"}.
 {"Purge all items when the relevant publisher goes offline","相关发布人离线后清除所有选项"}.
 {"Queries to the conference members are not allowed in this room","本房间不可以查询会议成员信息"}.
 {"RAM and disc copy","内存与磁盘复制"}.
@@ -270,7 +290,8 @@
 {"Raw","原始格式"}.
 {"Really delete message of the day?","确实要删除每日消息吗?"}.
 {"Recipient is not in the conference room","接收人不在会议室"}.
-{"Register a Jabber account","注册 Jabber 帐户"}.
+{"Register a Jabber account","注册Jabber帐户"}.
+{"Registered nicknames","注册的昵称"}.
 {"Registered Users:","注册用户:"}.
 {"Registered Users","注册用户"}.
 {"Register","注册"}.
@@ -288,45 +309,47 @@
 {"Restore binary backup immediately:","立即恢复二进制备份:"}.
 {"Restore plain text backup immediately:","立即恢复普通文本备份:"}.
 {"Restore","恢复"}.
+{"Roles for which Presence is Broadcasted","广播存在性的角色"}.
 {"Room Configuration","房间配置"}.
 {"Room creation is denied by service policy","创建房间被服务策略拒绝"}.
 {"Room description","房间描述"}.
 {"Room Occupants","房间人数"}.
 {"Room title","房间标题"}.
 {"Roster groups allowed to subscribe","允许订阅的花名册组"}.
-{"Roster of ","花名册属于 "}.
+{"Roster of ","花名册属于"}.
 {"Roster size","花名册大小"}.
 {"Roster","花名册"}.
 {"RPC Call Error","RPC 调用错误"}.
 {"Running Nodes","运行中的节点"}.
-{"~s access rule configuration","~s 访问规则配置"}.
+{"~s access rule configuration","~s访问规则配置"}.
 {"Saturday","星期六"}.
 {"Script check","脚本检查"}.
 {"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 ~b","服务器~b"}.
 {"Server:","服务器:"}.
+{"Server","服务器"}.
 {"Set message of the day and send to online users","设定每日消息并发送给所有在线用户"}.
 {"Set message of the day on all hosts and send to online users","设置所有主机上的每日消息并发送给在线用户"}.
 {"Shared Roster Groups","共享的花名册组群"}.
 {"Show Integral Table","显示完整列表"}.
 {"Show Ordinary Table","显示普通列表"}.
 {"Shut Down Service","关闭服务"}.
-{"~s invites you to the room ~s","~s 邀请你到 ~s 房间"}.
+{"~s invites you to the room ~s","~s邀请你到房间~s"}.
 {"Some Jabber clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","某些 Jabber 客户端可以在你的计算机里存储密码. 请仅在你确认你的计算机安全的情况下使用该功能."}.
 {"Specify the access model","指定访问范例"}.
 {"Specify the event message type","指定事件消息类型"}.
 {"Specify the publisher model","指定发布人范例"}.
-{"~s's Offline Messages Queue","~s 的离线消息队列"}.
+{"~s's Offline Messages Queue","~s的离线消息队列"}.
 {"Start Modules at ","要启动的模块位于 "}.
 {"Start Modules","启动模块"}.
 {"Start","开始"}.
-{"Statistics of ~p","~p 的统计"}.
+{"Statistics of ~p","~p的统计"}.
 {"Statistics","统计"}.
 {"Stop Modules at ","要停止的模块位于 "}.
 {"Stop Modules","停止模块"}.
@@ -348,18 +371,22 @@
 {"The collections with which a node is affiliated","加入结点的集合"}.
 {"The password is too weak","密码强度太弱"}.
 {"the password is","密码是"}.
-{"The password of your Jabber account was successfully changed.","你的 Jabber 帐户密码已成功更新."}.
+{"The password of your Jabber account was successfully changed.","你的Jabber帐户密码已成功更新."}.
 {"There was an error changing the password: ","修改密码出错: "}.
 {"There was an error creating the account: ","帐户创建出错: "}.
 {"There was an error deleting the account: ","帐户删除失败: "}.
+{"This IP address is blacklisted in ~s","此IP地址在~s中已被列入黑名单"}.
 {"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","此处不区分大小写: macbeth 与 MacBeth 和 Macbeth 是一样的."}.
-{"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","本页面允许在此服务器上创建 Jabber 帐户. 你的 JID (Jabber ID) 的形式如下: 用户名@服务器. 请仔细阅读说明并正确填写相应字段."}.
-{"This page allows to unregister a Jabber account in this Jabber server.","此页面允许在此 Jabber 服务器上注销 Jabber 帐户"}.
+{"This page allows to create a Jabber account in this Jabber server. Your JID (Jabber IDentifier) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","本页面允许在此服务器上创建Jabber帐户. 你的JID (Jabber ID) 的形式如下: 用户名@服务器. 请仔细阅读说明并正确填写相应字段."}.
+{"This page allows to unregister a Jabber account in this Jabber server.","此页面允许在此Jabber服务器上注销Jabber帐户"}.
 {"Thursday","星期四"}.
 {"Time delay","时间延迟"}.
 {"Time","时间"}.
 {"Too many CAPTCHA requests","验证码请求太多"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","来自IP地址(~p)的(~s)失败认证太多. 该地址将在UTC时间~s被禁用."}.
+{"Too many unacked stanzas","未被确认的节太多"}.
 {"To ~s","发送给~s"}.
+{"Total rooms","所有房间"}.
 {"To","到"}.
 {"Traffic rate limit is exceeded","已经超过传输率限制"}.
 {"Transactions Aborted:","取消的事务:"}.
@@ -369,42 +396,45 @@
 {"Tuesday","星期二"}.
 {"Unable to generate a CAPTCHA","无法生成验证码"}.
 {"Unauthorized","未认证的"}.
-{"Unregister a Jabber account","注销 Jabber 帐户"}.
+{"Unregister a Jabber account","注销Jabber帐户"}.
 {"Unregister","取消注册"}.
 {"Update message of the day (don't send)","更新每日消息(不发送)"}.
 {"Update message of the day on all hosts (don't send)","更新所有主机上的每日消息(不发送)"}.
 {"Update plan","更新计划"}.
+{"Update ~p","更新~p"}.
 {"Update script","更新脚本"}.
 {"Update","更新"}.
 {"Uptime:","正常运行时间:"}.
 {"Use of STARTTLS required","要求使用 STARTTLS"}.
-{"User JID","用户 JID"}.
+{"User JID","用户JID"}.
 {"User Management","用户管理"}.
 {"Username:","用户名:"}.
 {"Users are not allowed to register accounts so quickly","不允许用户太频繁地注册帐户"}.
 {"Users Last Activity","用户上次活动"}.
 {"Users","用户"}.
+{"User ~s","用户~s"}.
 {"User","用户"}.
 {"Validate","确认"}.
-{"vCard User Search","vCard 用户搜索"}.
+{"vCard User Search","vCard用户搜索"}.
 {"Virtual Hosts","虚拟主机"}.
 {"Visitors are not allowed to change their nicknames in this room","此房间不允许用户更改昵称"}.
 {"Visitors are not allowed to send messages to all occupants","不允许访客给所有占有者发送消息"}.
+{"Visitor","访客"}.
 {"Voice requests are disabled in this conference","该会议的声音请求以被禁用"}.
 {"Voice request","声音请求"}.
 {"Wednesday","星期三"}.
 {"When to send the last published item","何时发送最新发布的内容条目"}.
 {"Whether to allow subscriptions","是否允许订阅"}.
-{"You can later change your password using a Jabber client.","你可以稍后用 Jabber 客户端修改你的密码."}.
+{"You can later change your password using a Jabber client.","你可以稍后用Jabber客户端修改你的密码."}.
 {"You have been banned from this room","您已被禁止进入该房间"}.
 {"You must fill in field \"Nickname\" in the form","您必须填充表单中\"昵称\"项"}.
 {"You need a client that supports x:data and CAPTCHA to register","您需要一个支持 x:data 和验证码的客户端进行注册"}.
 {"You need a client that supports x:data to register the nickname","您需要一个支持 x:data 的客户端来注册昵称"}.
-{"You need an x:data capable client to configure mod_irc settings","您需要一个兼容 x:data 的客户端来配置 mod_irc 设置"}.
+{"You need an x:data capable client to configure mod_irc settings","您需要一个兼容 x:data 的客户端来配置mod_irc设置"}.
 {"You need an x:data capable client to configure room","您需要一个兼容 x:data 的客户端来配置房间"}.
 {"You need an x:data capable client to search","您需要一个兼容 x:data 的客户端来搜索"}.
 {"Your active privacy list has denied the routing of this stanza.","你的活跃私聊列表拒绝了在此房间进行路由分发."}.
 {"Your contact offline message queue is full. The message has been discarded.","您的联系人离线消息队列已满. 消息已被丢弃"}.
-{"Your Jabber account was successfully created.","你的 Jabber 帐户已成功创建."}.
+{"Your Jabber account was successfully created.","你的Jabber帐户已成功创建."}.
 {"Your Jabber account was successfully deleted.","你的 Jabber 帐户已成功删除."}.
-{"Your messages to ~s are being blocked. To unblock them, visit ~s","您发送给 ~s 的消息已被阻止. 要解除阻止, 请访问 ~s"}.
+{"Your messages to ~s are being blocked. To unblock them, visit ~s","您发送给~s的消息已被阻止. 要解除阻止, 请访问 ~s"}.

priv/msgs/zh.po

@@ -26,13 +26,13 @@ msgstr "被新的连接替换"
 msgid "has been kicked"
 msgstr "已被踢出"
 
-#: ejabberd_c2s.erl:2112
+#: ejabberd_c2s.erl:2114
 msgid "Your active privacy list has denied the routing of this stanza."
 msgstr "你的活跃私聊列表拒绝了在此房间进行路由分发."
 
-#: ejabberd_c2s.erl:2427
+#: ejabberd_c2s.erl:2429
 msgid "Too many unacked stanzas"
-msgstr ""
+msgstr "未被确认的节太多"
 
 #: ejabberd_captcha.erl:122 ejabberd_captcha.erl:245 ejabberd_captcha.erl:284
 msgid "Enter the text you see"
@@ -40,7 +40,7 @@ msgstr "请输入您所看到的文本"
 
 #: ejabberd_captcha.erl:147
 msgid "Your messages to ~s are being blocked. To unblock them, visit ~s"
-msgstr "您发送给 ~s 的消息已被阻止. 要解除阻止, 请访问 ~s"
+msgstr "您发送给~s的消息已被阻止. 要解除阻止, 请访问 ~s"
 
 #: ejabberd_captcha.erl:192
 msgid "If you don't see the CAPTCHA image here, visit the web page."
@@ -60,9 +60,8 @@ msgid "User"
 msgstr "用户"
 
 #: ejabberd_oauth.erl:256
-#, fuzzy
 msgid "Server"
-msgstr "服务器:"
+msgstr "服务器"
 
 #: ejabberd_oauth.erl:259 ejabberd_web_admin.erl:1408 mod_configure.erl:1398
 #: mod_configure.erl:1485 mod_configure.erl:1889 mod_configure.erl:2123
@@ -72,7 +71,7 @@ msgstr "密码"
 
 #: ejabberd_oauth.erl:267
 msgid "Accept"
-msgstr ""
+msgstr "接受"
 
 #: ejabberd_web_admin.erl:202 ejabberd_web_admin.erl:214
 #: ejabberd_web_admin.erl:234 ejabberd_web_admin.erl:246
@@ -81,7 +80,7 @@ msgstr "未认证的"
 
 #: ejabberd_web_admin.erl:303 ejabberd_web_admin.erl:335
 msgid "ejabberd Web Admin"
-msgstr "ejabberd 网页管理"
+msgstr "ejabberd网页管理"
 
 #: ejabberd_web_admin.erl:669 ejabberd_web_admin.erl:680
 msgid "Administration"
@@ -134,7 +133,7 @@ msgstr "访问规则"
 
 #: ejabberd_web_admin.erl:913
 msgid "~s access rule configuration"
-msgstr "~s 访问规则配置"
+msgstr "~s访问规则配置"
 
 #: ejabberd_web_admin.erl:931
 msgid "Virtual Hosts"
@@ -239,9 +238,8 @@ msgid "Outgoing s2s Connections:"
 msgstr "出站 s2s 连接:"
 
 #: ejabberd_web_admin.erl:1559
-#, fuzzy
 msgid "Incoming s2s Connections:"
-msgstr "出站 s2s 连接:"
+msgstr "入站 s2s 连接:"
 
 #: ejabberd_web_admin.erl:1595 ejabberd_web_admin.erl:1794
 #: ejabberd_web_admin.erl:1804 ejabberd_web_admin.erl:2214 mod_roster.erl:1429
@@ -254,9 +252,8 @@ msgid "Change Password"
 msgstr "更改密码"
 
 #: ejabberd_web_admin.erl:1673
-#, fuzzy
 msgid "User ~s"
-msgstr "用户 "
+msgstr "用户~s"
 
 #: ejabberd_web_admin.erl:1684
 msgid "Connected Resources:"
@@ -288,9 +285,8 @@ msgid "Stopped Nodes"
 msgstr "已经停止的节点"
 
 #: ejabberd_web_admin.erl:1833 ejabberd_web_admin.erl:1858
-#, fuzzy
 msgid "Node ~p"
-msgstr "节点 "
+msgstr "节点~p"
 
 #: ejabberd_web_admin.erl:1842 mod_configure.erl:150 mod_configure.erl:611
 msgid "Database"
@@ -327,9 +323,8 @@ msgid "RPC Call Error"
 msgstr "RPC 调用错误"
 
 #: ejabberd_web_admin.erl:1917
-#, fuzzy
 msgid "Database Tables at ~p"
-msgstr "数据库列表位于 "
+msgstr "位于~p的数据库表"
 
 #: ejabberd_web_admin.erl:1927 mod_vcard.erl:490 mod_vcard.erl:616
 msgid "Name"
@@ -352,9 +347,8 @@ msgid "Error"
 msgstr "错误"
 
 #: ejabberd_web_admin.erl:1955
-#, fuzzy
 msgid "Backup of ~p"
-msgstr "备份来源 "
+msgstr "~p的备份"
 
 #: ejabberd_web_admin.erl:1959
 msgid ""
@@ -409,7 +403,7 @@ msgstr "将某主机的用户数据导出到 PIEFXIS 文件 (XEP-0227):"
 
 #: ejabberd_web_admin.erl:2060
 msgid "Export all tables as SQL queries to a file:"
-msgstr ""
+msgstr "将所有表以SQL查询语句导出到文件:"
 
 #: ejabberd_web_admin.erl:2076
 msgid "Import user data from jabberd14 spool file:"
@@ -417,20 +411,19 @@ msgstr "从 jabberd14 Spool 文件导入用户数据:"
 
 #: ejabberd_web_admin.erl:2087
 msgid "Import users data from jabberd14 spool directory:"
-msgstr "从 jabberd14 Spool 目录导入用户数据:"
+msgstr "从jabberd14 Spool目录导入用户数据:"
 
 #: ejabberd_web_admin.erl:2115
 msgid "Listened Ports at "
-msgstr "监听的端口位于 "
+msgstr "监听的端口位于"
 
 #: ejabberd_web_admin.erl:2144
-#, fuzzy
 msgid "Modules at ~p"
-msgstr "模块位于 "
+msgstr "位于~p的模块"
 
 #: ejabberd_web_admin.erl:2175
 msgid "Statistics of ~p"
-msgstr "~p 的统计"
+msgstr "~p的统计"
 
 #: ejabberd_web_admin.erl:2179
 msgid "Uptime:"
@@ -438,7 +431,7 @@ msgstr "正常运行时间:"
 
 #: ejabberd_web_admin.erl:2183
 msgid "CPU Time:"
-msgstr "CPU 时间："
+msgstr "CPU时间："
 
 #: ejabberd_web_admin.erl:2191
 msgid "Transactions Committed:"
@@ -457,9 +450,8 @@ msgid "Transactions Logged:"
 msgstr "记入日志的事务:"
 
 #: ejabberd_web_admin.erl:2243
-#, fuzzy
 msgid "Update ~p"
-msgstr "更新 "
+msgstr "更新~p"
 
 #: ejabberd_web_admin.erl:2254
 msgid "Update plan"
@@ -746,7 +738,7 @@ msgstr "请输入文本文件的路径"
 
 #: mod_configure.erl:1156
 msgid "Import User from File at "
-msgstr "导入用户的文件位于 "
+msgstr "导入用户的文件位于"
 
 #: mod_configure.erl:1162
 msgid "Enter path to jabberd14 spool file"
@@ -754,11 +746,11 @@ msgstr "请输入 jabberd14 spool 文件的路径"
 
 #: mod_configure.erl:1177
 msgid "Import Users from Dir at "
-msgstr "导入用户的目录位于 "
+msgstr "导入用户的目录位于"
 
 #: mod_configure.erl:1183
 msgid "Enter path to jabberd14 spool dir"
-msgstr "请输入 jabberd14 spool 目录的路径"
+msgstr "请输入jabberd14 spool目录的路径"
 
 #: mod_configure.erl:1184
 msgid "Path to Dir"
@@ -814,7 +806,7 @@ msgstr "花名册大小"
 
 #: mod_configure.erl:1965
 msgid "IP addresses"
-msgstr "IP 地址"
+msgstr "IP地址"
 
 #: mod_configure.erl:1967
 msgid "Resources"
@@ -836,19 +828,19 @@ msgstr "编辑属性"
 msgid ""
 "Too many (~p) failed authentications from this IP address (~s). The address "
 "will be unblocked at ~s UTC"
-msgstr ""
+msgstr "来自IP地址(~p)的(~s)失败认证太多. 该地址将在UTC时间~s被禁用."
 
-#: mod_http_upload.erl:593
+#: mod_http_upload.erl:586
 msgid "Please specify file size."
-msgstr ""
+msgstr "请指定文件大小."
 
-#: mod_http_upload.erl:597
+#: mod_http_upload.erl:590
 msgid "Please specify file name."
-msgstr ""
+msgstr "请指定文件名称."
 
 #: mod_ip_blacklist.erl:121
 msgid "This IP address is blacklisted in ~s"
-msgstr ""
+msgstr "此IP地址在~s中已被列入黑名单"
 
 #: mod_irc.erl:220 mod_muc.erl:467
 msgid "Access denied by service policy"
@@ -856,7 +848,7 @@ msgstr "访问被服务策略拒绝"
 
 #: mod_irc.erl:439
 msgid "IRC Transport"
-msgstr "IRC 传输"
+msgstr "IRC传输"
 
 #: mod_irc.erl:476
 msgid "ejabberd IRC module"
@@ -864,7 +856,7 @@ msgstr "ejabberd IRC 模块"
 
 #: mod_irc.erl:644
 msgid "You need an x:data capable client to configure mod_irc settings"
-msgstr "您需要一个兼容 x:data 的客户端来配置 mod_irc 设置"
+msgstr "您需要一个兼容 x:data 的客户端来配置mod_irc设置"
 
 #: mod_irc.erl:653
 msgid "Registration in mod_irc for "
@@ -878,7 +870,7 @@ msgstr "请输入您想使用的用来连接到IRC服务器的用户名, 编码,
 
 #: mod_irc.erl:667
 msgid "IRC Username"
-msgstr "IRC 用户名"
+msgstr "IRC用户名"
 
 #: mod_irc.erl:682
 msgid ""
@@ -905,27 +897,27 @@ msgstr "连接参数"
 
 #: mod_irc.erl:886
 msgid "Join IRC channel"
-msgstr "加入 IRC 频道"
+msgstr "加入IRC频道"
 
 #: mod_irc.erl:893
 msgid "IRC channel (don't put the first #)"
-msgstr "IRC 频道 (不要输入第一个#号)"
+msgstr "IRC频道 (不要输入第一个#号)"
 
 #: mod_irc.erl:903
 msgid "IRC server"
-msgstr "IRC 服务器"
+msgstr "IRC服务器"
 
 #: mod_irc.erl:950 mod_irc.erl:958
 msgid "Join the IRC channel here."
-msgstr "在这里加入 IRC 频道."
+msgstr "在这里加入IRC频道."
 
 #: mod_irc.erl:967
 msgid "Join the IRC channel in this Jabber ID: ~s"
-msgstr "用此 Jabber ID: ~s  加入 IRC 频道"
+msgstr "用此Jabber ID ~s加入IRC频道"
 
 #: mod_irc.erl:1046
 msgid "IRC settings"
-msgstr "IRC 设置"
+msgstr "IRC设置"
 
 #: mod_irc.erl:1051
 msgid ""
@@ -938,28 +930,27 @@ msgstr ""
 
 #: mod_irc.erl:1060
 msgid "IRC username"
-msgstr "IRC 用户名"
+msgstr "IRC用户名"
 
 #: mod_irc.erl:1126
 msgid "Password ~b"
-msgstr "~b 的密码"
+msgstr "~b的密码"
 
 #: mod_irc.erl:1137
 msgid "Port ~b"
-msgstr "~b 的端口"
+msgstr "~b的端口"
 
 #: mod_irc.erl:1150
 msgid "Encoding for server ~b"
-msgstr "服务器 ~b 的编码"
+msgstr "服务器~b的编码"
 
 #: mod_irc.erl:1171
 msgid "Server ~b"
-msgstr "服务器 ~b"
+msgstr "服务器~b"
 
-#: mod_mam.erl:270
-#, fuzzy
-msgid "Only members are allowed to query archives of this room"
-msgstr "只有主持人可以在此房间里更改主题"
+#: mod_mam.erl:541
+msgid "Only members may query archives of this room"
+msgstr "只有会员可以查询本房间的存档"
 
 #: mod_muc.erl:585
 msgid "Only service administrators are allowed to send service messages"
@@ -977,62 +968,59 @@ msgstr "会议室不存在"
 msgid "Chatrooms"
 msgstr "聊天室"
 
-#: mod_muc.erl:779
+#: mod_muc.erl:781
 msgid "Empty Rooms"
-msgstr ""
+msgstr "空房间"
 
-#: mod_muc.erl:931
+#: mod_muc.erl:933
 msgid "You need a client that supports x:data to register the nickname"
 msgstr "您需要一个支持 x:data 的客户端来注册昵称"
 
-#: mod_muc.erl:941
+#: mod_muc.erl:943
 msgid "Nickname Registration at "
-msgstr "昵称注册于 "
+msgstr "昵称注册于"
 
-#: mod_muc.erl:947
+#: mod_muc.erl:949
 msgid "Enter nickname you want to register"
 msgstr "请输入您想要注册的昵称"
 
-#: mod_muc.erl:948 mod_muc_room.erl:4351 mod_roster.erl:1435 mod_vcard.erl:490
+#: mod_muc.erl:950 mod_muc_room.erl:4353 mod_roster.erl:1435 mod_vcard.erl:490
 #: mod_vcard.erl:621
 msgid "Nickname"
 msgstr "昵称"
 
-#: mod_muc.erl:1060 mod_muc_room.erl:1104 mod_muc_room.erl:1843
+#: mod_muc.erl:1062 mod_muc_room.erl:1104 mod_muc_room.erl:1843
 msgid "That nickname is registered by another person"
 msgstr "该昵称已被另一个人注册了"
 
-#: mod_muc.erl:1088
+#: mod_muc.erl:1090
 msgid "You must fill in field \"Nickname\" in the form"
 msgstr "您必须填充表单中\"昵称\"项"
 
-#: mod_muc.erl:1111
+#: mod_muc.erl:1113
 msgid "ejabberd MUC module"
 msgstr "ejabberd MUC 模块"
 
 #: mod_muc_admin.erl:231 mod_muc_admin.erl:234 mod_muc_admin.erl:246
 #: mod_muc_admin.erl:320
 msgid "Multi-User Chat"
-msgstr ""
+msgstr "多用户聊天"
 
 #: mod_muc_admin.erl:249
-#, fuzzy
 msgid "Total rooms"
-msgstr "聊天室"
+msgstr "所有房间"
 
 #: mod_muc_admin.erl:250
-#, fuzzy
 msgid "Permanent rooms"
-msgstr "离开房间"
+msgstr "永久房间"
 
 #: mod_muc_admin.erl:251
-#, fuzzy
 msgid "Registered nicknames"
-msgstr "注册用户"
+msgstr "注册的昵称"
 
 #: mod_muc_admin.erl:254
 msgid "List of rooms"
-msgstr ""
+msgstr "房间列表"
 
 #: mod_muc_log.erl:398 mod_muc_log.erl:407
 msgid "Chatroom configuration modified"
@@ -1176,9 +1164,9 @@ msgstr "已经超过传输率限制"
 
 #: mod_muc_room.erl:230 mod_muc_room.erl:518 mod_muc_room.erl:1059
 msgid ""
-"It is not allowed to send error messages to the room. This participant (~s) "
-"sent an error message (~s) and gets kicked from the room"
-msgstr ""
+"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"
+msgstr "不允许将错误消息发送到该房间. 参与者(~s)已发送过一条消息(~s)并已被踢出房间"
 
 #: mod_muc_room.erl:241
 msgid "It is not allowed to send private messages to the conference"
@@ -1216,7 +1204,7 @@ msgstr "接收人不在会议室"
 msgid "It is not allowed to send private messages"
 msgstr "不可以发送私聊消息"
 
-#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4592
+#: mod_muc_room.erl:588 mod_muc_room.erl:983 mod_muc_room.erl:4594
 msgid "Only occupants are allowed to send messages to the conference"
 msgstr "只有与会人可以向大会发送消息"
 
@@ -1288,7 +1276,7 @@ msgstr "Jabber ID ~s 无效"
 
 #: mod_muc_room.erl:2772
 msgid "Nickname ~s does not exist in the room"
-msgstr "昵称 ~s 不在该房间"
+msgstr "昵称~s不在该房间"
 
 #: mod_muc_room.erl:2795 mod_muc_room.erl:3175
 msgid "Invalid affiliation: ~s"
@@ -1298,19 +1286,19 @@ msgstr "无效加入: ~s"
 msgid "Invalid role: ~s"
 msgstr "无效角色: ~s"
 
-#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4234
+#: mod_muc_room.erl:3155 mod_muc_room.erl:3187 mod_muc_room.erl:4236
 msgid "Owner privileges required"
 msgstr "需要持有人权限"
 
 #: mod_muc_room.erl:3348
 msgid "Configuration of room ~s"
-msgstr "房间 ~s 的配置 "
+msgstr "房间~s的配置 "
 
 #: mod_muc_room.erl:3359
 msgid "Room title"
 msgstr "房间标题"
 
-#: mod_muc_room.erl:3361 mod_muc_room.erl:4188
+#: mod_muc_room.erl:3361 mod_muc_room.erl:4190
 msgid "Room description"
 msgstr "房间描述"
 
@@ -1340,7 +1328,7 @@ msgstr "不限"
 
 #: mod_muc_room.erl:3436
 msgid "Present real Jabber IDs to"
-msgstr "将真实 Jabber ID 显示给"
+msgstr "将真实Jabber ID显示给"
 
 #: mod_muc_room.erl:3450 mod_muc_room.erl:3560
 msgid "moderators only"
@@ -1352,20 +1340,19 @@ msgstr "任何人"
 
 #: mod_muc_room.erl:3471
 msgid "Roles for which Presence is Broadcasted"
-msgstr ""
+msgstr "广播存在性的角色"
 
 #: mod_muc_room.erl:3486
-#, fuzzy
 msgid "Moderator"
-msgstr "仅主持人"
+msgstr "主持人"
 
 #: mod_muc_room.erl:3496
 msgid "Participant"
-msgstr ""
+msgstr "参与人"
 
 #: mod_muc_room.erl:3506
 msgid "Visitor"
-msgstr ""
+msgstr "访客"
 
 #: mod_muc_room.erl:3513
 msgid "Make room members-only"
@@ -1425,11 +1412,11 @@ msgstr "保护房间验证码"
 
 #: mod_muc_room.erl:3606
 msgid "Enable message archiving"
-msgstr ""
+msgstr "启用消息归档"
 
 #: mod_muc_room.erl:3612
 msgid "Exclude Jabber IDs from CAPTCHA challenge"
-msgstr "从验证码挑战中排除 Jabber ID"
+msgstr "从验证码挑战中排除Jabber ID"
 
 #: mod_muc_room.erl:3621
 msgid "Enable logging"
@@ -1439,45 +1426,45 @@ msgstr "启用服务器端聊天记录"
 msgid "You need an x:data capable client to configure room"
 msgstr "您需要一个兼容 x:data 的客户端来配置房间"
 
-#: mod_muc_room.erl:4190
+#: mod_muc_room.erl:4192
 msgid "Number of occupants"
 msgstr "驻留人数"
 
-#: mod_muc_room.erl:4260
+#: mod_muc_room.erl:4262
 msgid "private, "
 msgstr "保密, "
 
-#: mod_muc_room.erl:4324
+#: mod_muc_room.erl:4326
 msgid "Voice request"
 msgstr "声音请求"
 
-#: mod_muc_room.erl:4329
+#: mod_muc_room.erl:4331
 msgid "Either approve or decline the voice request."
 msgstr "接受或拒绝声音请求"
 
-#: mod_muc_room.erl:4349
+#: mod_muc_room.erl:4351
 msgid "User JID"
-msgstr "用户 JID"
+msgstr "用户JID"
 
-#: mod_muc_room.erl:4353
+#: mod_muc_room.erl:4355
 msgid "Grant voice to this person?"
 msgstr "为此人授权声音?"
 
-#: mod_muc_room.erl:4496
+#: mod_muc_room.erl:4498
 msgid "~s invites you to the room ~s"
-msgstr "~s 邀请你到 ~s 房间"
+msgstr "~s邀请你到房间~s"
 
-#: mod_muc_room.erl:4507
+#: mod_muc_room.erl:4509
 msgid "the password is"
 msgstr "密码是"
 
 #: mod_multicast.erl:291
 msgid "Multicast"
-msgstr ""
+msgstr "多重映射"
 
 #: mod_multicast.erl:306
 msgid "ejabberd Multicast service"
-msgstr ""
+msgstr "ejabberd多重映射服务"
 
 #: mod_offline.erl:647
 msgid ""
@@ -1486,7 +1473,7 @@ msgstr "您的联系人离线消息队列已满. 消息已被丢弃"
 
 #: mod_offline.erl:798
 msgid "~s's Offline Messages Queue"
-msgstr "~s 的离线消息队列"
+msgstr "~s的离线消息队列"
 
 #: mod_offline.erl:811
 msgid "Time"
@@ -1526,7 +1513,7 @@ msgstr "ejabberd 发行-订阅模块"
 
 #: mod_pubsub.erl:1537
 msgid "PubSub subscriber request"
-msgstr "PubSub 订阅人请求"
+msgstr "PubSub订阅人请求"
 
 #: mod_pubsub.erl:1543
 msgid "Choose whether to approve this entity's subscription."
@@ -1534,7 +1521,7 @@ msgstr "选择是否允许该实体的订阅"
 
 #: mod_pubsub.erl:1559
 msgid "Node ID"
-msgstr "节点 ID"
+msgstr "节点ID"
 
 #: mod_pubsub.erl:1571
 msgid "Subscriber Address"
@@ -1542,7 +1529,7 @@ msgstr "订阅人地址"
 
 #: mod_pubsub.erl:1584
 msgid "Allow this Jabber ID to subscribe to this pubsub node?"
-msgstr "允许该 Jabber ID 订阅该 pubsub 节点?"
+msgstr "允许该Jabber ID订阅该pubsub节点?"
 
 #: mod_pubsub.erl:3745
 msgid "Deliver payloads with event notifications"
@@ -1639,7 +1626,7 @@ msgstr "不允许用户太频繁地注册帐户"
 
 #: mod_register_web.erl:105
 msgid "Your Jabber account was successfully created."
-msgstr "你的 Jabber 帐户已成功创建."
+msgstr "你的Jabber帐户已成功创建."
 
 #: mod_register_web.erl:110
 msgid "There was an error creating the account: "
@@ -1655,7 +1642,7 @@ msgstr "帐户删除失败: "
 
 #: mod_register_web.erl:135
 msgid "The password of your Jabber account was successfully changed."
-msgstr "你的 Jabber 帐户密码已成功更新."
+msgstr "你的Jabber帐户密码已成功更新."
 
 #: mod_register_web.erl:140
 msgid "There was an error changing the password: "
@@ -1663,15 +1650,15 @@ msgstr "修改密码出错: "
 
 #: mod_register_web.erl:175 mod_register_web.erl:183
 msgid "Jabber Account Registration"
-msgstr "Jabber 帐户注册"
+msgstr "Jabber帐户注册"
 
 #: mod_register_web.erl:186 mod_register_web.erl:204 mod_register_web.erl:212
 msgid "Register a Jabber account"
-msgstr "注册 Jabber 帐户"
+msgstr "注册Jabber帐户"
 
 #: mod_register_web.erl:191 mod_register_web.erl:453 mod_register_web.erl:461
 msgid "Unregister a Jabber account"
-msgstr "注销 Jabber 帐户"
+msgstr "注销Jabber帐户"
 
 #: mod_register_web.erl:214
 msgid ""
@@ -1679,7 +1666,7 @@ msgid ""
 "(Jabber IDentifier) will be of the form: username@server. Please read "
 "carefully the instructions to fill correctly the fields."
 msgstr ""
-"本页面允许在此服务器上创建 Jabber 帐户. 你的 JID (Jabber ID) 的形式如下: 用户"
+"本页面允许在此服务器上创建Jabber帐户. 你的JID (Jabber ID) 的形式如下: 用户"
 "名@服务器. 请仔细阅读说明并正确填写相应字段."
 
 #: mod_register_web.erl:224 mod_register_web.erl:360 mod_register_web.erl:469
@@ -1702,11 +1689,11 @@ msgstr "服务器:"
 msgid ""
 "Don't tell your password to anybody, not even the administrators of the "
 "Jabber server."
-msgstr "不要将密码告诉任何人, 就算是 Jabber 服务器的管理员也不可以."
+msgstr "不要将密码告诉任何人, 就算是Jabber服务器的管理员也不可以."
 
 #: mod_register_web.erl:249
 msgid "You can later change your password using a Jabber client."
-msgstr "你可以稍后用 Jabber 客户端修改你的密码."
+msgstr "你可以稍后用Jabber客户端修改你的密码."
 
 #: mod_register_web.erl:252
 msgid ""
@@ -1722,7 +1709,7 @@ msgid ""
 "Jabber there isn't an automated way to recover your password if you forget "
 "it."
 msgstr ""
-"记住你的密码, 或将其记到纸上并放于安全位置. 如果你忘记了密码, Jabber 也没有自"
+"记住你的密码, 或将其记到纸上并放于安全位置. 如果你忘记了密码, Jabber也没有自"
 "动恢复密码的方式."
 
 #: mod_register_web.erl:262 mod_register_web.erl:374
@@ -1739,11 +1726,11 @@ msgstr "旧密码: "
 
 #: mod_register_web.erl:370
 msgid "New Password:"
-msgstr "新密码: "
+msgstr "新密码:"
 
 #: mod_register_web.erl:463
 msgid "This page allows to unregister a Jabber account in this Jabber server."
-msgstr "此页面允许在此 Jabber 服务器上注销 Jabber 帐户"
+msgstr "此页面允许在此Jabber服务器上注销Jabber帐户"
 
 #: mod_register_web.erl:480
 msgid "Unregister"
@@ -1771,11 +1758,11 @@ msgstr "移除"
 
 #: mod_roster.erl:1490
 msgid "Roster of "
-msgstr "花名册属于 "
+msgstr "花名册属于"
 
 #: mod_roster.erl:1504
 msgid "Add Jabber ID"
-msgstr "添加 Jabber ID"
+msgstr "添加Jabber ID"
 
 #: mod_roster.erl:1622
 msgid "Roster"
@@ -1808,7 +1795,7 @@ msgstr "组"
 
 #: mod_vcard.erl:168 mod_vcard_ldap.erl:225
 msgid "Erlang Jabber Server"
-msgstr "Erlang Jabber 服务器"
+msgstr "Erlang Jabber服务器"
 
 #: mod_vcard.erl:490 mod_vcard.erl:622
 msgid "Birthday"
@@ -1834,7 +1821,7 @@ msgstr "姓氏"
 msgid ""
 "Fill in the form to search for any matching Jabber User (Add * to the end of "
 "field to match substring)"
-msgstr "填充表单以搜索任何匹配的 Jabber 用户(在字段末添加*来匹配子串)"
+msgstr "填充表单以搜索任何匹配的Jabber用户(在字段末添加*来匹配子串)"
 
 #: mod_vcard.erl:490 mod_vcard.erl:615
 msgid "Full Name"
@@ -1854,7 +1841,7 @@ msgstr "组织单位"
 
 #: mod_vcard.erl:490 mod_vcard_ldap.erl:502
 msgid "Search users in "
-msgstr "搜索用户于 "
+msgstr "搜索用户于"
 
 #: mod_vcard.erl:490 mod_vcard_ldap.erl:502
 msgid "You need an x:data capable client to search"
@@ -1862,11 +1849,11 @@ msgstr "您需要一个兼容 x:data 的客户端来搜索"
 
 #: mod_vcard.erl:519 mod_vcard_ldap.erl:531
 msgid "vCard User Search"
-msgstr "vCard 用户搜索"
+msgstr "vCard用户搜索"
 
 #: mod_vcard.erl:580 mod_vcard_ldap.erl:586
 msgid "ejabberd vCard module"
-msgstr "ejabberd vCard 模块"
+msgstr "ejabberd vCard模块"
 
 #: mod_vcard.erl:609 mod_vcard_ldap.erl:602
 msgid "Search Results for "
@@ -1874,7 +1861,7 @@ msgstr "搜索结果属于关键词 "
 
 #: mod_vcard_ldap.erl:502
 msgid "Fill in fields to search for any matching Jabber User"
-msgstr "填充字段以搜索任何匹配的 Jabber 用户"
+msgstr "填充字段以搜索任何匹配的Jabber用户"
 
 #~ msgid "Outgoing s2s Servers:"
 #~ msgstr "出站 s2s 服务器"
@@ -1887,16 +1874,16 @@ msgstr "填充字段以搜索任何匹配的 Jabber 用户"
 
 #~ msgid ""
 #~ "This participant is kicked from the room because he sent an error message"
-#~ msgstr "该参与人由于发送了错误消息而被踢出了聊天室"
+#~ msgstr "该参与人由于发送了错误消息而被踢出了房间"
 
 #~ msgid ""
 #~ "This participant is kicked from the room because he sent an error message "
 #~ "to another participant"
-#~ msgstr "该参与人由于给其他人发送了出错消息而被踢出了聊天室"
+#~ msgstr "该参与人由于给其他人发送了出错消息而被踢出了房间"
 
 #~ msgid ""
 #~ "This participant is kicked from the room because he sent an error presence"
-#~ msgstr "该用户由于发送了错误状态而被踢出了聊天室"
+#~ msgstr "该用户由于发送了错误状态而被踢出了房间"
 
 #~ msgid "Captcha test failed"
 #~ msgstr "验证码检测失败."

rebar.config

@@ -1,58 +1,72 @@
 %%%-------------------------------------------------------------------
 %%% @author Evgeniy Khramtsov <ekhramtsov@process-one.net>
-%%% @copyright (C) 2013, Evgeniy Khramtsov
+%%% @copyright (C) 2013-2016, Evgeniy Khramtsov
 %%% @doc
 %%%
 %%% @end
 %%% Created :  1 May 2013 by Evgeniy Khramtsov <ekhramtsov@process-one.net>
 %%%-------------------------------------------------------------------
 
-{deps, [{if_var_true, lager, {lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.0.2"}}}},
-        {if_var_false, lager, {p1_logger, ".*", {git, "https://github.com/processone/p1_logger", {tag, "1.0.0"}}}},
-        {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.2"}}},
-        {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.1"}}},
-        {p1_tls, ".*", {git, "https://github.com/processone/tls", {tag, "1.0.0"}}},
-        {p1_stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.0"}}},
-        {p1_xml, ".*", {git, "https://github.com/processone/xml", {tag, "1.1.1"}}},
-        {p1_stun, ".*", {git, "https://github.com/processone/stun", "0.9.0"}},
-        {esip, ".*", {git, "https://github.com/processone/p1_sip", "1.0.0"}},
-        {p1_yaml, ".*", {git, "https://github.com/processone/p1_yaml", {tag, "1.0.0"}}},
-        {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.5"}}},
-        {oauth2, ".*", {git, "https://github.com/kivra/oauth2", "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8"}},
-        {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc", {tag, "1.15"}}},
-        {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/mysql", {tag, "1.0.0"}}}},
-        {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/pgsql", {tag, "1.0.0"}}}},
-        {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/alexeyr/erlang-sqlite3", "cbc3505f7a131254265d3ef56191b2581b8cc172"}}},
-        {if_var_true, pam, {p1_pam, ".*", {git, "https://github.com/processone/epam", {tag, "1.0.0"}}}},
-        {if_var_true, zlib, {p1_zlib, ".*", {git, "https://github.com/processone/zlib", {tag, "1.0.0"}}}},
-        {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang", "908a24fda4a46776a5135db60ca071e3d783f9f6"}}},  % for riak_pb-2.1.0.7
-        {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", "527722d12d0433b837cdb92a60900c2cb5df8942"}}},
-        {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", {tag, "v1.1.0"}}}},
-        {if_var_true, elixir, {rebar_elixir_plugin, ".*", {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}},
-        {if_var_true, iconv, {p1_iconv, ".*", {git, "https://github.com/processone/eiconv", {tag, "0.9.0"}}}},
-        {if_var_true, tools, {meck, "0.8.2", {git, "https://github.com/eproxus/meck", {tag, "0.8.2"}}}},
-        {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis", {tag, "v1.0.8"}}}}]}.
+{deps, [{lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.0.2"}}},
+        {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.3"}}},
+        {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.2"}}},
+        {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.1"}}},
+        {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.2"}}},
+        {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.3"}}},
+        {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.1"}}},
+        {esip, ".*", {git, "https://github.com/processone/esip", "1.0.2"}},
+        {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.2"}}},
+        {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.7"}}},
+        {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2.git", {tag, "0.6.1"}}},
+        {p1_xmlrpc, ".*", {git, "https://github.com/processone/p1_xmlrpc", {tag, "1.15.1"}}},
+	{luerl, ".*", {git, "https://github.com/rvirding/luerl",
+		       "9524d0309a88b7c62ae93da0b632b185de3ba9db"}},
+        {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql",
+					       {tag, "1.0.1"}}}},
+        {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql",
+					       {tag, "1.0.1"}}}},
+        {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3",
+					       {tag, "1.1.5"}}}},
+        {if_var_true, pam, {p1_pam, ".*", {git, "https://github.com/processone/epam",
+					   {tag, "1.0.0"}}}},
+        {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib",
+					   {tag, "1.0.1"}}}},
+        {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang",
+					      "908a24fda4a46776a5135db60ca071e3d783f9f6"}}},  % for riak_pb-2.1.0.7
+        {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client",
+					   "527722d12d0433b837cdb92a60900c2cb5df8942"}}},
+        {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir",
+					      {tag, "v1.1.0"}}}},
+        %% TODO: When modules are fully migrated to new structure and mix, we will not need anymore rebar_elixir_plugin
+        {if_var_true, elixir, {rebar_elixir_plugin, ".*",
+			       {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}},
+        {if_var_true, iconv, {iconv, ".*", {git, "https://github.com/processone/iconv",
+					    {tag, "1.0.0"}}}},
+        {if_var_true, tools, {meck, "0.8.2", {git, "https://github.com/eproxus/meck",
+					      {tag, "0.8.2"}}}},
+        {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis",
+					     {tag, "v1.0.8"}}}}]}.
 
 {if_var_true, latest_deps,
- {floating_deps, [p1_logger,
-                  cache_tab,
-                  p1_tls,
-                  p1_stringprep,
-                  p1_xml,
+ {floating_deps, [cache_tab,
+                  fast_tls,
+                  stringprep,
+                  fast_xml,
                   esip,
-                  p1_stun,
-                  p1_yaml,
+		  luerl,
+                  stun,
+                  fast_yaml,
                   p1_utils,
                   p1_mysql,
                   p1_pgsql,
                   p1_pam,
-                  p1_zlib,
-                  p1_iconv]}}.
+                  ezlib,
+                  iconv]}}.
 
 {erl_opts, [nowarn_deprecated_function,
+            {if_var_false, debug, no_debug_info},
             {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}},
             {if_var_match, db_type, mssql, {d, 'mssql'}},
-            {if_var_true, lager, {d, 'LAGER'}},
             {if_var_true, erlang_deprecated_types, {d, 'ERL_DEPRECATED_TYPES'}},
             {if_var_true, hipe, native},
             {src_dirs, [asn1, src,
@@ -65,7 +79,10 @@
            {if_var_true, elixir, rebar_elixir_compiler},
            {if_var_true, elixir, rebar_exunit}]}.
 
-{lib_dirs, [{if_var_true, elixir, "deps/elixir/lib"}]}.
+{if_var_true, elixir,
+              {lib_dirs, ["deps/elixir/lib"]}}.
+{if_var_true, elixir,
+              {src_dirs, ["include"]}}.
 
 {sub_dirs, ["rel"]}.
 
@@ -73,7 +90,7 @@
 
 {xref_warnings, false}.
 
-{xref_checks, [deprecated_function_calls]}.
+{xref_checks, [deprecated_function_calls, undefined_function_calls]}.
 
 {xref_exclusions, [
                    "(\"gen_transport\":_/_)",
@@ -92,15 +109,20 @@
 
 {eunit_compile_opts, [{i, "tools"}]}.
 
-{post_hook_configure, [{"p1_tls", []},
-                       {"p1_stringprep", []},
-                       {"p1_yaml", []},
+{post_hook_configure, [{"fast_tls", []},
+                       {"stringprep", []},
+                       {"fast_yaml", []},
                        {"esip", []},
-                       {"p1_xml", [{if_var_true, full_xml, "--enable-full-xml"}]},
+                       {"fast_xml", [{if_var_true, full_xml, "--enable-full-xml"}]},
                        {if_var_true, pam, {"p1_pam", []}},
-                       {if_var_true, zlib, {"p1_zlib", []}},
-                       {if_var_true, iconv, {"p1_iconv", []}}]}.
+                       {if_var_true, zlib, {"ezlib", []}},
+                       {if_var_true, iconv, {"iconv", []}}]}.
 
 {port_env, [{"CFLAGS", "-g -O2 -Wall"}]}.
 
 {port_specs, [{"priv/lib/jid.so", ["c_src/jid.c"]}]}.
+
+%% Local Variables:
+%% mode: erlang
+%% End:
+%% vim: set filetype=erlang tabstop=8:

rebar.config.script

@@ -1,6 +1,6 @@
 %%%-------------------------------------------------------------------
 %%% @author Evgeniy Khramtsov <ekhramtsov@process-one.net>
-%%% @copyright (C) 2013, Evgeniy Khramtsov
+%%% @copyright (C) 2013-2016, Evgeniy Khramtsov
 %%% @doc
 %%%
 %%% @end

rel/reltool.config.script

@@ -1,6 +1,6 @@
 %%%-------------------------------------------------------------------
 %%% @author Evgeniy Khramtsov <ekhramtsov@process-one.net>
-%%% @copyright (C) 2013, Evgeniy Khramtsov
+%%% @copyright (C) 2013-2016, Evgeniy Khramtsov
 %%% @doc
 %%%
 %%% @end

sql/lite.sql

@@ -1,5 +1,5 @@
 --
--- ejabberd, Copyright (C) 2002-2015   ProcessOne
+-- ejabberd, Copyright (C) 2002-2016   ProcessOne
 --
 -- This program is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU General Public License as
@@ -296,3 +296,17 @@ CREATE TABLE archive_prefs (
     never text NOT NULL,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
+
+CREATE TABLE sm (
+    usec bigint NOT NULL,
+    pid text NOT NULL,
+    node text NOT NULL,
+    username text NOT NULL,
+    resource text NOT NULL,
+    priority text NOT NULL,
+    info text NOT NULL
+);
+
+CREATE UNIQUE INDEX i_sm_sid ON sm(usec, pid);
+CREATE INDEX i_sm_node ON sm(node);
+CREATE INDEX i_sm_username ON sm(username);

sql/mysql.sql

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

sql/pg.sql

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

src/acl.erl

@@ -5,7 +5,7 @@
 %%% Created : 18 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/adhoc.erl

@@ -5,7 +5,7 @@
 %%% Created : 31 Oct 2005 by Magnus Henoch <henoch@dtek.chalmers.se>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -51,9 +51,9 @@
 
 parse_request(#iq{type = set, lang = Lang, sub_el = SubEl, xmlns = ?NS_COMMANDS}) ->
     ?DEBUG("entering parse_request...", []),
-    Node = xml:get_tag_attr_s(<<"node">>, SubEl),
-    SessionID = xml:get_tag_attr_s(<<"sessionid">>, SubEl),
-    Action = xml:get_tag_attr_s(<<"action">>, SubEl),
+    Node = fxml:get_tag_attr_s(<<"node">>, SubEl),
+    SessionID = fxml:get_tag_attr_s(<<"sessionid">>, SubEl),
+    Action = fxml:get_tag_attr_s(<<"action">>, SubEl),
     XData = find_xdata_el(SubEl),
     #xmlel{children = AllEls} = SubEl,
     Others = case XData of
@@ -76,7 +76,7 @@ find_xdata_el(#xmlel{children = SubEls}) ->
 
 find_xdata_el1([]) -> false;
 find_xdata_el1([El | Els]) when is_record(El, xmlel) ->
-    case xml:get_tag_attr_s(<<"xmlns">>, El) of
+    case fxml:get_tag_attr_s(<<"xmlns">>, El) of
         ?NS_XDATA -> El;
         _         -> find_xdata_el1(Els)
     end;

src/cyrsasl.erl

@@ -5,7 +5,7 @@
 %%% Created :  8 Mar 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -111,12 +111,12 @@ register_mechanism(Mechanism, Module, PasswordType) ->
 %%-include("ejabberd.hrl").
 %%-include("jlib.hrl").
 %%check_authzid(_State, Props) ->
-%%    AuthzId = xml:get_attr_s(authzid, Props),
+%%    AuthzId = fxml:get_attr_s(authzid, Props),
 %%    case jid:from_string(AuthzId) of
 %%	error ->
 %%	    {error, "invalid-authzid"};
 %%	JID ->
-%%	    LUser = jid:nodeprep(xml:get_attr_s(username, Props)),
+%%	    LUser = jid:nodeprep(fxml:get_attr_s(username, Props)),
 %%	    {U, S, R} = jid:tolower(JID),
 %%	    case R of
 %%		"" ->

src/cyrsasl_anonymous.erl

@@ -6,7 +6,7 @@
 %%% Created : 23 Aug 2005 by Magnus Henoch <henoch@dtek.chalmers.se>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/cyrsasl_digest.erl

@@ -5,7 +5,7 @@
 %%% Created : 11 Mar 2003 by Alexey Shchepin <alexey@sevcom.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -83,9 +83,9 @@ mech_step(#state{step = 3, nonce = Nonce} = State,
       bad -> {error, <<"bad-protocol">>};
       KeyVals ->
 	  DigestURI = proplists:get_value(<<"digest-uri">>, KeyVals, <<>>),
-	  %DigestURI = xml:get_attr_s(<<"digest-uri">>, KeyVals),
+	  %DigestURI = fxml:get_attr_s(<<"digest-uri">>, KeyVals),
 	  UserName = proplists:get_value(<<"username">>, KeyVals, <<>>),
-	  %UserName = xml:get_attr_s(<<"username">>, KeyVals),
+	  %UserName = fxml:get_attr_s(<<"username">>, KeyVals),
 	  case is_digesturi_valid(DigestURI, State#state.host,
 				  State#state.hostfqdn)
 	      of
@@ -97,13 +97,13 @@ mech_step(#state{step = 3, nonce = Nonce} = State,
 		{error, <<"not-authorized">>, UserName};
 	    true ->
 		AuthzId = proplists:get_value(<<"authzid">>, KeyVals, <<>>),
-		%AuthzId = xml:get_attr_s(<<"authzid">>, KeyVals),
+		%AuthzId = fxml:get_attr_s(<<"authzid">>, KeyVals),
 		case (State#state.get_password)(UserName) of
 		  {false, _} -> {error, <<"not-authorized">>, UserName};
 		  {Passwd, AuthModule} ->
 		      case (State#state.check_password)(UserName, <<"">>,
 		                    proplists:get_value(<<"response">>, KeyVals, <<>>),
-							%xml:get_attr_s(<<"response">>, KeyVals),
+							%fxml:get_attr_s(<<"response">>, KeyVals),
 							fun (PW) ->
 								response(KeyVals,
 									 UserName,

src/cyrsasl_oauth.erl

@@ -5,7 +5,7 @@
 %%% Created : 17 Sep 2015 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/cyrsasl_plain.erl

@@ -5,7 +5,7 @@
 %%% Created :  8 Mar 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/cyrsasl_scram.erl

@@ -5,7 +5,7 @@
 %%% Created : 7 Aug 2011 by Stephen Röttger <stephen.roettger@googlemail.com>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd.erl

@@ -5,7 +5,7 @@
 %%% Created : 16 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_admin.erl

@@ -5,7 +5,7 @@
 %%% Created :  7 May 2006 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -51,7 +51,8 @@
 	 install_fallback_mnesia/1,
 	 dump_to_textfile/1, dump_to_textfile/2,
 	 mnesia_change_nodename/4,
-	 restore/1 % Still used by some modules
+	 restore/1, % Still used by some modules
+	 get_commands_spec/0
 	]).
 
 -include("ejabberd.hrl").
@@ -59,16 +60,16 @@
 -include("ejabberd_commands.hrl").
 
 start() ->
-    ejabberd_commands:register_commands(commands()).
+    ejabberd_commands:register_commands(get_commands_spec()).
 
 stop() ->
-    ejabberd_commands:unregister_commands(commands()).
+    ejabberd_commands:unregister_commands(get_commands_spec()).
 
 %%%
 %%% ejabberd commands
 %%%
 
-commands() ->
+get_commands_spec() ->
     [
      %% The commands status, stop and restart are implemented also in ejabberd_ctl
      %% They are defined here so that other interfaces can use them too
@@ -200,6 +201,11 @@ commands() ->
 			module = ejabberd_auth_odbc, function = convert_to_scram,
 			args = [{host, binary}], result = {res, rescode}},
 
+     #ejabberd_commands{name = import_prosody, tags = [mnesia, odbc, riak],
+			desc = "Import data from Prosody",
+			module = prosody2ejabberd, function = from_dir,
+			args = [{dir, string}], result = {res, rescode}},
+
      #ejabberd_commands{name = convert_to_yaml, tags = [config],
                         desc = "Convert the input file from Erlang to YAML format",
                         module = ejabberd_config, function = convert_to_yaml,

src/ejabberd_app.erl

@@ -5,7 +5,7 @@
 %%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -252,11 +252,11 @@ start_apps() ->
     crypto:start(),
     ejabberd:start_app(sasl),
     ejabberd:start_app(ssl),
-    ejabberd:start_app(p1_yaml),
-    ejabberd:start_app(p1_tls),
-    ejabberd:start_app(p1_xml),
-    ejabberd:start_app(p1_stringprep),
-    ejabberd:start_app(p1_zlib),
+    ejabberd:start_app(fast_yaml),
+    ejabberd:start_app(fast_tls),
+    ejabberd:start_app(fast_xml),
+    ejabberd:start_app(stringprep),
+    ejabberd:start_app(ezlib),
     ejabberd:start_app(cache_tab).
 
 opt_type(net_ticktime) ->

src/ejabberd_auth.erl

@@ -5,7 +5,7 @@
 %%% Created : 23 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_auth_anonymous.erl

@@ -5,7 +5,7 @@
 %%% Created : 17 Feb 2006 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_auth_external.erl

@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_auth_internal.erl

@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_auth_ldap.erl

@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_auth_odbc.erl

@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_auth_pam.erl

@@ -5,7 +5,7 @@
 %%% Created : 5 Jul 2007 by Evgeniy Khramtsov <xram@jabber.ru>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_auth_riak.erl

@@ -5,7 +5,7 @@
 %%% Created : 12 Nov 2012 by Evgeniy Khramtsov <ekhramtsov@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_c2s.erl

@@ -5,7 +5,7 @@
 %%% Created : 16 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -59,7 +59,7 @@
 
 -export([init/1, wait_for_stream/2, wait_for_auth/2,
 	 wait_for_feature_request/2, wait_for_bind/2,
-	 wait_for_session/2, wait_for_sasl_response/2,
+	 wait_for_sasl_response/2,
 	 wait_for_resume/2, session_established/2,
 	 handle_event/3, handle_sync_event/4, code_change/4,
 	 handle_info/3, terminate/3, print_state/1, opt_type/1]).
@@ -115,6 +115,7 @@
 		mgmt_resend,
 		mgmt_stanzas_in = 0,
 		mgmt_stanzas_out = 0,
+		ask_offline = true,
 		lang = <<"">>}).
 
 %-define(DBGFSM, true).
@@ -133,7 +134,7 @@
 %% session:
 -define(C2S_OPEN_TIMEOUT, 60000).
 
--define(C2S_HIBERNATE_TIMEOUT, 90000).
+-define(C2S_HIBERNATE_TIMEOUT, ejabberd_config:get_option(c2s_hibernate, fun(X) when is_integer(X); X == hibernate-> X end, 90000)).
 
 -define(STREAM_HEADER,
 	<<"<?xml version='1.0'?><stream:stream "
@@ -342,15 +343,15 @@ get_subscribed(FsmRef) ->
 
 wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
     DefaultLang = ?MYLANG,
-    case xml:get_attr_s(<<"xmlns:stream">>, Attrs) of
+    case fxml:get_attr_s(<<"xmlns:stream">>, Attrs) of
 	?NS_STREAM ->
 	    Server =
 		case StateData#state.server of
 		<<"">> ->
-		    jid:nameprep(xml:get_attr_s(<<"to">>, Attrs));
+		    jid:nameprep(fxml:get_attr_s(<<"to">>, Attrs));
 		S -> S
 	    end,
-	    Lang = case xml:get_attr_s(<<"xml:lang">>, Attrs) of
+	    Lang = case fxml:get_attr_s(<<"xml:lang">>, Attrs) of
 		Lang1 when byte_size(Lang1) =< 35 ->
 		    %% As stated in BCP47, 4.4.1:
 		    %% Protocols or specifications that
@@ -367,7 +368,7 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
 	    case lists:member(Server, ?MYHOSTS) of
 		true when IsBlacklistedIP == false ->
 		    change_shaper(StateData, jid:make(<<"">>, Server, <<"">>)),
-		    case xml:get_attr_s(<<"version">>, Attrs) of
+		    case fxml:get_attr_s(<<"version">>, Attrs) of
 			<<"1.0">> ->
 			    send_header(StateData, Server, <<"1.0">>, DefaultLang),
 			    case StateData#state.authenticated of
@@ -408,7 +409,7 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
 					(StateData#state.sockmod):get_sockmod(StateData#state.socket),
 				    Zlib = StateData#state.zlib,
 				    CompressFeature = case Zlib andalso
-					((SockMod == gen_tcp) orelse (SockMod == p1_tls)) of
+					((SockMod == gen_tcp) orelse (SockMod == fast_tls)) of
 					true ->
 					    [#xmlel{name = <<"compression">>,
 						    attrs = [{<<"xmlns">>, ?NS_FEATURE_COMPRESS}],
@@ -468,15 +469,33 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
 						false ->
 						    []
 					    end,
+					    SockMod =
+						(StateData#state.sockmod):get_sockmod(
+						  StateData#state.socket),
+					    Zlib = StateData#state.zlib,
+					    CompressFeature =
+						case Zlib andalso
+						    ((SockMod == gen_tcp) orelse (SockMod == fast_tls)) of
+						    true ->
+							[#xmlel{name = <<"compression">>,
+								attrs = [{<<"xmlns">>, ?NS_FEATURE_COMPRESS}],
+								children = [#xmlel{name = <<"method">>,
+										   attrs = [],
+										   children = [{xmlcdata, <<"zlib">>}]}]}];
+						    _ ->
+							[]
+						end,
 					    StreamFeatures1 = [#xmlel{name = <<"bind">>,
 							attrs = [{<<"xmlns">>, ?NS_BIND}],
 							children = []},
 						    #xmlel{name = <<"session">>,
 							attrs = [{<<"xmlns">>, ?NS_SESSION}],
-							children = []}]
+							children =
+                                                           [#xmlel{name = <<"optional">>}]}]
 						++
 						RosterVersioningFeature ++
 						StreamManagementFeature ++
+						CompressFeature ++
 						ejabberd_hooks:run_fold(c2s_post_auth_features,
 						    Server, [], [Server]),
 					    StreamFeatures = ejabberd_hooks:run_fold(c2s_stream_features,
@@ -492,7 +511,7 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
 						#xmlel{name = <<"stream:features">>,
 						    attrs = [],
 						    children = []}),
-					    fsm_next_state(wait_for_session,
+					    fsm_next_state(session_established,
 						StateData#state{server = Server, lang = Lang})
 				    end
 			    end;
@@ -723,19 +742,19 @@ wait_for_feature_request({xmlstreamelement, El},
     TLSRequired = StateData#state.tls_required,
     SockMod =
 	(StateData#state.sockmod):get_sockmod(StateData#state.socket),
-    case {xml:get_attr_s(<<"xmlns">>, Attrs), Name} of
+    case {fxml:get_attr_s(<<"xmlns">>, Attrs), Name} of
       {?NS_SASL, <<"auth">>}
 	  when TLSEnabled or not TLSRequired ->
-	  Mech = xml:get_attr_s(<<"mechanism">>, Attrs),
-	  ClientIn = jlib:decode_base64(xml:get_cdata(Els)),
+	  Mech = fxml:get_attr_s(<<"mechanism">>, Attrs),
+	  ClientIn = jlib:decode_base64(fxml:get_cdata(Els)),
 	  case cyrsasl:server_start(StateData#state.sasl_state,
 				    Mech, ClientIn)
 	      of
 	    {ok, Props} ->
 		(StateData#state.sockmod):reset_stream(StateData#state.socket),
-		%U = xml:get_attr_s(username, Props),
+		%U = fxml:get_attr_s(username, Props),
 		U = proplists:get_value(username, Props, <<>>),
-		%AuthModule = xml:get_attr_s(auth_module, Props),
+		%AuthModule = fxml:get_attr_s(auth_module, Props),
 		AuthModule = proplists:get_value(auth_module, Props, undefined),
 		?INFO_MSG("(~w) Accepted authentication for ~s "
 			  "by ~p from ~s",
@@ -801,7 +820,7 @@ wait_for_feature_request({xmlstreamelement, El},
 								  StateData#state.tls_options)]
 		    end,
 	  Socket = StateData#state.socket,
-	  BProceed = xml:element_to_binary(#xmlel{name = <<"proceed">>,
+	  BProceed = fxml:element_to_binary(#xmlel{name = <<"proceed">>,
 						  attrs = [{<<"xmlns">>, ?NS_TLS}]}),
 	  TLSSocket = (StateData#state.sockmod):starttls(Socket,
 							 TLSOpts,
@@ -812,39 +831,8 @@ wait_for_feature_request({xmlstreamelement, El},
 					 tls_enabled = true});
       {?NS_COMPRESS, <<"compress">>}
 	  when Zlib == true,
-	       (SockMod == gen_tcp) or (SockMod == p1_tls) ->
-	  case xml:get_subtag(El, <<"method">>) of
-	    false ->
-		send_element(StateData,
-			     #xmlel{name = <<"failure">>,
-				    attrs = [{<<"xmlns">>, ?NS_COMPRESS}],
-				    children =
-					[#xmlel{name = <<"setup-failed">>,
-						attrs = [], children = []}]}),
-		fsm_next_state(wait_for_feature_request, StateData);
-	    Method ->
-		case xml:get_tag_cdata(Method) of
-		  <<"zlib">> ->
-		      Socket = StateData#state.socket,
-		      BCompressed = xml:element_to_binary(#xmlel{name = <<"compressed">>,
-								 attrs = [{<<"xmlns">>, ?NS_COMPRESS}]}),
-		      ZlibSocket = (StateData#state.sockmod):compress(Socket,
-								      BCompressed),
-		      fsm_next_state(wait_for_stream,
-				     StateData#state{socket = ZlibSocket,
-						     streamid = new_id()});
-		  _ ->
-		      send_element(StateData,
-				   #xmlel{name = <<"failure">>,
-					  attrs = [{<<"xmlns">>, ?NS_COMPRESS}],
-					  children =
-					      [#xmlel{name =
-							  <<"unsupported-method">>,
-						      attrs = [],
-						      children = []}]}),
-		      fsm_next_state(wait_for_feature_request, StateData)
-		end
-	  end;
+	       (SockMod == gen_tcp) or (SockMod == fast_tls) ->
+	  process_compression_request(El, wait_for_feature_request, StateData);
       _ ->
 	  if TLSRequired and not TLSEnabled ->
 		 Lang = StateData#state.lang,
@@ -879,18 +867,18 @@ wait_for_sasl_response({xmlstreamelement, #xmlel{name = Name} = El}, StateData)
 wait_for_sasl_response({xmlstreamelement, El},
 		       StateData) ->
     #xmlel{name = Name, attrs = Attrs, children = Els} = El,
-    case {xml:get_attr_s(<<"xmlns">>, Attrs), Name} of
+    case {fxml:get_attr_s(<<"xmlns">>, Attrs), Name} of
       {?NS_SASL, <<"response">>} ->
-	  ClientIn = jlib:decode_base64(xml:get_cdata(Els)),
+	  ClientIn = jlib:decode_base64(fxml:get_cdata(Els)),
 	  case cyrsasl:server_step(StateData#state.sasl_state,
 				   ClientIn)
 	      of
 	    {ok, Props} ->
 		catch
 		  (StateData#state.sockmod):reset_stream(StateData#state.socket),
-%		U = xml:get_attr_s(username, Props),
+%		U = fxml:get_attr_s(username, Props),
 		U = proplists:get_value(username, Props, <<>>),
-%		AuthModule = xml:get_attr_s(auth_module, Props),
+%		AuthModule = fxml:get_attr_s(auth_module, Props),
 		AuthModule = proplists:get_value(auth_module, Props, <<>>),
 		?INFO_MSG("(~w) Accepted authentication for ~s "
 			  "by ~p from ~s",
@@ -911,9 +899,9 @@ wait_for_sasl_response({xmlstreamelement, El},
 						user = U});
 	    {ok, Props, ServerOut} ->
 		(StateData#state.sockmod):reset_stream(StateData#state.socket),
-%		U = xml:get_attr_s(username, Props),
+%		U = fxml:get_attr_s(username, Props),
 		U = proplists:get_value(username, Props, <<>>),
-%		AuthModule = xml:get_attr_s(auth_module, Props),
+%		AuthModule = fxml:get_attr_s(auth_module, Props),
 		AuthModule = proplists:get_value(auth_module, Props, undefined),
 		?INFO_MSG("(~w) Accepted authentication for ~s "
 			  "by ~p from ~s",
@@ -1034,7 +1022,7 @@ wait_for_bind({xmlstreamelement, El}, StateData) ->
       #iq{type = set, xmlns = ?NS_BIND, sub_el = SubEl} =
 	  IQ ->
 	  U = StateData#state.user,
-	  R1 = xml:get_path_s(SubEl,
+	  R1 = fxml:get_path_s(SubEl,
 			      [{elem, <<"resource">>}, cdata]),
 	  R = case jid:resourceprep(R1) of
 		error -> error;
@@ -1059,23 +1047,47 @@ wait_for_bind({xmlstreamelement, El}, StateData) ->
 		      send_element(StateData, Err),
 		      fsm_next_state(wait_for_bind, StateData);
 		  {accept_resource, R2} ->
-		      JID = jid:make(U, StateData#state.server, R2),
-		      Res = IQ#iq{type = result,
-				  sub_el =
-				      [#xmlel{name = <<"bind">>,
-					      attrs = [{<<"xmlns">>, ?NS_BIND}],
-					      children =
-						  [#xmlel{name = <<"jid">>,
-							  attrs = [],
-							  children =
-							      [{xmlcdata,
-								jid:to_string(JID)}]}]}]},
-		      send_element(StateData, jlib:iq_to_xml(Res)),
-		      fsm_next_state(wait_for_session,
-				     StateData#state{resource = R2, jid = JID})
+                        JID = jid:make(U, StateData#state.server, R2),
+                        StateData2 =
+                            StateData#state{resource = R2, jid = JID},
+                        case open_session(StateData2) of
+                            {ok, StateData3} ->
+                                Res =
+                                    IQ#iq{
+                                      type = result,
+                                      sub_el =
+                                      [#xmlel{name = <<"bind">>,
+                                              attrs = [{<<"xmlns">>, ?NS_BIND}],
+                                              children =
+                                              [#xmlel{name = <<"jid">>,
+                                                      attrs = [],
+                                                      children =
+                                                      [{xmlcdata,
+                                                        jid:to_string(JID)}]}]}]},
+                                send_element(StateData3, jlib:iq_to_xml(Res)),
+                                fsm_next_state_pack(
+                                  session_established,
+                                  StateData3);
+                            {error, Error} ->
+                                Err = jlib:make_error_reply(El, Error),
+                                send_element(StateData, Err),
+                                fsm_next_state(wait_for_bind, StateData)
+                        end
 		end
 	  end;
-      _ -> fsm_next_state(wait_for_bind, StateData)
+	_ ->
+	    #xmlel{name = Name, attrs = Attrs, children = _Els} = El,
+	    Zlib = StateData#state.zlib,
+	    SockMod =
+		(StateData#state.sockmod):get_sockmod(StateData#state.socket),
+	    case {fxml:get_attr_s(<<"xmlns">>, Attrs), Name} of
+		{?NS_COMPRESS, <<"compress">>}
+		when Zlib == true,
+		     (SockMod == gen_tcp) or (SockMod == fast_tls) ->
+		    process_compression_request(El, wait_for_bind, StateData);
+		_ ->
+		    fsm_next_state(wait_for_bind, StateData)
+	    end
     end;
 wait_for_bind(timeout, StateData) ->
     {stop, normal, StateData};
@@ -1090,75 +1102,49 @@ wait_for_bind(closed, StateData) ->
 wait_for_bind(stop, StateData) ->
     {stop, normal, StateData}.
 
-wait_for_session({xmlstreamelement, #xmlel{name = Name} = El}, StateData)
-    when ?IS_STREAM_MGMT_TAG(Name) ->
-    fsm_next_state(wait_for_session, dispatch_stream_mgmt(El, StateData));
-wait_for_session({xmlstreamelement, El}, StateData) ->
-    NewStateData = update_num_stanzas_in(StateData, El),
-    case jlib:iq_query_info(El) of
-	#iq{type = set, xmlns = ?NS_SESSION} ->
-	    U = NewStateData#state.user,
-	    R = NewStateData#state.resource,
-	    JID = NewStateData#state.jid,
-	    case acl:match_rule(NewStateData#state.server,
-		    NewStateData#state.access, JID) of
-		allow ->
-		    ?INFO_MSG("(~w) Opened session for ~s",
-			[NewStateData#state.socket, jid:to_string(JID)]),
-		    Res = jlib:make_result_iq_reply(El#xmlel{children = []}),
-		    NewState = send_stanza(NewStateData, Res),
-		    change_shaper(NewState, JID),
-		    {Fs, Ts} = ejabberd_hooks:run_fold(
-			    roster_get_subscription_lists,
-			    NewState#state.server,
-			    {[], []},
-			    [U, NewState#state.server]),
-		    LJID = jid:tolower(jid:remove_resource(JID)),
-		    Fs1 = [LJID | Fs],
-		    Ts1 = [LJID | Ts],
-		    PrivList =
-			ejabberd_hooks:run_fold(
-			    privacy_get_user_list,
-			    NewState#state.server,
-			    #userlist{},
-			    [U, NewState#state.server]),
-		    Conn = get_conn_type(NewState),
-		    Info = [{ip, NewState#state.ip}, {conn, Conn},
-			    {auth_module, NewState#state.auth_module}],
-		    ejabberd_sm:open_session(
-			NewState#state.sid, U, NewState#state.server, R, Info),
-		    UpdatedStateData =
-			NewState#state{
-			    conn = Conn,
-			    pres_f = ?SETS:from_list(Fs1),
-			    pres_t = ?SETS:from_list(Ts1),
-			    privacy_list = PrivList},
-		    fsm_next_state_pack(session_established,
-			UpdatedStateData);
-		_ ->
-		    ejabberd_hooks:run(forbidden_session_hook,
-			NewStateData#state.server, [JID]),
-		    ?INFO_MSG("(~w) Forbidden session for ~s",
-			[NewStateData#state.socket, jid:to_string(JID)]),
-		    Err = jlib:make_error_reply(El, ?ERR_NOT_ALLOWED),
-		    send_element(NewStateData, Err),
-		    fsm_next_state(wait_for_session, NewStateData)
-	    end;
-	_ ->
-	    fsm_next_state(wait_for_session, NewStateData)
-    end;
-wait_for_session(timeout, StateData) ->
-    {stop, normal, StateData};
-wait_for_session({xmlstreamend, _Name}, StateData) ->
-    send_trailer(StateData), {stop, normal, StateData};
-wait_for_session({xmlstreamerror, _}, StateData) ->
-    send_element(StateData, ?INVALID_XML_ERR),
-    send_trailer(StateData),
-    {stop, normal, StateData};
-wait_for_session(closed, StateData) ->
-    {stop, normal, StateData};
-wait_for_session(stop, StateData) ->
-    {stop, normal, StateData}.
+open_session(StateData) ->
+    U = StateData#state.user,
+    R = StateData#state.resource,
+    JID = StateData#state.jid,
+    case acl:match_rule(StateData#state.server,
+                        StateData#state.access, JID) of
+        allow ->
+            ?INFO_MSG("(~w) Opened session for ~s",
+                      [StateData#state.socket, jid:to_string(JID)]),
+            change_shaper(StateData, JID),
+            {Fs, Ts} = ejabberd_hooks:run_fold(
+                         roster_get_subscription_lists,
+                         StateData#state.server,
+                         {[], []},
+                         [U, StateData#state.server]),
+            LJID = jid:tolower(jid:remove_resource(JID)),
+            Fs1 = [LJID | Fs],
+            Ts1 = [LJID | Ts],
+            PrivList =
+                ejabberd_hooks:run_fold(
+                  privacy_get_user_list,
+                  StateData#state.server,
+                  #userlist{},
+                  [U, StateData#state.server]),
+            Conn = get_conn_type(StateData),
+            Info = [{ip, StateData#state.ip}, {conn, Conn},
+                    {auth_module, StateData#state.auth_module}],
+            ejabberd_sm:open_session(
+              StateData#state.sid, U, StateData#state.server, R, Info),
+            UpdatedStateData =
+                StateData#state{
+                  conn = Conn,
+                  pres_f = ?SETS:from_list(Fs1),
+                  pres_t = ?SETS:from_list(Ts1),
+                  privacy_list = PrivList},
+            {ok, UpdatedStateData};
+        _ ->
+            ejabberd_hooks:run(forbidden_session_hook,
+                               StateData#state.server, [JID]),
+            ?INFO_MSG("(~w) Forbidden session for ~s",
+                      [StateData#state.socket, jid:to_string(JID)]),
+            {error, ?ERR_NOT_ALLOWED}
+    end.
 
 session_established({xmlstreamelement, #xmlel{name = Name} = El}, StateData)
     when ?IS_STREAM_MGMT_TAG(Name) ->
@@ -1220,24 +1206,24 @@ session_established2(El, StateData) ->
     User = NewStateData#state.user,
     Server = NewStateData#state.server,
     FromJID = NewStateData#state.jid,
-    To = xml:get_attr_s(<<"to">>, Attrs),
+    To = fxml:get_attr_s(<<"to">>, Attrs),
     ToJID = case To of
 	      <<"">> -> jid:make(User, Server, <<"">>);
 	      _ -> jid:from_string(To)
 	    end,
     NewEl1 = jlib:remove_attr(<<"xmlns">>, El),
-    NewEl = case xml:get_attr_s(<<"xml:lang">>, Attrs) of
+    NewEl = case fxml:get_attr_s(<<"xml:lang">>, Attrs) of
 	      <<"">> ->
 		  case NewStateData#state.lang of
 		    <<"">> -> NewEl1;
 		    Lang ->
-			xml:replace_tag_attr(<<"xml:lang">>, Lang, NewEl1)
+			fxml:replace_tag_attr(<<"xml:lang">>, Lang, NewEl1)
 		  end;
 	      _ -> NewEl1
 	    end,
     NewState = case ToJID of
 		 error ->
-		     case xml:get_attr_s(<<"type">>, Attrs) of
+		     case fxml:get_attr_s(<<"type">>, Attrs) of
 		       <<"error">> -> NewStateData;
 		       <<"result">> -> NewStateData;
 		       _ ->
@@ -1274,6 +1260,10 @@ session_established2(El, StateData) ->
 				      Xmlns == (?NS_BLOCKING) ->
 				 process_privacy_iq(FromJID, ToJID, IQ,
 						    NewStateData);
+                               #iq{xmlns = ?NS_SESSION} ->
+                                   Res = jlib:make_result_iq_reply(
+                                           NewEl#xmlel{children = []}),
+                                   send_stanza(NewStateData, Res);
 			     _ ->
 				 NewEl0 = ejabberd_hooks:run_fold(
 					    user_send_packet, Server, NewEl,
@@ -1417,7 +1407,7 @@ handle_info({route, From, To,
 								   StateData,
 								   [{From, To,
 								     Packet}]),
-				       case xml:get_attr_s(<<"type">>, Attrs) of
+				       case fxml:get_attr_s(<<"type">>, Attrs) of
 					 <<"probe">> ->
 					     LFrom = jid:tolower(From),
 					     LBFrom =
@@ -1634,7 +1624,7 @@ handle_info({route, From, To,
 					 allow ->
 					     {true, Attrs, StateData};
 					 deny ->
-                                               case xml:get_attr_s(<<"type">>, Attrs) of
+                                               case fxml:get_attr_s(<<"type">>, Attrs) of
                                                    <<"error">> -> ok;
                                                    <<"groupchat">> -> ok;
                                                    <<"headline">> -> ok;
@@ -1746,6 +1736,8 @@ handle_info({broadcast, Type, From, Packet}, StateName, StateData) ->
 		From, jid:make(USR), Packet)
       end, lists:usort(Recipients)),
     fsm_next_state(StateName, StateData);
+handle_info(dont_ask_offline, StateName, StateData) ->
+    fsm_next_state(StateName, StateData#state{ask_offline = false});
 handle_info(Info, StateName, StateData) ->
     ?ERROR_MSG("Unexpected info: ~p", [Info]),
     fsm_next_state(StateName, StateData).
@@ -1853,7 +1845,7 @@ send_element(StateData, El) when StateData#state.xml_socket ->
     (StateData#state.sockmod):send_xml(StateData#state.socket,
 				       {xmlstreamelement, El});
 send_element(StateData, El) ->
-    send_text(StateData, xml:element_to_binary(El)).
+    send_text(StateData, fxml:element_to_binary(El)).
 
 send_stanza(StateData, Stanza) when StateData#state.csi_state == inactive ->
     csi_filter_stanza(StateData, Stanza);
@@ -1933,7 +1925,7 @@ is_auth_packet(El) ->
 is_stanza(#xmlel{name = Name, attrs = Attrs}) when Name == <<"message">>;
 						   Name == <<"presence">>;
 						   Name == <<"iq">> ->
-    case xml:get_attr(<<"xmlns">>, Attrs) of
+    case fxml:get_attr(<<"xmlns">>, Attrs) of
       {value, NS} when NS /= <<"jabber:client">>,
 		       NS /= <<"jabber:server">> ->
 	  false;
@@ -1945,7 +1937,7 @@ is_stanza(_El) ->
 
 get_auth_tags([#xmlel{name = Name, children = Els} | L],
 	      U, P, D, R) ->
-    CData = xml:get_cdata(Els),
+    CData = fxml:get_cdata(Els),
     case Name of
       <<"username">> -> get_auth_tags(L, CData, P, D, R);
       <<"password">> -> get_auth_tags(L, U, CData, D, R);
@@ -1964,11 +1956,11 @@ get_auth_tags([], U, P, D, R) ->
 get_conn_type(StateData) ->
     case (StateData#state.sockmod):get_sockmod(StateData#state.socket) of
     gen_tcp -> c2s;
-    p1_tls -> c2s_tls;
+    fast_tls -> c2s_tls;
     ezlib ->
 	case ezlib:get_sockmod((StateData#state.socket)#socket_state.socket) of
 	    gen_tcp -> c2s_compressed;
-	    p1_tls -> c2s_compressed_tls
+	    fast_tls -> c2s_compressed_tls
 	end;
     ejabberd_http_bind -> http_bind;
     ejabberd_http_ws -> websocket;
@@ -2012,11 +2004,11 @@ process_presence_probe(From, To, StateData) ->
 %% User updates his presence (non-directed presence packet)
 presence_update(From, Packet, StateData) ->
     #xmlel{attrs = Attrs} = Packet,
-    case xml:get_attr_s(<<"type">>, Attrs) of
+    case fxml:get_attr_s(<<"type">>, Attrs) of
       <<"unavailable">> ->
-	  Status = case xml:get_subtag(Packet, <<"status">>) of
+	  Status = case fxml:get_subtag(Packet, <<"status">>) of
 		     false -> <<"">>;
-		     StatusTag -> xml:get_tag_cdata(StatusTag)
+		     StatusTag -> fxml:get_tag_cdata(StatusTag)
 		   end,
 	  Info = [{ip, StateData#state.ip},
 		  {conn, StateData#state.conn},
@@ -2077,7 +2069,7 @@ presence_track(From, To, Packet, StateData) ->
     LTo = jid:tolower(To),
     User = StateData#state.user,
     Server = StateData#state.server,
-    case xml:get_attr_s(<<"type">>, Attrs) of
+    case fxml:get_attr_s(<<"type">>, Attrs) of
       <<"unavailable">> ->
 	  A = remove_element(LTo, StateData#state.pres_a),
 	  check_privacy_route(From, StateData#state{pres_a = A}, From, To, Packet);
@@ -2274,11 +2266,11 @@ update_priority(Priority, Packet, StateData) ->
 			     StateData#state.resource, Priority, Packet, Info).
 
 get_priority_from_presence(PresencePacket) ->
-    case xml:get_subtag(PresencePacket, <<"priority">>) of
+    case fxml:get_subtag(PresencePacket, <<"priority">>) of
       false -> 0;
       SubEl ->
 	  case catch
-		 jlib:binary_to_integer(xml:get_tag_cdata(SubEl))
+		 jlib:binary_to_integer(fxml:get_tag_cdata(SubEl))
 	      of
 	    P when is_integer(P) -> P;
 	    _ -> 0
@@ -2319,7 +2311,7 @@ process_privacy_iq(From, To,
     ejabberd_router:route(To, From, jlib:iq_to_xml(IQRes)),
     NewStateData.
 
-resend_offline_messages(StateData) ->
+resend_offline_messages(#state{ask_offline = true} = StateData) ->
     case ejabberd_hooks:run_fold(resend_offline_messages_hook,
 				 StateData#state.server, [],
 				 [StateData#state.user, StateData#state.server])
@@ -2340,7 +2332,9 @@ resend_offline_messages(StateData) ->
 				end
 			end,
 			Rs)
-    end.
+    end;
+resend_offline_messages(_StateData) ->
+    ok.
 
 resend_subscription_requests(#state{user = User,
 				    server = Server} = StateData) ->
@@ -2355,21 +2349,21 @@ resend_subscription_requests(#state{user = User,
 
 get_showtag(undefined) -> <<"unavailable">>;
 get_showtag(Presence) ->
-    case xml:get_path_s(Presence, [{elem, <<"show">>}, cdata]) of
+    case fxml:get_path_s(Presence, [{elem, <<"show">>}, cdata]) of
 	<<"">> -> <<"available">>;
 	ShowTag -> ShowTag
     end.
 
 get_statustag(undefined) -> <<"">>;
 get_statustag(Presence) ->
-    xml:get_path_s(Presence, [{elem, <<"status">>}, cdata]).
+    fxml:get_path_s(Presence, [{elem, <<"status">>}, cdata]).
 
 process_unauthenticated_stanza(StateData, El) ->
-    NewEl = case xml:get_tag_attr_s(<<"xml:lang">>, El) of
+    NewEl = case fxml:get_tag_attr_s(<<"xml:lang">>, El) of
 	      <<"">> ->
 		  case StateData#state.lang of
 		    <<"">> -> El;
-		    Lang -> xml:replace_tag_attr(<<"xml:lang">>, Lang, El)
+		    Lang -> fxml:replace_tag_attr(<<"xml:lang">>, Lang, El)
 		  end;
 	      _ -> El
 	    end,
@@ -2471,7 +2465,7 @@ is_ip_blacklisted({IP, _Port}, Lang) ->
 %% Check from attributes
 %% returns invalid-from|NewElement
 check_from(El, FromJID) ->
-    case xml:get_tag_attr(<<"from">>, El) of
+    case fxml:get_tag_attr(<<"from">>, El) of
 	false ->
 	    El;
 	{value, SJID} ->
@@ -2514,6 +2508,41 @@ bounce_messages() ->
       after 0 -> ok
     end.
 
+process_compression_request(El, StateName, StateData) ->
+    case fxml:get_subtag(El, <<"method">>) of
+	false ->
+	    send_element(StateData,
+			 #xmlel{name = <<"failure">>,
+				attrs = [{<<"xmlns">>, ?NS_COMPRESS}],
+				children =
+				[#xmlel{name = <<"setup-failed">>,
+					attrs = [], children = []}]}),
+	    fsm_next_state(StateName, StateData);
+	Method ->
+	    case fxml:get_tag_cdata(Method) of
+		<<"zlib">> ->
+		    Socket = StateData#state.socket,
+		    BCompressed = fxml:element_to_binary(
+				    #xmlel{name = <<"compressed">>,
+					   attrs = [{<<"xmlns">>,
+						     ?NS_COMPRESS}]}),
+		    ZlibSocket = (StateData#state.sockmod):compress(
+				   Socket, BCompressed),
+		    fsm_next_state(wait_for_stream,
+				   StateData#state{socket = ZlibSocket,
+						   streamid = new_id()});
+		_ ->
+		    send_element(StateData,
+				 #xmlel{name = <<"failure">>,
+					attrs = [{<<"xmlns">>, ?NS_COMPRESS}],
+					children =
+					[#xmlel{name = <<"unsupported-method">>,
+						attrs = [],
+						children = []}]}),
+		    fsm_next_state(StateName, StateData)
+	    end
+    end.
+
 %%%----------------------------------------------------------------------
 %%% XEP-0191
 %%%----------------------------------------------------------------------
@@ -2582,7 +2611,7 @@ negotiate_stream_mgmt(_El, #state{resource = <<"">>} = StateData) ->
     send_element(StateData, ?MGMT_UNEXPECTED_REQUEST(?NS_STREAM_MGMT_3)),
     StateData;
 negotiate_stream_mgmt(#xmlel{name = Name, attrs = Attrs}, StateData) ->
-    case xml:get_attr_s(<<"xmlns">>, Attrs) of
+    case fxml:get_attr_s(<<"xmlns">>, Attrs) of
       Xmlns when ?IS_SUPPORTED_MGMT_XMLNS(Xmlns) ->
 	  case stream_mgmt_enabled(StateData) of
 	    true ->
@@ -2610,7 +2639,7 @@ negotiate_stream_mgmt(#xmlel{name = Name, attrs = Attrs}, StateData) ->
     end.
 
 perform_stream_mgmt(#xmlel{name = Name, attrs = Attrs}, StateData) ->
-    case xml:get_attr_s(<<"xmlns">>, Attrs) of
+    case fxml:get_attr_s(<<"xmlns">>, Attrs) of
       Xmlns when Xmlns == StateData#state.mgmt_xmlns ->
 	  case Name of
 	    <<"r">> ->
@@ -2635,10 +2664,10 @@ perform_stream_mgmt(#xmlel{name = Name, attrs = Attrs}, StateData) ->
 
 handle_enable(#state{mgmt_timeout = DefaultTimeout,
 		     mgmt_max_timeout = MaxTimeout} = StateData, Attrs) ->
-    Timeout = case xml:get_attr_s(<<"resume">>, Attrs) of
+    Timeout = case fxml:get_attr_s(<<"resume">>, Attrs) of
 		ResumeAttr when ResumeAttr == <<"true">>;
 				ResumeAttr == <<"1">> ->
-		    MaxAttr = xml:get_attr_s(<<"max">>, Attrs),
+		    MaxAttr = fxml:get_attr_s(<<"max">>, Attrs),
 		    case catch jlib:binary_to_integer(MaxAttr) of
 		      Max when is_integer(Max), Max > 0, Max =< MaxTimeout ->
 			  Max;
@@ -2678,7 +2707,7 @@ handle_r(StateData) ->
     StateData.
 
 handle_a(StateData, Attrs) ->
-    case catch jlib:binary_to_integer(xml:get_attr_s(<<"h">>, Attrs)) of
+    case catch jlib:binary_to_integer(fxml:get_attr_s(<<"h">>, Attrs)) of
       H when is_integer(H), H >= 0 ->
 	  check_h_attribute(StateData, H);
       _ ->
@@ -2688,12 +2717,12 @@ handle_a(StateData, Attrs) ->
     end.
 
 handle_resume(StateData, Attrs) ->
-    R = case xml:get_attr_s(<<"xmlns">>, Attrs) of
+    R = case fxml:get_attr_s(<<"xmlns">>, Attrs) of
 	  Xmlns when ?IS_SUPPORTED_MGMT_XMLNS(Xmlns) ->
 	      case stream_mgmt_enabled(StateData) of
 		true ->
-		    case {xml:get_attr(<<"previd">>, Attrs),
-			  catch jlib:binary_to_integer(xml:get_attr_s(<<"h">>, Attrs))}
+		    case {fxml:get_attr(<<"previd">>, Attrs),
+			  catch jlib:binary_to_integer(fxml:get_attr_s(<<"h">>, Attrs))}
 			of
 		      {{value, PrevID}, H} when is_integer(H), H >= 0 ->
 			  case inherit_session_state(StateData, PrevID) of
@@ -2824,9 +2853,9 @@ handle_unacked_stanzas(StateData, F)
 		    [N, jid:to_string(StateData#state.jid)]),
 	  lists:foreach(
 	    fun({_, Time, #xmlel{attrs = Attrs} = El}) ->
-		    From_s = xml:get_attr_s(<<"from">>, Attrs),
+		    From_s = fxml:get_attr_s(<<"from">>, Attrs),
 		    From = jid:from_string(From_s),
-		    To_s = xml:get_attr_s(<<"to">>, Attrs),
+		    To_s = fxml:get_attr_s(<<"to">>, Attrs),
 		    To = jid:from_string(To_s),
 		    F(From, To, El, Time)
 	    end, queue:to_list(Queue))
@@ -2842,8 +2871,16 @@ handle_unacked_stanzas(StateData)
 	  Resend when is_boolean(Resend) ->
 	      Resend;
 	  if_offline ->
-	      ejabberd_sm:get_user_resources(StateData#state.user,
-					     StateData#state.server) == []
+	      Resource = StateData#state.resource,
+	      case ejabberd_sm:get_user_resources(StateData#state.user,
+						  StateData#state.server) of
+		[Resource] -> % Same resource opened new session
+		    true;
+		[] ->
+		    true;
+		_ ->
+		    false
+	      end
 	end,
     ReRoute = case ResendOnTimeout of
 		true ->
@@ -2876,9 +2913,18 @@ handle_unacked_stanzas(StateData)
 		case is_encapsulated_forward(El) of
 		  true ->
 		      ?DEBUG("Dropping forwarded message stanza from ~s",
-			     [xml:get_attr_s(<<"from">>, El#xmlel.attrs)]);
+			     [fxml:get_attr_s(<<"from">>, El#xmlel.attrs)]);
 		  false ->
-		      ReRoute(From, To, El, Time)
+		      case ejabberd_hooks:run_fold(message_is_archived,
+						   StateData#state.server,
+						   false,
+						   [StateData, From,
+						    StateData#state.jid, El]) of
+			true ->
+			    ok;
+			false ->
+			    ReRoute(From, To, El, Time)
+		      end
 		end
 	end,
     handle_unacked_stanzas(StateData, F);
@@ -2886,9 +2932,9 @@ handle_unacked_stanzas(_StateData) ->
     ok.
 
 is_encapsulated_forward(#xmlel{name = <<"message">>} = El) ->
-    SubTag = case {xml:get_subtag(El, <<"sent">>),
-		   xml:get_subtag(El, <<"received">>),
-		   xml:get_subtag(El, <<"result">>)} of
+    SubTag = case {fxml:get_subtag(El, <<"sent">>),
+		   fxml:get_subtag(El, <<"received">>),
+		   fxml:get_subtag(El, <<"result">>)} of
 	       {false, false, false} ->
 		   false;
 	       {Tag, false, false} ->
@@ -2901,7 +2947,7 @@ is_encapsulated_forward(#xmlel{name = <<"message">>} = El) ->
     if SubTag == false ->
 	   false;
        true ->
-	   case xml:get_subtag(SubTag, <<"forwarded">>) of
+	   case fxml:get_subtag(SubTag, <<"forwarded">>) of
 	     false ->
 		 false;
 	     _ ->
@@ -2989,7 +3035,7 @@ csi_filter_stanza(#state{csi_state = CsiState, jid = JID} = StateData,
       queue -> csi_queue_add(StateData, Stanza);
       drop -> StateData;
       send ->
-	  From = xml:get_tag_attr_s(<<"from">>, Stanza),
+	  From = fxml:get_tag_attr_s(<<"from">>, Stanza),
 	  StateData1 = csi_queue_send(StateData, From),
 	  StateData2 = send_stanza(StateData1#state{csi_state = active},
 				   Stanza),
@@ -3000,7 +3046,7 @@ csi_queue_add(#state{csi_queue = Queue} = StateData, Stanza) ->
     case length(StateData#state.csi_queue) >= csi_max_queue(StateData) of
       true -> csi_queue_add(csi_queue_flush(StateData), Stanza);
       false ->
-	  From = xml:get_tag_attr_s(<<"from">>, Stanza),
+	  From = fxml:get_tag_attr_s(<<"from">>, Stanza),
 	  NewQueue = lists:keystore(From, 1, Queue, {From, p1_time_compat:timestamp(), Stanza}),
 	  StateData#state{csi_queue = NewQueue}
     end.

src/ejabberd_c2s_config.erl

@@ -6,7 +6,7 @@
 %%% Created :  2 Nov 2007 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_captcha.erl

@@ -5,7 +5,7 @@
 %%% Created : 26 Apr 2008 by Evgeniy Khramtsov <xramtsov@gmail.com>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -320,7 +320,7 @@ build_captcha_html(Id, Lang) ->
 -spec process_reply(xmlel()) -> ok | {error, bad_match | not_found | malformed}.
 
 process_reply(#xmlel{} = El) ->
-    case xml:get_subtag(El, <<"x">>) of
+    case fxml:get_subtag(El, <<"x">>) of
       false -> {error, malformed};
       Xdata ->
 	  Fields = jlib:parse_xdata_submit(Xdata),

src/ejabberd_cluster.erl

@@ -5,7 +5,7 @@
 %%% Created : 7 Oct 2015 by Christophe Romain <christophe.romain@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_commands.erl

@@ -5,7 +5,7 @@
 %%% Created : 20 May 2008 by Badlop <badlop@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -219,7 +219,8 @@
 	 unregister_commands/1,
 	 execute_command/2,
          execute_command/4,
-         opt_type/1
+         opt_type/1,
+         get_commands_spec/0
 	]).
 
 -include("ejabberd_commands.hrl").
@@ -228,10 +229,8 @@
 
 -define(POLICY_ACCESS, '$policy').
 
-init() ->
-    ets:new(ejabberd_commands, [named_table, set, public,
-				{keypos, #ejabberd_commands.name}]),
-    register_commands([
+get_commands_spec() ->
+    [
         #ejabberd_commands{name = gen_html_doc_for_commands, tags = [documentation],
                            desc = "Generates html documentation for ejabberd_commands",
                            module = ejabberd_commands_doc, function = generate_html_output,
@@ -259,7 +258,11 @@ init() ->
                                         "that will have example invocation include in markdown document"],
                            result_desc = "0 if command failed, 1 when succedded",
                            args_example = ["/home/me/docs/api.html", "mod_admin", "java,json"],
-                           result_example = ok}]).
+                           result_example = ok}].
+init() ->
+    ets:new(ejabberd_commands, [named_table, set, public,
+				{keypos, #ejabberd_commands.name}]),
+    register_commands(get_commands_spec()).
 
 -spec register_commands([ejabberd_commands()]) -> ok.
 

src/ejabberd_commands_doc.erl

@@ -32,7 +32,7 @@
 -include("ejabberd_commands.hrl").
 -include("ejabberd.hrl").
 
--define(RAW(V), if HTMLOutput -> xml:crypt(iolist_to_binary(V)); true -> iolist_to_binary(V) end).
+-define(RAW(V), if HTMLOutput -> fxml:crypt(iolist_to_binary(V)); true -> iolist_to_binary(V) end).
 -define(TAG(N), if HTMLOutput -> [<<"<", ??N, "/>">>]; true -> md_tag(N, <<"">>) end).
 -define(TAG(N, V), if HTMLOutput -> [<<"<", ??N, ">">>, V, <<"</", ??N, ">">>]; true -> md_tag(N, V) end).
 -define(TAG(N, C, V), if HTMLOutput -> [<<"<", ??N, " class='", C, "'>">>, V, <<"</", ??N, ">">>]; true -> md_tag(N, V) end).
@@ -75,13 +75,13 @@ md_tag(dd, V) ->
 md_tag(li, V) ->
     [<<"- ">>, V, <<"\n">>];
 md_tag(pre, V) ->
-    [<<"\n">>, V, <<"\n">>];
+    [V, <<"\n">>];
 md_tag(p, V) ->
     [<<"\n\n">>, V, <<"\n">>];
 md_tag(h1, V) ->
-    [<<"\n## ">>, V, <<"\n">>];
+    [<<"\n\n## ">>, V, <<"\n">>];
 md_tag(h2, V) ->
-    [<<"\n### ">>, V, <<"\n">>];
+    [<<"\n\n### ">>, V, <<"\n">>];
 md_tag(strong, V) ->
     [<<"*">>, V, <<"*">>];
 md_tag(_, V) ->
@@ -111,7 +111,7 @@ perl_gen({Name, {list, ElDesc}}, List, Indent, HTMLOutput) ->
     [?ARG(Name), ?OP_L(" => ["), list_join_with(Res, [?OP_L(", ")]), ?OP_L("]")].
 
 perl_call(Name, ArgsDesc, Values, HTMLOutput) ->
-    {Indent, Preamble} = if HTMLOutput -> {<<"">>, []}; true -> {<<"    ">>, <<"    #!perl\n">>} end,
+    {Indent, Preamble} = if HTMLOutput -> {<<"">>, []}; true -> {<<"    ">>, <<"~~~ perl\n">>} end,
     [Preamble,
      Indent, ?ID_L("XMLRPC::Lite"), ?OP_L("->"), ?ID_L("proxy"), ?OP_L("("), ?ID_L("$url"), ?OP_L(")->"),
      ?ID_L("call"), ?OP_L("("), ?STR_A(Name), ?OP_L(", {"), ?BR, Indent, <<"  ">>,
@@ -150,7 +150,7 @@ java_gen({Name, {list, ElDesc}}, List, Indent, HTMLOutput) ->
      list_join_with(Res, [?OP_L(","), NI]), NI2, ?OP_L("});")].
 
 java_call(Name, ArgsDesc, Values, HTMLOutput) ->
-    {Indent, Preamble} = if HTMLOutput -> {<<"">>, []}; true -> {<<"    ">>, <<"    #!java\n">>} end,
+    {Indent, Preamble} = if HTMLOutput -> {<<"">>, []}; true -> {<<"    ">>, <<"~~~ java\n">>} end,
     [Preamble,
      Indent, ?ID_L("XmlRpcClientConfigImpl config"), ?OP_L(" = "), ?KW_L("new "), ?ID_L("XmlRpcClientConfigImpl"), ?OP_L("();"), ?BR,
      Indent, ?ID_L("config"), ?OP_L("."), ?ID_L("setServerURL"), ?OP_L("("), ?ID_L("url"), ?OP_L(");"), ?BR, Indent, ?BR,
@@ -158,7 +158,7 @@ java_call(Name, ArgsDesc, Values, HTMLOutput) ->
      Indent, ?ID_L("client"), ?OP_L("."), ?ID_L("setConfig"), ?OP_L("("), ?ID_L("config"), ?OP_L(");"), ?BR, Indent, ?BR,
      Indent, ?ID_L("client"), ?OP_L("."), ?ID_L("execute"), ?OP_L("("), ?STR_A(Name), ?OP_L(", "),
      java_gen_map(lists:map(fun({A,B})->java_gen(A, B, Indent, HTMLOutput) end, lists:zip(ArgsDesc, Values)), Indent, HTMLOutput),
-     ?OP_L(");"), ?BR].
+     ?OP_L(");")].
 
 -define(XML_S(N, V), ?OP_L("<"), ?FIELD_L(??N), ?OP_L(">"), V).
 -define(XML_E(N), ?OP_L("</"), ?FIELD_L(??N), ?OP_L(">")).
@@ -202,7 +202,7 @@ xml_gen({Name, {list, ElDesc}}, List, Indent, HTMLOutput) ->
           ?XML(value, Indent, 1, [?XML(array, Indent, 2, [?XML(data, Indent, 3, Res)])])])].
 
 xml_call(Name, ArgsDesc, Values, HTMLOutput) ->
-    {Indent, Preamble} = if HTMLOutput -> {<<"">>, []}; true -> {<<"    ">>, <<"    #!xml">>} end,
+    {Indent, Preamble} = if HTMLOutput -> {<<"">>, []}; true -> {<<"    ">>, <<"~~~ xml">>} end,
     Res = lists:map(fun({A, B}) -> xml_gen(A, B, <<Indent/binary, "          ">>, HTMLOutput) end, lists:zip(ArgsDesc, Values)),
     [Preamble,
      ?XML(methodCall, Indent,
@@ -241,7 +241,7 @@ json_gen({_Name, {list, ElDesc}}, List, Indent, HTMLOutput) ->
     [?OP_L("["), ?BR, Indent2, list_join_with(Res, [?OP_L(","), ?BR, Indent2]), ?BR, Indent, ?OP_L("]")].
 
 json_call(Name, ArgsDesc, Values, ResultDesc, Result, HTMLOutput) ->
-    {Indent, Preamble} = if HTMLOutput -> {<<"">>, []}; true -> {<<"    ">>, <<"    #!json\n">>} end,
+    {Indent, Preamble} = if HTMLOutput -> {<<"">>, []}; true -> {<<"    ">>, <<"~~~ json\n">>} end,
     {Code, ResultStr} = case {ResultDesc, Result} of
                             {{_, rescode}, V} when V == true; V == ok ->
                                 {200, [?STR_L("")]};
@@ -324,10 +324,16 @@ gen_calls(#ejabberd_commands{args_example=Values, args=ArgsDesc,
                    case lists:member(<<"xmlrpc">>, Langs) of true -> ?TAG(li, ?TAG(pre, XML)); _ -> [] end,
                    case lists:member(<<"json">>, Langs) of true -> ?TAG(li, ?TAG(pre, JSON)); _ -> [] end])];
        true ->
-            [case lists:member(<<"java">>, Langs) of true -> [<<"Java example\n\n">>, ?TAG(pre, Java)]; _ -> [] end,
-             case lists:member(<<"perl">>, Langs) of true -> [<<"Perl example\n\n">>, ?TAG(pre, Perl)]; _ -> [] end,
-             case lists:member(<<"xmlrpc">>, Langs) of true -> [<<"XmlRPC example\n\n">>, ?TAG(pre, XML)]; _ -> [] end,
-             case lists:member(<<"json">>, Langs) of true -> [<<"JSON example\n\n">>, ?TAG(pre, JSON)]; _ -> [] end]
+            [<<"\n">>, case lists:member(<<"java">>, Langs) of true -> <<"* Java\n">>; _ -> [] end,
+             case lists:member(<<"perl">>, Langs) of true -> <<"* Perl\n">>; _ -> [] end,
+             case lists:member(<<"xmlrpc">>, Langs) of true -> <<"* XmlRPC\n">>; _ -> [] end,
+             case lists:member(<<"json">>, Langs) of true -> <<"* JSON\n">>; _ -> [] end,
+             <<"{: .code-samples-labels}\n">>,
+             case lists:member(<<"java">>, Langs) of true -> [<<"\n* ">>, ?TAG(pre, Java), <<"~~~\n">>]; _ -> [] end,
+             case lists:member(<<"perl">>, Langs) of true -> [<<"\n* ">>, ?TAG(pre, Perl), <<"~~~\n">>]; _ -> [] end,
+             case lists:member(<<"xmlrpc">>, Langs) of true -> [<<"\n* ">>, ?TAG(pre, XML), <<"~~~\n">>]; _ -> [] end,
+             case lists:member(<<"json">>, Langs) of true -> [<<"\n* ">>, ?TAG(pre, JSON), <<"~~~\n">>]; _ -> [] end,
+             <<"{: .code-samples-tabs}\n\n">>]
     end.
 
 gen_doc(#ejabberd_commands{name=Name, tags=_Tags, desc=Desc, longdesc=LongDesc,
@@ -354,8 +360,9 @@ gen_doc(#ejabberd_commands{name=Name, tags=_Tags, desc=Desc, longdesc=LongDesc,
                      none ->
                          [?RAW(io_lib:format("~p", [Result]))];
                      _ ->
-                         [?RAW(io_lib:format("~p", [Result])),
-                          ?TAG_R(p, ResultDesc)]
+                         [?TAG(dl, [
+			       ?TAG(dt, io_lib:format("~p", [Result])),
+			       ?TAG_R(dd, ResultDesc)])]
                  end,
 
     [?TAG(h1, [?TAG(strong, atom_to_list(Name)), <<" - ">>, ?RAW(Desc)]),
@@ -367,10 +374,27 @@ gen_doc(#ejabberd_commands{name=Name, tags=_Tags, desc=Desc, longdesc=LongDesc,
      ?TAG(h2, <<"Examples:">>),
      gen_calls(Cmd, HTMLOutput, Langs)].
 
+find_commands_definitions() ->
+    case code:lib_dir(ejabberd, ebin) of
+        {error, _} ->
+            lists:map(fun({N, _, _}) ->
+                              ejabberd_commands:get_command_definition(N)
+                      end, ejabberd_commands:list_commands());
+        Path ->
+            lists:flatmap(fun(P) ->
+                                  Mod = list_to_atom(filename:rootname(P)),
+                                  code:ensure_loaded(Mod),
+                                  case erlang:function_exported(Mod, get_commands_spec, 0) of
+                                      true ->
+                                          apply(Mod, get_commands_spec, []);
+                                      _ ->
+                                          []
+                                  end
+                          end, filelib:wildcard("*.beam", Path))
+    end.
+
 generate_html_output(File, RegExp, Languages) ->
-    Cmds = lists:map(fun({N, _, _}) ->
-                             ejabberd_commands:get_command_definition(N)
-                     end, ejabberd_commands:list_commands()),
+    Cmds = find_commands_definitions(),
     {ok, RE} = re:compile(RegExp),
     Cmds2 = lists:filter(fun(#ejabberd_commands{name=Name, module=Module}) ->
                                  re:run(atom_to_list(Name), RE, [{capture, none}]) == match orelse
@@ -387,9 +411,7 @@ generate_html_output(File, RegExp, Languages) ->
     ok.
 
 generate_md_output(File, RegExp, Languages) ->
-    Cmds = lists:map(fun({N, _, _}) ->
-                             ejabberd_commands:get_command_definition(N)
-                     end, ejabberd_commands:list_commands()),
+    Cmds = find_commands_definitions(),
     {ok, RE} = re:compile(RegExp),
     Cmds2 = lists:filter(fun(#ejabberd_commands{name=Name, module=Module}) ->
                                  re:run(atom_to_list(Name), RE, [{capture, none}]) == match orelse
@@ -399,9 +421,10 @@ generate_md_output(File, RegExp, Languages) ->
                                N1 =< N2
                        end, Cmds2),
     Langs = binary:split(Languages, <<",">>, [global]),
+    Header = <<"---\ntitle: Administration API reference\nbodyclass: nocomment\n---">>,
     Out = lists:map(fun(C) -> gen_doc(C, false, Langs) end, Cmds3),
     {ok, Fh} = file:open(File, [write]),
-    io:format(Fh, "~s", [[Out]]),
+    io:format(Fh, "~s~s", [Header, Out]),
     file:close(Fh),
     ok.
 

src/ejabberd_config.erl

@@ -5,7 +5,7 @@
 %%% Created : 14 Dec 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -162,7 +162,7 @@ convert_to_yaml(File, Output) ->
                          fun({Host, Opts1}) ->
                                  {host_config, [{Host, Opts1}]}
                          end, HOpts),
-    Data = p1_yaml:encode(lists:reverse(NewOpts)),
+    Data = fast_yaml:encode(lists:reverse(NewOpts)),
     case Output of
         stdout ->
             io:format("~s~n", [Data]);
@@ -226,14 +226,14 @@ get_plain_terms_file(File1, Opts) ->
 consult(File) ->
     case filename:extension(File) of
         Ex when (Ex == ".yml") or (Ex == ".yaml") ->
-            case p1_yaml:decode_from_file(File, [plain_as_atom]) of
+            case fast_yaml:decode_from_file(File, [plain_as_atom]) of
                 {ok, []} ->
                     {ok, []};
                 {ok, [Document|_]} ->
                     {ok, parserl(Document)};
                 {error, Err} ->
                     Msg1 = "Cannot load " ++ File ++ ": ",
-                    Msg2 = p1_yaml:format_error(Err),
+                    Msg2 = fast_yaml:format_error(Err),
                     {error, Msg1 ++ Msg2}
             end;
         _ ->

src/ejabberd_ctl.erl

@@ -5,7 +5,7 @@
 %%% Created : 11 Jan 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -324,7 +324,7 @@ format_args(Args, ArgsFormat) ->
 format_arg(Arg, integer) ->
     format_arg2(Arg, "~d");
 format_arg(Arg, binary) ->
-    list_to_binary(format_arg(Arg, string));
+    unicode:characters_to_binary(Arg, utf8);
 format_arg("", string) ->
     "";
 format_arg(Arg, string) ->
@@ -349,7 +349,7 @@ format_result(Atom, {_Name, atom}) ->
 format_result(Int, {_Name, integer}) ->
     io_lib:format("~p", [Int]);
 
-format_result(String, {_Name, string}) when is_list(String) ->
+format_result([A|_]=String, {_Name, string}) when is_list(String) and is_integer(A) ->
     io_lib:format("~s", [String]);
 
 format_result(Binary, {_Name, string}) when is_binary(Binary) ->

src/ejabberd_frontend_socket.erl

@@ -5,7 +5,7 @@
 %%% Created : 23 Aug 2006 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -148,20 +148,20 @@ init([Module, SockMod, Socket, Opts, Receiver]) ->
 		receiver = Receiver}}.
 
 handle_call({starttls, TLSOpts}, _From, State) ->
-    {ok, TLSSocket} = p1_tls:tcp_to_tls(State#state.socket, TLSOpts),
+    {ok, TLSSocket} = fast_tls:tcp_to_tls(State#state.socket, TLSOpts),
     ejabberd_receiver:starttls(State#state.receiver, TLSSocket),
     Reply = ok,
-    {reply, Reply, State#state{socket = TLSSocket, sockmod = p1_tls},
+    {reply, Reply, State#state{socket = TLSSocket, sockmod = fast_tls},
      ?HIBERNATE_TIMEOUT};
 
 handle_call({starttls, TLSOpts, Data}, _From, State) ->
-    {ok, TLSSocket} = p1_tls:tcp_to_tls(State#state.socket, TLSOpts),
+    {ok, TLSSocket} = fast_tls:tcp_to_tls(State#state.socket, TLSOpts),
     ejabberd_receiver:starttls(State#state.receiver, TLSSocket),
     catch (State#state.sockmod):send(
 	    State#state.socket, Data),
     Reply = ok,
     {reply, Reply,
-     State#state{socket = TLSSocket, sockmod = p1_tls},
+     State#state{socket = TLSSocket, sockmod = fast_tls},
      ?HIBERNATE_TIMEOUT};
 handle_call({compress, Data}, _From, State) ->
     {ok, ZlibSocket} =
@@ -187,10 +187,10 @@ handle_call(get_sockmod, _From, State) ->
     Reply = State#state.sockmod,
     {reply, Reply, State, ?HIBERNATE_TIMEOUT};
 handle_call(get_peer_certificate, _From, State) ->
-    Reply = p1_tls:get_peer_certificate(State#state.socket),
+    Reply = fast_tls:get_peer_certificate(State#state.socket),
     {reply, Reply, State, ?HIBERNATE_TIMEOUT};
 handle_call(get_verify_result, _From, State) ->
-    Reply = p1_tls:get_verify_result(State#state.socket),
+    Reply = fast_tls:get_verify_result(State#state.socket),
     {reply, Reply, State, ?HIBERNATE_TIMEOUT};
 handle_call(close, _From, State) ->
     ejabberd_receiver:close(State#state.receiver),
@@ -236,9 +236,9 @@ check_starttls(SockMod, Socket, Receiver, Opts) ->
 			      (_) -> false
 			   end, Opts),
     if TLSEnabled ->
-	    {ok, TLSSocket} = p1_tls:tcp_to_tls(Socket, TLSOpts),
+	    {ok, TLSSocket} = fast_tls:tcp_to_tls(Socket, TLSOpts),
 	    ejabberd_receiver:starttls(Receiver, TLSSocket),
-	    {p1_tls, TLSSocket};
+	    {fast_tls, TLSSocket};
 	true ->
 	    {SockMod, Socket}
     end.

src/ejabberd_hooks.erl

@@ -5,7 +5,7 @@
 %%% Created :  8 Aug 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_http.erl

@@ -5,7 +5,7 @@
 %%% Created : 27 Feb 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2015   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -117,9 +117,9 @@ init({SockMod, Socket}, Opts) ->
     TLSOpts = [verify_none | TLSOpts3],
     {SockMod1, Socket1} = if TLSEnabled ->
 				 inet:setopts(Socket, [{recbuf, 8192}]),
-				 {ok, TLSSocket} = p1_tls:tcp_to_tls(Socket,
+				 {ok, TLSSocket} = fast_tls:tcp_to_tls(Socket,
 								  TLSOpts),
-				 {p1_tls, TLSSocket};
+				 {fast_tls, TLSSocket};
 			     true -> {SockMod, Socket}
 			  end,
     Captcha = case proplists:get_bool(captcha, Opts) of
@@ -328,8 +328,8 @@ get_transfer_protocol(SockMod, HostPort) ->
       {gen_tcp, []} -> {Host, 80, http};
       {gen_tcp, [Port]} ->
 	  {Host, jlib:binary_to_integer(Port), http};
-      {p1_tls, []} -> {Host, 443, https};
-      {p1_tls, [Port]} ->
+      {fast_tls, []} -> {Host, 443, https};
+      {fast_tls, [Port]} ->
 	  {Host, jlib:binary_to_integer(Port), https}
     end.
 
@@ -532,10 +532,10 @@ make_xhtml_output(State, Status, Headers, XHTML) ->
     Data = case lists:member(html, Headers) of
 	true ->
 	    iolist_to_binary([?HTML_DOCTYPE,
-		    xml:element_to_binary(XHTML)]);
+		    fxml:element_to_binary(XHTML)]);
 	_ ->
 	    iolist_to_binary([?XHTML_DOCTYPE,
-		    xml:element_to_binary(XHTML)])
+		    fxml:element_to_binary(XHTML)])
     end,
     Headers1 = case lists:keysearch(<<"Content-Type">>, 1,
 				    Headers)