* doc/guide.tex: Fix some English strings: JID -> Jabber ID;

jabberd 1.4 -> jabberd14; commited -> committed
* src/*/*.erl: Likewise
* src/msgs/*.msg: Likewise
* src/msgs/*.po: Likewise

SVN Revision: 1810

56 files changed, 483 insertions, 475 deletions

diff --git a/ChangeLog b/ChangeLog
index d31de112e..5d673ef0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-12  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Fix some English strings: JID -> Jabber ID;
+	jabberd 1.4 -> jabberd14; commited -> committed
+	* src/*/*.erl: Likewise
+	* src/msgs/*.msg: Likewise
+	* src/msgs/*.po: Likewise
+
 2009-01-12  Alexey Shchepin  <alexey@process-one.net>
 
 	* src/odbc/ejabberd_odbc.erl: Fixed processing of UPDATE results
diff --git a/doc/guide.tex b/doc/guide.tex
index 49b270f14..6e2422af5 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -1004,8 +1004,8 @@ In this example, the following configuration defines that:
 {{s2s_host,"jabber.example.org"}, allow}.
 {{s2s_host,"example.com"}, allow}.
 \end{verbatim}
-Note, that for \ind{jabberd 1.4}jabberd 1.4- or \ind{WPJabber}WPJabber-based
-services you have to make the transports log and do \ind{XDB}XDB by themselves:
+Note, that for services based in \ind{jabberd14}jabberd14 or \ind{WPJabber}WPJabber
+you have to make the transports log and do \ind{XDB}XDB by themselves:
 \begin{verbatim}
   <!--
      You have to add elogger and rlogger entries here when using ejabberd.
@@ -1028,7 +1028,7 @@ services you have to make the transports log and do \ind{XDB}XDB by themselves:
   <xdb id="xdb">
     <host/>
     <load>
-      <!-- this is a lib of wpjabber or jabberd -->
+      <!-- this is a lib of wpjabber or jabberd14 -->
       <xdb_file>/usr/lib/jabber/xdb_file.so</xdb_file>
       </load>
     <xdb_file xmlns="jabber:config:xdb_file">
diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl
index 98b1f4919..8caf6e5ff 100644
--- a/src/ejabberd_admin.erl
+++ b/src/ejabberd_admin.erl
@@ -96,11 +96,11 @@ commands() ->
 			result = {users, {list, {username, string}}}},
 
      #ejabberd_commands{name = import_file, tags = [mnesia],
-			desc = "Import user data from jabberd-1.4 spool file",
+			desc = "Import user data from jabberd14 spool file",
 			module = ?MODULE, function = import_file,
 			args = [{file, string}], result = {res, restuple}},
      #ejabberd_commands{name = import_dir, tags = [mnesia],
-			desc = "Import user data from jabberd-1.4 spool dir",
+			desc = "Import user data from jabberd14 spool dir",
 			module = ?MODULE, function = import_dir,
 			args = [{file, string}],
 			result = {res, restuple}},
@@ -215,7 +215,7 @@ import_file(Path) ->
         ok ->
             {ok, ""};
         {error, Reason} ->
-            String = io_lib:format("Can't import jabberd 1.4 spool file ~p at node ~p: ~p",
+            String = io_lib:format("Can't import jabberd14 spool file ~p at node ~p: ~p",
 				   [filename:absname(Path), node(), Reason]),
 	    {cannot_import_file, String}
     end.
@@ -225,7 +225,7 @@ import_dir(Path) ->
         ok ->
             {ok, ""};
         {error, Reason} ->
-            String = io_lib:format("Can't import jabberd 1.4 spool dir ~p at node ~p: ~p",
+            String = io_lib:format("Can't import jabberd14 spool dir ~p at node ~p: ~p",
 				   [filename:absname(Path), node(), Reason]),
 	    {cannot_import_dir, String}
     end.
diff --git a/src/jd2ejd.erl b/src/jd2ejd.erl
index 8dc67d63d..c04299801 100644
--- a/src/jd2ejd.erl
+++ b/src/jd2ejd.erl
@@ -1,7 +1,7 @@
 %%%----------------------------------------------------------------------
 %%% File    : jd2ejd.erl
 %%% Author  : Alexey Shchepin <alexey@process-one.net>
-%%% Purpose : Import of jabberd1.4 user spool file
+%%% Purpose : Import of jabberd14 user spool file
 %%% Created :  2 Feb 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
diff --git a/src/mod_configure.erl b/src/mod_configure.erl
index 5035b981d..bbb63a2d9 100644
--- a/src/mod_configure.erl
+++ b/src/mod_configure.erl
@@ -544,7 +544,7 @@ get_local_items({global, _Host}, ["running nodes", ENode], Server, Lang) ->
      [?NODE("Database", "running nodes/" ++ ENode ++ "/DB"),
       ?NODE("Modules", "running nodes/" ++ ENode ++ "/modules"),
       ?NODE("Backup Management", "running nodes/" ++ ENode ++ "/backup"),
-      ?NODE("Import Users From jabberd 1.4 Spool Files",
+      ?NODE("Import Users From jabberd14 Spool Files",
 	    "running nodes/" ++ ENode ++ "/import"),
       ?NODE("Restart Service", "running nodes/" ++ ENode ++ "/restart"),
       ?NODE("Shut Down Service", "running nodes/" ++ ENode ++ "/shutdown")
@@ -994,7 +994,7 @@ get_form(_Host, ["running nodes", ENode, "import", "file"], Lang) ->
 	        {xmlelement, "instructions", [],
 	         [{xmlcdata,
 	           ?T(
-		      Lang, "Enter path to jabberd1.4 spool file")}]},
+		      Lang, "Enter path to jabberd14 spool file")}]},
 		?XFIELD("text-single", "Path to File", "path", "")
 	       ]}]};
 
@@ -1008,7 +1008,7 @@ get_form(_Host, ["running nodes", ENode, "import", "dir"], Lang) ->
 	        {xmlelement, "instructions", [],
 	         [{xmlcdata,
 	           ?T(
-		      Lang, "Enter path to jabberd1.4 spool dir")}]},
+		      Lang, "Enter path to jabberd14 spool dir")}]},
 		?XFIELD("text-single", "Path to Dir", "path", "")
 	       ]}]};
 
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index 25ec13b4a..16de90cbf 100644
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -2187,7 +2187,7 @@ find_changed_items(UJID, UAffiliation, URole,
 			   ErrText = io_lib:format(
 				       translate:translate(
 					 Lang,
-					 "JID ~s is invalid"), [S]),
+					 "Jabber ID ~s is invalid"), [S]),
 			   {error, ?ERRT_NOT_ACCEPTABLE(Lang, ErrText)};
 		       J ->
 			   {value, J}
@@ -2728,7 +2728,7 @@ get_config(Lang, StateData, From) ->
 	 },
 	 {xmlelement, "field",
 	  [{"type", "list-single"},
-	   {"label", translate:translate(Lang, "Present real JIDs to")},
+	   {"label", translate:translate(Lang, "Present real Jabber IDs to")},
 	   {"var", "muc#roomconfig_whois"}],
 	  [{xmlelement, "value", [], [{xmlcdata,
 				       if Config#config.anonymous ->
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 6808e64ab..291c5189c 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -1028,7 +1028,7 @@ send_authorization_request(Host, Node, Subscriber) ->
 		 {xmlelement, "field",
 		  [{"var", "pubsub#allow"},
 		   {"type", "boolean"},
-		   {"label", translate:translate(Lang, "Allow this JID to subscribe to this pubsub node?")}],
+		   {"label", translate:translate(Lang, "Allow this Jabber ID to subscribe to this pubsub node?")}],
 		  [{xmlelement, "value", [], [{xmlcdata, "false"}]}]}]}]},
     case tree_action(Host, get_node, [Host, Node, Subscriber]) of
 	#pubsub_node{owners = Owners} ->
diff --git a/src/mod_stats.erl b/src/mod_stats.erl
index 8e6d280d7..af01ba1c8 100644
--- a/src/mod_stats.erl
+++ b/src/mod_stats.erl
@@ -101,7 +101,7 @@ get_local_stats(_Server, ["running nodes", _], []) ->
      [?STAT("time/uptime"),
       ?STAT("time/cputime"),
       ?STAT("users/online"),
-      ?STAT("transactions/commited"),
+      ?STAT("transactions/committed"),
       ?STAT("transactions/aborted"),
       ?STAT("transactions/restarted"),
       ?STAT("transactions/logged")
@@ -200,7 +200,7 @@ get_node_stat(Node, Name) when Name == "users/online" ->
 	    ?STATVAL(integer_to_list(length(Users)), "users")
     end;
 
-get_node_stat(Node, Name) when Name == "transactions/commited" ->
+get_node_stat(Node, Name) when Name == "transactions/committed" ->
     case catch rpc:call(Node, mnesia, system_info, [transaction_commits]) of
 	{badrpc, _Reason} ->
 	    ?STATERR("500", "Internal Server Error");
diff --git a/src/msgs/ca.msg b/src/msgs/ca.msg
index b4abbcb44..f227aa851 100644
--- a/src/msgs/ca.msg
+++ b/src/msgs/ca.msg
@@ -14,7 +14,7 @@
 {"Administrator privileges required","Es necessita tenir privilegis d'administrador"}.
 {"A friendly name for the node","Un nom per al node"}.
 {"All activity","Tota l'activitat"}.
-{"Allow this JID to subscribe to this pubsub node?","Permetre que aquesta JID es puga subscriure a aquest node pubsub"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Permetre que aquesta JID es puga subscriure a aquest node pubsub"}.
 {"Allow users to change subject","Permetre que els usuaris canvien el tema"}.
 {"Allow users to query other users","Permetre que els usuaris fagen peticions a altres usuaris"}.
 {"Allow users to send invites","Permetre que els usuaris envien invitacions"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","Introdueix llista de {mòdul, [opcions]}"}.
 {"Enter nickname you want to register","Introdueix el nickname que vols registrar"}.
 {"Enter path to backup file","Introdueix ruta al fitxer de còpia de seguretat"}.
-{"Enter path to jabberd1.4 spool dir","Introdueix la ruta al directori de jabberd1.4 spools"}.
-{"Enter path to jabberd1.4 spool file","Introdueix ruta al fitxer jabberd1.4 spool"}.
+{"Enter path to jabberd14 spool dir","Introdueix la ruta al directori de jabberd14 spools"}.
+{"Enter path to jabberd14 spool file","Introdueix ruta al fitxer jabberd14 spool"}.
 {"Enter path to text file","Introdueix ruta al fitxer de text"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Introdueix el nom d'usuari i les codificacions de caràcters per a utilitzar als servidors de IRC"}.
 {"Erlang Jabber Server","Servidor Erlang Jabber"}.
@@ -113,7 +113,7 @@
 {"Import File","Importar fitxer"}.
 {"Import User from File at ","Importa usuari des de fitxer en "}.
 {"Import Users from Dir at ","Importar usuaris des del directori en "}.
-{"Import Users From jabberd 1.4 Spool Files","Importar usuaris de jabberd 1.4"}.
+{"Import Users From jabberd14 Spool Files","Importar usuaris de jabberd14"}.
 {"Improper message type","Tipus de missatge incorrecte"}.
 {"Incorrect password","Password incorrecte"}.
 {"Invalid affiliation: ~s","Afiliació invàlida: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages to the conference","No està permés l'enviament de missatges privats a la sala"}.
 {"Jabber ID","ID Jabber"}.
 {"January","Gener"}.
-{"JID ~s is invalid","El JID ~s no és vàlid"}.
+{"Jabber ID ~s is invalid","El JID ~s no és vàlid"}.
 {"joins the room","Entrar a la sala"}.
 {"July","Juliol"}.
 {"June","Juny"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Port"}.
-{"Present real JIDs to","Presentar JID's reals a"}.
+{"Present real Jabber IDs to","Presentar JID's reals a"}.
 {"private, ","privat"}.
 {"Publish-Subscribe","Publicar-subscriure't"}.
 {"PubSub subscriber request","Petició de PubSub subscriure"}.
@@ -307,7 +307,7 @@
 {"To ~s","A ~s"}.
 {"Traffic rate limit is exceeded","El llímit de tràfic ha sigut sobrepassat"}.
 {"Transactions Aborted:","Transaccions Avortades"}.
-{"Transactions Commited:","Transaccions Realitzades:"}.
+{"Transactions Committed:","Transaccions Realitzades:"}.
 {"Transactions Logged:","Transaccions registrades"}.
 {"Transactions Restarted:","Transaccions reiniciades"}.
 {"Tuesday","Dimarts"}.
diff --git a/src/msgs/ca.po b/src/msgs/ca.po
index 63393dd2d..661a6085e 100644
--- a/src/msgs/ca.po
+++ b/src/msgs/ca.po
@@ -224,8 +224,8 @@ msgid "Backup Management"
 msgstr "Gestió de còpia de seguretat"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "Importar usuaris de jabberd 1.4"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "Importar usuaris de jabberd14"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -309,16 +309,16 @@ msgid "Import User from File at "
 msgstr "Importa usuari des de fitxer en "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Introdueix ruta al fitxer jabberd1.4 spool"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Introdueix ruta al fitxer jabberd14 spool"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Importar usuaris des del directori en "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Introdueix la ruta al directori de jabberd1.4 spools"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Introdueix la ruta al directori de jabberd14 spools"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -757,8 +757,8 @@ msgid "Moderator privileges required"
 msgstr "Es necessita tenir privilegis de moderador"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "El JID ~s no és vàlid"
+msgid "Jabber ID ~s is invalid"
+msgstr "El Jabber ID ~s no és vàlid"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -810,8 +810,8 @@ msgid "No limit"
 msgstr "Sense Llímit"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "Presentar JID's reals a"
+msgid "Present real Jabber IDs to"
+msgstr "Presentar Jabber ID's reals a"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -953,8 +953,8 @@ msgid "Subscriber Address"
 msgstr "Adreça del Subscriptor"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "Permetre que aquesta JID es puga subscriure a aquest node pubsub"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "Permetre que aquesta Jabber ID es puga subscriure a aquest node pubsub"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1437,7 +1437,7 @@ msgid "CPU Time:"
 msgstr "Temps de CPU"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Transaccions Realitzades:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/cs.msg b/src/msgs/cs.msg
index 2e3be06e4..b78f67ecb 100644
--- a/src/msgs/cs.msg
+++ b/src/msgs/cs.msg
@@ -6,7 +6,7 @@
 {"Access rules","Pravidla přístupů"}.
 {"Access Rules","Pravidla přístupů"}.
 {"Action on user","Akce aplikovaná na uživatele"}.
-{"Add Jabber ID","Přidat JID"}.
+{"Add Jabber ID","Přidat Jabber ID"}.
 {"Add New","Přidat nový"}.
 {"Add User","Přidat uživatele"}.
 {"Administration","Administrace"}.
@@ -14,7 +14,7 @@
 {"Administrator privileges required","Jsou potřebná práva administrátora"}.
 {"A friendly name for the node","Přívětivé jméno pro uzel"}.
 {"All activity","Všechny aktivity"}.
-{"Allow this JID to subscribe to this pubsub node?","Povolit tomuto JID odebírat tento pubsub uzel?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Povolit tomuto JID odebírat tento pubsub uzel?"}.
 {"Allow users to change subject","Povolit uživatelům měnit téma místnosti"}.
 {"Allow users to query other users","Povolit uživatelům odesílat požadavky (query) ostatním uživatelům"}.
 {"Allow users to send invites","Povolit uživatelům posílání pozvánek"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","Vložte seznam modulů {Modul, [Parametry]}"}.
 {"Enter nickname you want to register","Zadejte přezdívku, kterou chcete zaregistrovat"}.
 {"Enter path to backup file","Zadajte cestu k souboru se zálohou"}.
-{"Enter path to jabberd1.4 spool dir","Zadejte cestu k jabberd1.4 spool adresáři"}.
-{"Enter path to jabberd1.4 spool file","Zadejte cestu k spool souboru jabberd1.4"}.
+{"Enter path to jabberd14 spool dir","Zadejte cestu k jabberd14 spool adresáři"}.
+{"Enter path to jabberd14 spool file","Zadejte cestu k spool souboru jabberd14"}.
 {"Enter path to text file","Zadajte cestu k textovému souboru"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Vložte jméno uživatele a kódování, které chcete používat při připojení na IRC server"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
@@ -113,7 +113,7 @@
 {"Import File","Import souboru"}.
 {"Import User from File at ","Importovat uživatele ze souboru na "}.
 {"Import Users from Dir at ","Importovat uživatele z adresáře na "}.
-{"Import Users From jabberd 1.4 Spool Files","Importovat uživatele z jabberd 1.4 spool souborů"}.
+{"Import Users From jabberd14 Spool Files","Importovat uživatele z jabberd14 spool souborů"}.
 {"Improper message type","Nesprávný typ zprávy"}.
 {"Incorrect password","Nesprávné heslo"}.
 {"Invalid affiliation: ~s","Neplatné přiřazení: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages to the conference","Není povoleno odesílat soukromé zprávy do konference"}.
 {"Jabber ID","Jabber ID"}.
 {"January",". ledna"}.
-{"JID ~s is invalid","JID ~s je neplatné"}.
+{"Jabber ID ~s is invalid","JID ~s je neplatné"}.
 {"joins the room","vstoupil(a) do místnosti"}.
 {"July",". července"}.
 {"June",". června"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Port"}.
-{"Present real JIDs to","Odhalovat skutečná Jabber ID"}.
+{"Present real Jabber IDs to","Odhalovat skutečná Jabber ID"}.
 {"private, ","soukromá, "}.
 {"Publish-Subscribe","Publish-Subscribe"}.
 {"PubSub subscriber request","Žádost odběratele PubSub"}.
@@ -307,7 +307,7 @@
 {"To ~s","Pro ~s"}.
 {"Traffic rate limit is exceeded","Byl překročen limit"}.
 {"Transactions Aborted:","Transakce zrušena"}.
-{"Transactions Commited:","Transakce potvrzena"}.
+{"Transactions Committed:","Transakce potvrzena"}.
 {"Transactions Logged:","Transakce zaznamenána"}.
 {"Transactions Restarted:","Transakce restartována"}.
 {"Tuesday","Úterý"}.
diff --git a/src/msgs/cs.po b/src/msgs/cs.po
index e02387e6e..7f1e857b2 100644
--- a/src/msgs/cs.po
+++ b/src/msgs/cs.po
@@ -224,8 +224,8 @@ msgid "Backup Management"
 msgstr "Správa zálohování"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "Importovat uživatele z jabberd 1.4 spool souborů"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "Importovat uživatele z jabberd14 spool souborů"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -309,16 +309,16 @@ msgid "Import User from File at "
 msgstr "Importovat uživatele ze souboru na "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Zadejte cestu k spool souboru jabberd1.4"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Zadejte cestu k spool souboru jabberd14"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Importovat uživatele z adresáře na "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Zadejte cestu k jabberd1.4 spool adresáři"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Zadejte cestu k jabberd14 spool adresáři"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -749,8 +749,8 @@ msgid "Moderator privileges required"
 msgstr "Jsou potřebná práva moderátora"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "JID ~s je neplatné"
+msgid "Jabber ID ~s is invalid"
+msgstr "Jabber ID ~s je neplatné"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -802,7 +802,7 @@ msgid "No limit"
 msgstr "Bez limitu"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
+msgid "Present real Jabber IDs to"
 msgstr "Odhalovat skutečná Jabber ID"
 
 #: mod_muc/mod_muc_room.erl:2741
@@ -943,8 +943,8 @@ msgid "Subscriber Address"
 msgstr "Adresa odběratele"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "Povolit tomuto JID odebírat tento pubsub uzel?"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "Povolit tomuto Jabber ID odebírat tento pubsub uzel?"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1056,7 +1056,7 @@ msgstr "Nesprávný formát"
 
 #: mod_roster.erl:855 mod_roster_odbc.erl:962
 msgid "Add Jabber ID"
-msgstr "Přidat JID"
+msgstr "Přidat Jabber ID"
 
 #: mod_roster.erl:936 mod_roster_odbc.erl:1043
 msgid "Roster"
@@ -1427,7 +1427,7 @@ msgid "CPU Time:"
 msgstr "Čas procesoru"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Transakce potvrzena"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/de.msg b/src/msgs/de.msg
index 8e45f01ed..f85b405da 100644
--- a/src/msgs/de.msg
+++ b/src/msgs/de.msg
@@ -14,7 +14,7 @@
 {"Administrator privileges required","Administratorenrechte benötigt"}.
 {"A friendly name for the node","Ein passender Name für den Knoten"}.
 {"All activity","Alle Aktivitäten"}.
-{"Allow this JID to subscribe to this pubsub node?","Erlauben Sie dieser JID das Abonnement dieses pubsub Knotens?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Erlauben Sie dieser JID das Abonnement dieses pubsub Knotens?"}.
 {"Allow users to change subject","Erlaube Benutzern das Thema zu ändern"}.
 {"Allow users to query other users","Erlaube Benutzern andere Benutzer abzufragen"}.
 {"Allow users to send invites","Erlaube Benutzern Einladungen zu senden"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","Geben Sie eine Liste bestehend aus {Modul, [Optionen]} ein"}.
 {"Enter nickname you want to register","Geben Sie den zu registrierenden Spitznamen ein"}.
 {"Enter path to backup file","Geben Sie den Pfad zur Datensicherung ein"}.
-{"Enter path to jabberd1.4 spool dir","Geben Sie den Pfad zum jabberd1.4 spool Verzeichnis ein"}.
-{"Enter path to jabberd1.4 spool file","Geben Sie den Pfad zur jabberd1.4 spool Datei ein"}.
+{"Enter path to jabberd14 spool dir","Geben Sie den Pfad zum jabberd14 spool Verzeichnis ein"}.
+{"Enter path to jabberd14 spool file","Geben Sie den Pfad zur jabberd14 spool Datei ein"}.
 {"Enter path to text file","Geben Sie den Pfad zur Textdatei ein"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Geben Sie Benutzernamen und Kodierung für die Verbindung zum IRC Server an"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
@@ -113,7 +113,7 @@
 {"Import File","Datei importieren"}.
 {"Import User from File at ","Benutzer aus dieser Datei importieren "}.
 {"Import Users from Dir at ","Benutzer vom Verzeichnis importieren "}.
-{"Import Users From jabberd 1.4 Spool Files","Importiere Benutzer von jabberd 1.4 Spool Dateien"}.
+{"Import Users From jabberd14 Spool Files","Importiere Benutzer von jabberd14 Spool Dateien"}.
 {"Improper message type","Unzulässiger Nachrichtentyp"}.
 {"Incorrect password","Falsches Passwort"}.
 {"Invalid affiliation: ~s","Ungültige Mitgliedschaft: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages to the conference","Es ist nicht erlaubt private Nachrichten an den Raum zu schicken"}.
 {"Jabber ID","Jabber ID"}.
 {"January","Januar"}.
-{"JID ~s is invalid","JID ~s ist ungültig"}.
+{"Jabber ID ~s is invalid","JID ~s ist ungültig"}.
 {"joins the room","kommt in den Raum"}.
 {"July","Juli"}.
 {"June","Juni"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Port"}.
-{"Present real JIDs to","Echte Jabber IDs anzeigen für"}.
+{"Present real Jabber IDs to","Echte Jabber IDs anzeigen für"}.
 {"private, ","privat, "}.
 {"Publish-Subscribe","Publish-Subscribe"}.
 {"PubSub subscriber request","PubSub Abonnenten Anfrage"}.
@@ -307,7 +307,7 @@
 {"To","Zu"}.
 {"Traffic rate limit is exceeded","Datenrate ist zu hoch"}.
 {"Transactions Aborted:","Vorgänge abgebrochen:"}.
-{"Transactions Commited:","Vorgänge durchgeführt:"}.
+{"Transactions Committed:","Vorgänge durchgeführt:"}.
 {"Transactions Logged:","Vorgänge protokolliert:"}.
 {"Transactions Restarted:","Vorgänge neu gestartet:"}.
 {"Tuesday","Dienstag"}.
diff --git a/src/msgs/de.po b/src/msgs/de.po
index 6537c1dda..6b5dab270 100644
--- a/src/msgs/de.po
+++ b/src/msgs/de.po
@@ -230,8 +230,8 @@ msgid "Backup Management"
 msgstr "Datensicherungsmanagement"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "Importiere Benutzer von jabberd 1.4 Spool Dateien"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "Importiere Benutzer von jabberd14 Spool Dateien"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -315,16 +315,16 @@ msgid "Import User from File at "
 msgstr "Benutzer aus dieser Datei importieren "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Geben Sie den Pfad zur jabberd1.4 spool Datei ein"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Geben Sie den Pfad zur jabberd14 spool Datei ein"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Benutzer vom Verzeichnis importieren "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Geben Sie den Pfad zum jabberd1.4 spool Verzeichnis ein"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Geben Sie den Pfad zum jabberd14 spool Verzeichnis ein"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -762,8 +762,8 @@ msgid "Moderator privileges required"
 msgstr "Moderatorrechte benötigt"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "JID ~s ist ungültig"
+msgid "Jabber ID ~s is invalid"
+msgstr "Jabber ID ~s ist ungültig"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -815,7 +815,7 @@ msgid "No limit"
 msgstr "keine Begrenzung"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
+msgid "Present real Jabber IDs to"
 msgstr "Echte Jabber IDs anzeigen für"
 
 #: mod_muc/mod_muc_room.erl:2741
@@ -959,8 +959,8 @@ msgid "Subscriber Address"
 msgstr "Abonnenten Adresse"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "Erlauben Sie dieser JID das Abonnement dieses pubsub Knotens?"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "Erlauben Sie dieser Jabber ID das Abonnement dieses pubsub Knotens?"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1444,7 +1444,7 @@ msgid "CPU Time:"
 msgstr "CPU Zeit:"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Vorgänge durchgeführt:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/ejabberd.pot b/src/msgs/ejabberd.pot
index 0f4a204cd..47c6da98b 100644
--- a/src/msgs/ejabberd.pot
+++ b/src/msgs/ejabberd.pot
@@ -223,7 +223,7 @@ msgid "Backup Management"
 msgstr ""
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
+msgid "Import Users From jabberd14 Spool Files"
 msgstr ""
 
 #: mod_configure.erl:649
@@ -308,7 +308,7 @@ msgid "Import User from File at "
 msgstr ""
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
+msgid "Enter path to jabberd14 spool file"
 msgstr ""
 
 #: mod_configure.erl:990
@@ -316,7 +316,7 @@ msgid "Import Users from Dir at "
 msgstr ""
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
+msgid "Enter path to jabberd14 spool dir"
 msgstr ""
 
 #: mod_configure.erl:995
@@ -1407,7 +1407,7 @@ msgid "CPU Time:"
 msgstr ""
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr ""
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/eo.msg b/src/msgs/eo.msg
index eee050c2f..f4806fd0d 100644
--- a/src/msgs/eo.msg
+++ b/src/msgs/eo.msg
@@ -14,7 +14,7 @@
 {"Administrator privileges required","Administrantaj rajtoj bezonata"}.
 {"A friendly name for the node","Kromnomo por ĉi tiu nodo"}.
 {"All activity","Ĉiu aktiveco"}.
-{"Allow this JID to subscribe to this pubsub node?","Ĉu permesi ĉi tiun JID aboni al la jena PubAbo-nodo"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Ĉu permesi ĉi tiun JID aboni al la jena PubAbo-nodo"}.
 {"Allow users to change subject","Permesu uzantojn ŝanĝi la temon"}.
 {"Allow users to query other users","Permesu uzantojn informpeti aliajn uzantojn"}.
 {"Allow users to send invites","Permesu uzantojn sendi invitojn"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","Enmetu liston de {Modulo, [Elektebloj]}"}.
 {"Enter nickname you want to register","Enmetu kaŝnomon kiun vi volas registri"}.
 {"Enter path to backup file","Enmetu vojon por sekurkopio"}.
-{"Enter path to jabberd1.4 spool dir","Enmetu vojon al jabberd1.4-uzantdosierujo"}.
-{"Enter path to jabberd1.4 spool file","Enmetu vojon al jabberd1.4-uzantdosiero"}.
+{"Enter path to jabberd14 spool dir","Enmetu vojon al jabberd14-uzantdosierujo"}.
+{"Enter path to jabberd14 spool file","Enmetu vojon al jabberd14-uzantdosiero"}.
 {"Enter path to text file","Enmetu vojon al plata teksto"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Enmetu uzantnomon kaj enkodigoj kiujn vi volas uzi por konektoj al IRC-serviloj"}.
 {"Erlang Jabber Server","Erlang-a Jabber-Servilo"}.
@@ -113,7 +113,7 @@
 {"Import File","Importu dosieron"}.
 {"Import User from File at ","Importu uzanton de dosiero el "}.
 {"Import Users from Dir at ","Importu uzantojn de dosierujo ĉe "}.
-{"Import Users From jabberd 1.4 Spool Files","Importu uzantojn de jabberd1.4-uzantdosieroj"}.
+{"Import Users From jabberd14 Spool Files","Importu uzantojn de jabberd14-uzantdosieroj"}.
 {"Improper message type","Malĝusta mesaĝo-tipo"}.
 {"Incorrect password","Nekorekta pasvorto"}.
 {"Invalid affiliation: ~s","Nevalida aparteneco: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages to the conference","Nur partoprenantoj rajtas sendi privatajn mesaĝojn al la babilejo"}.
 {"Jabber ID","Jabber ID"}.
 {"January","Januaro"}.
-{"JID ~s is invalid","JID ~s estas nevalida"}.
+{"Jabber ID ~s is invalid","JID ~s estas nevalida"}.
 {"joins the room","eniras la babilejo"}.
 {"July","Julio"}.
 {"June","Junio"}.
@@ -219,7 +219,7 @@
 {"Ping","Sondaĵo"}.
 {"Pong","Resondaĵo"}.
 {"Port","Pordo"}.
-{"Present real JIDs to","Montru verajn JID-ojn al"}.
+{"Present real Jabber IDs to","Montru verajn JID-ojn al"}.
 {"private, ","privata, "}.
 {"Publish-Subscribe","Public-Abonado"}.
 {"PubSub subscriber request","PubAbo abonpeto"}.
@@ -307,7 +307,7 @@
 {"To ~s","Al ~s"}.
 {"Traffic rate limit is exceeded","Trafikrapida limigo superita"}.
 {"Transactions Aborted:","Transakcioj nuligitaj"}.
-{"Transactions Commited:","Transakcioj enmetitaj"}.
+{"Transactions Committed:","Transakcioj enmetitaj"}.
 {"Transactions Logged:","Transakcioj protokolitaj"}.
 {"Transactions Restarted:","Transakcioj restartitaj"}.
 {"Tuesday","Mardo"}.
diff --git a/src/msgs/eo.po b/src/msgs/eo.po
index 8b4d55693..9d4bf5b06 100644
--- a/src/msgs/eo.po
+++ b/src/msgs/eo.po
@@ -224,8 +224,8 @@ msgid "Backup Management"
 msgstr "Mastrumado de sekurkopioj"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "Importu uzantojn de jabberd1.4-uzantdosieroj"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "Importu uzantojn de jabberd14-uzantdosieroj"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -309,16 +309,16 @@ msgid "Import User from File at "
 msgstr "Importu uzanton de dosiero el "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Enmetu vojon al jabberd1.4-uzantdosiero"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Enmetu vojon al jabberd14-uzantdosiero"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Importu uzantojn de dosierujo ĉe "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Enmetu vojon al jabberd1.4-uzantdosierujo"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Enmetu vojon al jabberd14-uzantdosierujo"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -752,8 +752,8 @@ msgid "Moderator privileges required"
 msgstr "Moderantaj rajtoj bezonata"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "JID ~s estas nevalida"
+msgid "Jabber ID ~s is invalid"
+msgstr "Jabber ID ~s estas nevalida"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -805,8 +805,8 @@ msgid "No limit"
 msgstr "Neniu limigo"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "Montru verajn JID-ojn al"
+msgid "Present real Jabber IDs to"
+msgstr "Montru verajn Jabber ID-ojn al"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -948,8 +948,8 @@ msgid "Subscriber Address"
 msgstr "Abonanta adreso"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "Ĉu permesi ĉi tiun JID aboni al la jena PubAbo-nodo"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "Ĉu permesi ĉi tiun Jabber ID aboni al la jena PubAbo-nodo"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1430,7 +1430,7 @@ msgid "CPU Time:"
 msgstr "CPU-tempo"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Transakcioj enmetitaj"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/es.msg b/src/msgs/es.msg
index 1a30803f7..97cbcf35c 100644
--- a/src/msgs/es.msg
+++ b/src/msgs/es.msg
@@ -14,7 +14,7 @@
 {"Administrator privileges required","Se necesita privilegios de administrador"}.
 {"A friendly name for the node","Un nombre sencillo para el nodo"}.
 {"All activity","Toda la actividad"}.
-{"Allow this JID to subscribe to this pubsub node?","¿Deseas permitir a este JabberID que se subscriba a este nodo PubSub?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","¿Deseas permitir a este JabberID que se subscriba a este nodo PubSub?"}.
 {"Allow users to change subject","Permitir a los usuarios cambiar el asunto"}.
 {"Allow users to query other users","Permitir a los usuarios consultar a otros usuarios"}.
 {"Allow users to send invites","Permitir a los usuarios enviar invitaciones"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","Introduce lista de {módulo, [opciones]}"}.
 {"Enter nickname you want to register","Introduce el apodo que quieras registrar"}.
 {"Enter path to backup file","Introduce ruta al fichero de copia de seguridad"}.
-{"Enter path to jabberd1.4 spool dir","Introduce la ruta al directorio de jabberd1.4 spools"}.
-{"Enter path to jabberd1.4 spool file","Introduce ruta al fichero jabberd1.4 spool"}.
+{"Enter path to jabberd14 spool dir","Introduce la ruta al directorio de jabberd14 spools"}.
+{"Enter path to jabberd14 spool file","Introduce ruta al fichero jabberd14 spool"}.
 {"Enter path to text file","Introduce ruta al fichero de texto"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Introduce el nombre de usuario y codificaciones de carácteres que quieras usar al conectar en los servidores de IRC"}.
 {"Erlang Jabber Server","Servidor Jabber en Erlang"}.
@@ -113,7 +113,7 @@
 {"Import File","Importar fichero"}.
 {"Import User from File at ","Importa usuario desde fichero en "}.
 {"Import Users from Dir at ","Importar usuarios desde el directorio en "}.
-{"Import Users From jabberd 1.4 Spool Files","Importar usuarios de ficheros spool de jabberd-1.4"}.
+{"Import Users From jabberd14 Spool Files","Importar usuarios de ficheros spool de jabberd-1.4"}.
 {"Improper message type","Tipo de mensaje incorrecto"}.
 {"Incorrect password","Contraseña incorrecta"}.
 {"Invalid affiliation: ~s","Afiliación no válida: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages to the conference","Impedir el envio de mensajes privados a la sala"}.
 {"Jabber ID","Jabber ID"}.
 {"January","enero"}.
-{"JID ~s is invalid","El JID ~s no es válido"}.
+{"Jabber ID ~s is invalid","El JID ~s no es válido"}.
 {"joins the room","entra en la sala"}.
 {"July","julio"}.
 {"June","junio"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Puerto"}.
-{"Present real JIDs to","Los JID reales pueden verlos"}.
+{"Present real Jabber IDs to","Los JID reales pueden verlos"}.
 {"private, ","privado"}.
 {"Publish-Subscribe","Servicio de Publicar-Subscribir"}.
 {"PubSub subscriber request","Petición de subscriptor de PubSub"}.
@@ -307,7 +307,7 @@
 {"To ~s","A ~s"}.
 {"Traffic rate limit is exceeded","Se ha exedido el límite de tráfico"}.
 {"Transactions Aborted:","Transacciones abortadas:"}.
-{"Transactions Commited:","Transacciones finalizadas:"}.
+{"Transactions Committed:","Transacciones finalizadas:"}.
 {"Transactions Logged:","Transacciones registradas:"}.
 {"Transactions Restarted:","Transacciones reiniciadas:"}.
 {"Tuesday","martes"}.
diff --git a/src/msgs/es.po b/src/msgs/es.po
index 7ae471974..b0d52e934 100644
--- a/src/msgs/es.po
+++ b/src/msgs/es.po
@@ -225,7 +225,7 @@ msgid "Backup Management"
 msgstr "Gestión de copia de seguridad"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
+msgid "Import Users From jabberd14 Spool Files"
 msgstr "Importar usuarios de ficheros spool de jabberd-1.4"
 
 #: mod_configure.erl:649
@@ -310,16 +310,16 @@ msgid "Import User from File at "
 msgstr "Importa usuario desde fichero en "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Introduce ruta al fichero jabberd1.4 spool"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Introduce ruta al fichero jabberd14 spool"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Importar usuarios desde el directorio en "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Introduce la ruta al directorio de jabberd1.4 spools"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Introduce la ruta al directorio de jabberd14 spools"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -759,8 +759,8 @@ msgid "Moderator privileges required"
 msgstr "Se necesita privilegios de moderador"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "El JID ~s no es válido"
+msgid "Jabber ID ~s is invalid"
+msgstr "El Jabber ID ~s no es válido"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -812,8 +812,8 @@ msgid "No limit"
 msgstr "Sin límite"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "Los JID reales pueden verlos"
+msgid "Present real Jabber IDs to"
+msgstr "Los Jabber ID reales pueden verlos"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -957,7 +957,7 @@ msgid "Subscriber Address"
 msgstr "Dirección del subscriptor"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
 msgstr "¿Deseas permitir a este JabberID que se subscriba a este nodo PubSub?"
 
 #: mod_pubsub/mod_pubsub.erl:2497
@@ -1442,7 +1442,7 @@ msgid "CPU Time:"
 msgstr "Tiempo consumido de CPU:"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Transacciones finalizadas:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/fr.msg b/src/msgs/fr.msg
index 831f0fc8e..6fbb9612a 100644
--- a/src/msgs/fr.msg
+++ b/src/msgs/fr.msg
@@ -14,7 +14,7 @@
 {"Administrator privileges required","Les droits d'administrateur sont nécessaires"}.
 {"A friendly name for the node","Un nom convivial pour le noeud"}.
 {"All activity","Toute activité"}.
-{"Allow this JID to subscribe to this pubsub node?","Autoriser ce JID à s'abonner à ce noeud pubsub"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Autoriser ce JID à s'abonner à ce noeud pubsub"}.
 {"Allow users to change subject","Autoriser les utilisateurs à changer le sujet"}.
 {"Allow users to query other users","Permettre aux utilisateurs d'envoyer des requêtes aux autres utilisateurs"}.
 {"Allow users to send invites","Permettre aux utilisateurs d'envoyer des invitations"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","Entrez une liste de {Module, [Options]}"}.
 {"Enter nickname you want to register","Entrez le pseudo que vous souhaitez enregistrer"}.
 {"Enter path to backup file","Entrez le chemin vers le fichier de sauvegarde"}.
-{"Enter path to jabberd1.4 spool dir","Entrez le chemin vers le répertoire de spool jabberd1.4"}.
-{"Enter path to jabberd1.4 spool file","Entrez le chemin vers le fichier spool jabberd1.4"}.
+{"Enter path to jabberd14 spool dir","Entrez le chemin vers le répertoire de spool jabberd14"}.
+{"Enter path to jabberd14 spool file","Entrez le chemin vers le fichier spool jabberd14"}.
 {"Enter path to text file","Entrez le chemin vers le fichier texte"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Entrez le nom d'utilisateur et les encodages que vous souhaitez utiliser pour vous connecter aux serveurs IRC"}.
 {"Erlang Jabber Server","Serveur Jabber Erlang"}.
@@ -113,7 +113,7 @@
 {"Import File","Importer un fichier"}.
 {"Import User from File at ","Importer un utilisateur depuis le fichier sur "}.
 {"Import Users from Dir at ","Importer des utilisateurs depuis le répertoire sur "}.
-{"Import Users From jabberd 1.4 Spool Files","Importer des utilisateurs depuis un fichier spool Jabberd 1.4"}.
+{"Import Users From jabberd14 Spool Files","Importer des utilisateurs depuis un fichier spool Jabberd 1.4"}.
 {"Improper message type","Mauvais type de message"}.
 {"Incorrect password","Mot de passe incorrect"}.
 {"Invalid affiliation: ~s","Affiliation invalide: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages to the conference","Il n'est pas permis d'envoyer des messages \"normaux\" à la conférence"}.
 {"Jabber ID","Jabber ID"}.
 {"January","Janvier"}.
-{"JID ~s is invalid","Le JID ~s n'est pas valide"}.
+{"Jabber ID ~s is invalid","Le JID ~s n'est pas valide"}.
 {"joins the room","rejoint le salon"}.
 {"July","Juillet"}.
 {"June","Juin"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Port"}.
-{"Present real JIDs to","Rendre le JID réel visible pour"}.
+{"Present real Jabber IDs to","Rendre le JID réel visible pour"}.
 {"private, ","privé"}.
 {"Publish-Subscribe","Publication-Abonnement"}.
 {"PubSub subscriber request","Demande d'abonnement PubSub"}.
@@ -307,7 +307,7 @@
 {"To ~s","A ~s"}.
 {"Traffic rate limit is exceeded","La limite de trafic a été dépassée"}.
 {"Transactions Aborted:","Transactions annulées:"}.
-{"Transactions Commited:","Transactions commitées:"}.
+{"Transactions Committed:","Transactions commitées:"}.
 {"Transactions Logged:","Transactions journalisées:"}.
 {"Transactions Restarted:","Transactions redémarrées:"}.
 {"Tuesday","Mardi"}.
diff --git a/src/msgs/fr.po b/src/msgs/fr.po
index 30f30d52c..b1d232bb5 100644
--- a/src/msgs/fr.po
+++ b/src/msgs/fr.po
@@ -229,7 +229,7 @@ msgid "Backup Management"
 msgstr "Gestion des sauvegardes"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
+msgid "Import Users From jabberd14 Spool Files"
 msgstr "Importer des utilisateurs depuis un fichier spool Jabberd 1.4"
 
 #: mod_configure.erl:649
@@ -314,16 +314,16 @@ msgid "Import User from File at "
 msgstr "Importer un utilisateur depuis le fichier sur "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Entrez le chemin vers le fichier spool jabberd1.4"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Entrez le chemin vers le fichier spool jabberd14"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Importer des utilisateurs depuis le répertoire sur "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Entrez le chemin vers le répertoire de spool jabberd1.4"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Entrez le chemin vers le répertoire de spool jabberd14"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -766,8 +766,8 @@ msgid "Moderator privileges required"
 msgstr "Les droits de modérateur sont nécessaires"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "Le JID ~s n'est pas valide"
+msgid "Jabber ID ~s is invalid"
+msgstr "Le Jabber ID ~s n'est pas valide"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -819,8 +819,8 @@ msgid "No limit"
 msgstr "Pas de limite"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "Rendre le JID réel visible pour"
+msgid "Present real Jabber IDs to"
+msgstr "Rendre le Jabber ID réel visible pour"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -964,8 +964,8 @@ msgid "Subscriber Address"
 msgstr "Adresse de l'abonné"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "Autoriser ce JID à s'abonner à ce noeud pubsub"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "Autoriser ce Jabber ID à s'abonner à ce noeud pubsub"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1452,7 +1452,7 @@ msgid "CPU Time:"
 msgstr "Temps CPU:"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Transactions commitées:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/gl.msg b/src/msgs/gl.msg
index fbfe06a95..5b30993e2 100644
--- a/src/msgs/gl.msg
+++ b/src/msgs/gl.msg
@@ -13,7 +13,7 @@
 {"Administration of ","Administración de "}.
 {"Administrator privileges required","Necesítase privilexios de administrador"}.
 {"All activity","Toda a actividade"}.
-{"Allow this JID to subscribe to this pubsub node?","Desexas permitir a este JabberID que se subscriba a este nodo PubSub?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Desexas permitir a este JabberID que se subscriba a este nodo PubSub?"}.
 {"Allow users to change subject","Permitir aos usuarios cambiar o asunto"}.
 {"Allow users to query other users","Permitir aos usuarios consultar a outros usuarios"}.
 {"Allow users to send invites","Permitir aos usuarios enviar invitacións"}.
@@ -77,8 +77,8 @@
 {"Enter list of {Module, [Options]}","Introduce lista de {módulo, [opcións]}"}.
 {"Enter nickname you want to register","Introduce o alcume que queiras rexistrar"}.
 {"Enter path to backup file","Introduce ruta ao ficheiro de copia de seguridade"}.
-{"Enter path to jabberd1.4 spool dir","Introduce a ruta ao directorio de jabberd1.4 spools"}.
-{"Enter path to jabberd1.4 spool file","Introduce ruta ao ficheiro jabberd1.4 spool"}.
+{"Enter path to jabberd14 spool dir","Introduce a ruta ao directorio de jabberd14 spools"}.
+{"Enter path to jabberd14 spool file","Introduce ruta ao ficheiro jabberd14 spool"}.
 {"Enter path to text file","Introduce ruta ao ficheiro de texto"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Introduce o nome de usuario e codificaciones de carácteres que queiras usar ao conectar nos servidores de IRC"}.
 {"Erlang Jabber Server","Servidor Jabber en Erlang"}.
@@ -110,7 +110,7 @@
 {"Import File","Importar ficheiro"}.
 {"Import User from File at ","Importa usuario desde ficheiro en "}.
 {"Import Users from Dir at ","Importar usuarios desde o directorio en "}.
-{"Import Users From jabberd 1.4 Spool Files","Importar usuarios de ficheiros spool de jabberd-1.4"}.
+{"Import Users From jabberd14 Spool Files","Importar usuarios de ficheiros spool de jabberd-1.4"}.
 {"Improper message type","Tipo de mensaxe incorrecta"}.
 {"Incorrect password","Contraseña incorrecta"}.
 {"Invalid affiliation: ~s","Afiliación non válida: ~s"}.
@@ -123,7 +123,7 @@
 {"It is not allowed to send private messages to the conference","Impedir o envio de mensaxes privadas á sala"}.
 {"Jabber ID","Jabber ID"}.
 {"January","Xaneiro"}.
-{"JID ~s is invalid","O JID ~s non é válido"}.
+{"Jabber ID ~s is invalid","O JID ~s non é válido"}.
 {"joins the room","entra en la sala"}.
 {"July","Xullo"}.
 {"June","Xuño"}.
@@ -215,7 +215,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Porto"}.
-{"Present real JIDs to","Os JID reais poden velos"}.
+{"Present real Jabber IDs to","Os JID reais poden velos"}.
 {"private, ","privado"}.
 {"Publish-Subscribe","Publicar-Subscribir"}.
 {"PubSub subscriber request","Petición de subscriptor de PubSub"}.
@@ -303,7 +303,7 @@
 {"To ~s","A ~s"}.
 {"Traffic rate limit is exceeded","Hase exedido o límite de tráfico"}.
 {"Transactions Aborted:","Transaccións abortadas:"}.
-{"Transactions Commited:","Transaccións finalizadas:"}.
+{"Transactions Committed:","Transaccións finalizadas:"}.
 {"Transactions Logged:","Transaccións rexistradas:"}.
 {"Transactions Restarted:","Transaccións reiniciadas:"}.
 {"Tuesday","Martes"}.
diff --git a/src/msgs/gl.po b/src/msgs/gl.po
index 499e67dbb..7f35d1864 100644
--- a/src/msgs/gl.po
+++ b/src/msgs/gl.po
@@ -224,7 +224,7 @@ msgid "Backup Management"
 msgstr "Xestión de copia de seguridade"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
+msgid "Import Users From jabberd14 Spool Files"
 msgstr "Importar usuarios de ficheiros spool de jabberd-1.4"
 
 #: mod_configure.erl:649
@@ -309,16 +309,16 @@ msgid "Import User from File at "
 msgstr "Importa usuario desde ficheiro en "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Introduce ruta ao ficheiro jabberd1.4 spool"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Introduce ruta ao ficheiro jabberd14 spool"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Importar usuarios desde o directorio en "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Introduce a ruta ao directorio de jabberd1.4 spools"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Introduce a ruta ao directorio de jabberd14 spools"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -756,8 +756,8 @@ msgid "Moderator privileges required"
 msgstr "Necesítase privilexios de moderador"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "O JID ~s non é válido"
+msgid "Jabber ID ~s is invalid"
+msgstr "O Jabber ID ~s non é válido"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -809,8 +809,8 @@ msgid "No limit"
 msgstr "Sen límite"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "Os JID reais poden velos"
+msgid "Present real Jabber IDs to"
+msgstr "Os Jabber ID reais poden velos"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -954,7 +954,7 @@ msgid "Subscriber Address"
 msgstr "Dirección do subscriptor"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
 msgstr "Desexas permitir a este JabberID que se subscriba a este nodo PubSub?"
 
 #: mod_pubsub/mod_pubsub.erl:2497
@@ -1440,7 +1440,7 @@ msgid "CPU Time:"
 msgstr "Tempo consumido de CPU:"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Transaccións finalizadas:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/it.msg b/src/msgs/it.msg
index e10994b7a..f2928492f 100644
--- a/src/msgs/it.msg
+++ b/src/msgs/it.msg
@@ -6,7 +6,7 @@
 {"Access rules","Regole di accesso"}.
 {"Access Rules","Regole di accesso"}.
 {"Action on user","Azione sull'utente"}.
-{"Add Jabber ID","Aggiungere un Jabber ID (JID)"}.
+{"Add Jabber ID","Aggiungere un Jabber ID (Jabber ID)"}.
 {"Add New","Aggiungere nuovo"}.
 {"Add User","Aggiungere un utente"}.
 {"Administration","Amministrazione"}.
@@ -14,7 +14,7 @@
 {"Administrator privileges required","Necessari i privilegi di amministratore"}.
 {"A friendly name for the node","Un nome comodo per il nodo"}.
 {"All activity","Tutta l'attività"}.
-{"Allow this JID to subscribe to this pubsub node?","Consentire a questo JID l'iscrizione a questo nodo pubsub?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Consentire a questo JID l'iscrizione a questo nodo pubsub?"}.
 {"Allow users to change subject","Consentire agli utenti di cambiare l'oggetto"}.
 {"Allow users to query other users","Consentire agli utenti query verso altri utenti"}.
 {"Allow users to send invites","Consentire agli utenti l'invio di inviti"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","Immettere un elenco di {Modulo, [Opzioni]}"}.
 {"Enter nickname you want to register","Immettere il nickname che si vuole registrare"}.
 {"Enter path to backup file","Immettere il percorso del file di salvataggio"}.
-{"Enter path to jabberd1.4 spool dir","Immettere il percorso della directory di spool di jabberd1.4"}.
-{"Enter path to jabberd1.4 spool file","Immettere il percorso del file di spool di jabberd1.4"}.
+{"Enter path to jabberd14 spool dir","Immettere il percorso della directory di spool di jabberd14"}.
+{"Enter path to jabberd14 spool file","Immettere il percorso del file di spool di jabberd14"}.
 {"Enter path to text file","Immettere il percorso del file di testo"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Immettere il nome utente e le codifiche che si desidera utilizzare per la connessione ai server IRC"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
@@ -113,7 +113,7 @@
 {"Import File","Importare un file"}.
 {"Import User from File at ","Importare un utente dal file "}.
 {"Import Users from Dir at ","Importare utenti dalla directory "}.
-{"Import Users From jabberd 1.4 Spool Files","Importare utenti da file di spool di jabberd 1.4"}.
+{"Import Users From jabberd14 Spool Files","Importare utenti da file di spool di jabberd14"}.
 {"Improper message type","Tipo di messaggio non corretto"}.
 {"Incorrect password","Password non esatta"}.
 {"Invalid affiliation: ~s","Affiliazione non valida: ~s"}.
@@ -125,9 +125,9 @@
 {"It is not allowed to send private messages","Non è consentito l'invio di messaggi privati"}.
 {"It is not allowed to send private messages of type \"groupchat\"","Non è consentito l'invio di messaggi privati di tipo \"groupchat\""}.
 {"It is not allowed to send private messages to the conference","Non è consentito l'invio di messaggi privati alla conferenza"}.
-{"Jabber ID","Jabber ID (JID)"}.
+{"Jabber ID","Jabber ID (Jabber ID)"}.
 {"January","Gennaio"}.
-{"JID ~s is invalid","Il JID ~s non è valido"}.
+{"Jabber ID ~s is invalid","Il JID ~s non è valido"}.
 {"joins the room","entra nella stanza"}.
 {"July","Luglio"}.
 {"June","Giugno"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Porta"}.
-{"Present real JIDs to","Rendere visibile il JID reale a"}.
+{"Present real Jabber IDs to","Rendere visibile il JID reale a"}.
 {"private, ","privato, "}.
 {"Publish-Subscribe","Pubblicazione-Iscrizione"}.
 {"PubSub subscriber request","Richiesta di iscrizione per PubSub"}.
@@ -307,7 +307,7 @@
 {"To ~s","A ~s"}.
 {"Traffic rate limit is exceeded","Limite di traffico superato"}.
 {"Transactions Aborted:","Transazioni abortite:"}.
-{"Transactions Commited:","Transazioni avvenute:"}.
+{"Transactions Committed:","Transazioni avvenute:"}.
 {"Transactions Logged:","Transazioni con log:"}.
 {"Transactions Restarted:","Transazioni riavviate:"}.
 {"Tuesday","Martedì"}.
diff --git a/src/msgs/it.po b/src/msgs/it.po
index 3f436c9bb..fd3dc6296 100644
--- a/src/msgs/it.po
+++ b/src/msgs/it.po
@@ -228,8 +228,8 @@ msgid "Backup Management"
 msgstr "Gestione dei salvataggi"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "Importare utenti da file di spool di jabberd 1.4"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "Importare utenti da file di spool di jabberd14"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -313,16 +313,16 @@ msgid "Import User from File at "
 msgstr "Importare un utente dal file "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Immettere il percorso del file di spool di jabberd1.4"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Immettere il percorso del file di spool di jabberd14"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Importare utenti dalla directory "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Immettere il percorso della directory di spool di jabberd1.4"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Immettere il percorso della directory di spool di jabberd14"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -354,7 +354,7 @@ msgstr "Regole di accesso"
 #: mod_configure.erl:1667 mod_roster.erl:803 mod_roster_odbc.erl:910
 #: mod_vcard.erl:460 mod_vcard_ldap.erl:544 mod_vcard_odbc.erl:457
 msgid "Jabber ID"
-msgstr "Jabber ID (JID)"
+msgstr "Jabber ID (Jabber ID)"
 
 #: mod_configure.erl:1156 mod_configure.erl:1214 mod_configure.erl:1600
 #: mod_configure.erl:1809 mod_muc/mod_muc_room.erl:2702
@@ -760,8 +760,8 @@ msgid "Moderator privileges required"
 msgstr "Necessari i privilegi di moderatore"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "Il JID ~s non è valido"
+msgid "Jabber ID ~s is invalid"
+msgstr "Il Jabber ID ~s non è valido"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -813,8 +813,8 @@ msgid "No limit"
 msgstr "Nessun limite"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "Rendere visibile il JID reale a"
+msgid "Present real Jabber IDs to"
+msgstr "Rendere visibile il Jabber ID reale a"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -959,8 +959,8 @@ msgid "Subscriber Address"
 msgstr "Indirizzo dell'iscritta/o"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "Consentire a questo JID l'iscrizione a questo nodo pubsub?"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "Consentire a questo Jabber ID l'iscrizione a questo nodo pubsub?"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1074,7 +1074,7 @@ msgstr "Formato non valido"
 
 #: mod_roster.erl:855 mod_roster_odbc.erl:962
 msgid "Add Jabber ID"
-msgstr "Aggiungere un Jabber ID (JID)"
+msgstr "Aggiungere un Jabber ID (Jabber ID)"
 
 #: mod_roster.erl:936 mod_roster_odbc.erl:1043
 msgid "Roster"
@@ -1446,7 +1446,7 @@ msgid "CPU Time:"
 msgstr "Tempo CPU:"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Transazioni avvenute:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/ja.msg b/src/msgs/ja.msg
index 08de9b203..ba05d8d1a 100644
--- a/src/msgs/ja.msg
+++ b/src/msgs/ja.msg
@@ -14,7 +14,7 @@
 {"Administrator privileges required","管理者権限が必要です"}.
 {"A friendly name for the node","ノードの為のフレンドリネーム"}.
 {"All activity","全て"}.
-{"Allow this JID to subscribe to this pubsub node?","この JID をこの pubsubノードへ購読することを許可しますか？"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","この JID をこの pubsubノードへ購読することを許可しますか？"}.
 {"Allow users to change subject","ユーザーによる件名の変更を許可する"}.
 {"Allow users to query other users","ユーザーによる他のユーザーへの問い合わせを許可する"}.
 {"Allow users to send invites","ユーザーによる招待を許可する"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","{モジュール, [オプション]}のリストを入力して下さい"}.
 {"Enter nickname you want to register","登録するニックネームを入力して下さい"}.
 {"Enter path to backup file","バックアップファイルのパスを入力して下さい"}.
-{"Enter path to jabberd1.4 spool dir","jabberd1.4 spool ディレクトリのパスを入力して下さい"}.
-{"Enter path to jabberd1.4 spool file","jabberd1.4 spool ファイルのパスを入力して下さい"}.
+{"Enter path to jabberd14 spool dir","jabberd14 spool ディレクトリのパスを入力して下さい"}.
+{"Enter path to jabberd14 spool file","jabberd14 spool ファイルのパスを入力して下さい"}.
 {"Enter path to text file","テキストファイルのパスを入力して下さい"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","IRCサーバーに接続先する為のユーザー名と文字エンコーディングを入力して下さい"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
@@ -113,7 +113,7 @@
 {"Import File","ファイルかインポート"}.
 {"Import User from File at ","ファイルからユーザーをインポート"}.
 {"Import Users from Dir at ","ディレクトリからユーザーをインポート"}.
-{"Import Users From jabberd 1.4 Spool Files","jabberd 1.4 Spool ファイルからユーザーをインポート"}.
+{"Import Users From jabberd14 Spool Files","jabberd14 Spool ファイルからユーザーをインポート"}.
 {"Improper message type","誤ったメッセージタイプです"}.
 {"Incorrect password","パスワードが違います"}.
 {"Invalid affiliation: ~s","無効な提携です: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages","プライベートメッセージを送信することは許可されませんでした"}.
 {"Jabber ID","Jabber ID"}.
 {"January","1月"}.
-{"JID ~s is invalid","JID ~s は無効です"}.
+{"Jabber ID ~s is invalid","JID ~s は無効です"}.
 {"joins the room","チャットルームに参加"}.
 {"July","7月"}.
 {"June","6月"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","ポート"}.
-{"Present real JIDs to","本当の JID を公開する"}.
+{"Present real Jabber IDs to","本当の JID を公開する"}.
 {"private, ","プライベート"}.
 {"Publish-Subscribe","Publish-Subscribe"}.
 {"PubSub subscriber request","PubSub 購読リクエスト"}.
@@ -307,7 +307,7 @@
 {"To","宛先"}.
 {"Traffic rate limit is exceeded","トラフィックレートの制限を超えました"}.
 {"Transactions Aborted:","トランザクションの失敗:"}.
-{"Transactions Commited:","トランザクションのコミット:"}.
+{"Transactions Committed:","トランザクションのコミット:"}.
 {"Transactions Logged:","トランザクションのログ: "}.
 {"Transactions Restarted:","トランザクションの再起動:"}.
 {"Tuesday","火曜日"}.
diff --git a/src/msgs/ja.po b/src/msgs/ja.po
index 76ed42510..4fcc1476c 100644
--- a/src/msgs/ja.po
+++ b/src/msgs/ja.po
@@ -223,8 +223,8 @@ msgid "Backup Management"
 msgstr "バックアップ管理"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "jabberd 1.4 Spool ファイルからユーザーをインポート"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "jabberd14 Spool ファイルからユーザーをインポート"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -308,16 +308,16 @@ msgid "Import User from File at "
 msgstr "ファイルからユーザーをインポート"
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "jabberd1.4 spool ファイルのパスを入力して下さい"
+msgid "Enter path to jabberd14 spool file"
+msgstr "jabberd14 spool ファイルのパスを入力して下さい"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "ディレクトリからユーザーをインポート"
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "jabberd1.4 spool ディレクトリのパスを入力して下さい"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "jabberd14 spool ディレクトリのパスを入力して下さい"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -745,8 +745,8 @@ msgid "Moderator privileges required"
 msgstr "モデレーター権限が必要です"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "JID ~s は無効です"
+msgid "Jabber ID ~s is invalid"
+msgstr "Jabber ID ~s は無効です"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -798,8 +798,8 @@ msgid "No limit"
 msgstr "制限無し"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "本当の JID を公開する"
+msgid "Present real Jabber IDs to"
+msgstr "本当の Jabber ID を公開する"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -942,8 +942,8 @@ msgid "Subscriber Address"
 msgstr "購読アドレス"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "この JID をこの pubsubノードへ購読することを許可しますか？"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "この Jabber ID をこの pubsubノードへ購読することを許可しますか？"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1424,7 +1424,7 @@ msgid "CPU Time:"
 msgstr "CPU時間:"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "トランザクションのコミット:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/nl.msg b/src/msgs/nl.msg
index cb49db6f1..778596334 100644
--- a/src/msgs/nl.msg
+++ b/src/msgs/nl.msg
@@ -14,7 +14,7 @@
 {"Administrator privileges required","U hebt beheerdersprivileges nodig"}.
 {"A friendly name for the node","Bijnaam voor deze knoop"}.
 {"All activity","Alle activiteit"}.
-{"Allow this JID to subscribe to this pubsub node?","Deze gebruiker toestaan te abonneren op deze pubsub node?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Deze gebruiker toestaan te abonneren op deze pubsub node?"}.
 {"Allow users to change subject","Gebruikers mogen het onderwerp veranderen"}.
 {"Allow users to query other users","Gebruikers mogen naar andere gebruikers verzoeken verzenden"}.
 {"Allow users to send invites","Gebruikers mogen uitnodigingen verzenden"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","Voer lijst met op te starten modules als volgt in: {Module, [Opties]}"}.
 {"Enter nickname you want to register","Voer de bijnaam in die u wilt registreren"}.
 {"Enter path to backup file","Voer pad naar backupbestand in"}.
-{"Enter path to jabberd1.4 spool dir","Voer pad naar jabberd 1.4-spool-directory in"}.
-{"Enter path to jabberd1.4 spool file","Voer pad naar jabberd 1.4-spool-bestand in"}.
+{"Enter path to jabberd14 spool dir","Voer pad naar jabberd14-spool-directory in"}.
+{"Enter path to jabberd14 spool file","Voer pad naar jabberd14-spool-bestand in"}.
 {"Enter path to text file","Voer pad naar backupbestand in"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Voer de gebruikersnaam en de coderingen in die u wilt gebruiken voor verbindingen met IRC-servers"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
@@ -113,7 +113,7 @@
 {"Import File","Bestand importeren"}.
 {"Import User from File at ","Importeer gebruiker via bestand op "}.
 {"Import Users from Dir at ","Gebruikers importeren vanaf directory op "}.
-{"Import Users From jabberd 1.4 Spool Files","Importeer gebruikers via spool-bestanden van jabberd 1.4"}.
+{"Import Users From jabberd14 Spool Files","Importeer gebruikers via spool-bestanden van jabberd14"}.
 {"Improper message type","Onjuist berichttype"}.
 {"Incorrect password","Foutief wachtwoord"}.
 {"Invalid affiliation: ~s","Ongeldige affiliatie: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages to the conference","Er mogen geen privéberichten naar de chatruimte worden verzonden"}.
 {"Jabber ID","Jabber ID"}.
 {"January","januari"}.
-{"JID ~s is invalid","De Jabber ID ~s is ongeldig"}.
+{"Jabber ID ~s is invalid","De Jabber ID ~s is ongeldig"}.
 {"joins the room","betrad de chatruimte"}.
 {"July","juli"}.
 {"June","juni"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Poort"}.
-{"Present real JIDs to","Jabber ID's kunnen achterhaald worden door"}.
+{"Present real Jabber IDs to","Jabber ID's kunnen achterhaald worden door"}.
 {"private, ","privé, "}.
 {"Publish-Subscribe","Publish-Subscribe"}.
 {"PubSub subscriber request","PubSub abonnee verzoek"}.
@@ -307,7 +307,7 @@
 {"To ~s","Naar ~s"}.
 {"Traffic rate limit is exceeded","Dataverkeerslimiet overschreden"}.
 {"Transactions Aborted:","Afgebroken transacties:"}.
-{"Transactions Commited:","Bevestigde transacties:"}.
+{"Transactions Committed:","Bevestigde transacties:"}.
 {"Transactions Logged:","Gelogde transacties:"}.
 {"Transactions Restarted:","Herstarte transacties:"}.
 {"Tuesday","dinsdag"}.
diff --git a/src/msgs/nl.po b/src/msgs/nl.po
index 9bea8ba03..a4253801f 100644
--- a/src/msgs/nl.po
+++ b/src/msgs/nl.po
@@ -226,8 +226,8 @@ msgid "Backup Management"
 msgstr "Backup"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "Importeer gebruikers via spool-bestanden van jabberd 1.4"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "Importeer gebruikers via spool-bestanden van jabberd14"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -311,16 +311,16 @@ msgid "Import User from File at "
 msgstr "Importeer gebruiker via bestand op "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Voer pad naar jabberd 1.4-spool-bestand in"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Voer pad naar jabberd14-spool-bestand in"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Gebruikers importeren vanaf directory op "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Voer pad naar jabberd 1.4-spool-directory in"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Voer pad naar jabberd14-spool-directory in"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -766,7 +766,7 @@ msgid "Moderator privileges required"
 msgstr "U hebt moderatorprivileges nodig"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
+msgid "Jabber ID ~s is invalid"
 msgstr "De Jabber ID ~s is ongeldig"
 
 #: mod_muc/mod_muc_room.erl:2212
@@ -819,7 +819,7 @@ msgid "No limit"
 msgstr "Geen limiet"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
+msgid "Present real Jabber IDs to"
 msgstr "Jabber ID's kunnen achterhaald worden door"
 
 #: mod_muc/mod_muc_room.erl:2741
@@ -964,7 +964,7 @@ msgid "Subscriber Address"
 msgstr "Abonnee Adres"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
 msgstr "Deze gebruiker toestaan te abonneren op deze pubsub node?"
 
 #: mod_pubsub/mod_pubsub.erl:2497
@@ -1448,7 +1448,7 @@ msgid "CPU Time:"
 msgstr "Processortijd:"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Bevestigde transacties:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/no.msg b/src/msgs/no.msg
index 195381574..d8f407aa1 100644
--- a/src/msgs/no.msg
+++ b/src/msgs/no.msg
@@ -14,7 +14,7 @@
 {"Administrator privileges required","Administratorprivilegier kreves"}.
 {"A friendly name for the node","Et vennlig navn for noden"}.
 {"All activity","All aktivitet"}.
-{"Allow this JID to subscribe to this pubsub node?","Tillat denne JID å abonnere på denne pubsub noden?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Tillat denne JID å abonnere på denne pubsub noden?"}.
 {"Allow users to change subject","Tillat brukere å endre emne"}.
 {"Allow users to query other users","Tillat brukere å sende forespørsel til andre brukere"}.
 {"Allow users to send invites","Tillat brukere å sende invitasjoner"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","Skriv inn en liste av {Module, [Options]}"}.
 {"Enter nickname you want to register","Skriv inn kallenavnet du ønsker å registrere"}.
 {"Enter path to backup file","Skriv inn sti til sikkerhetskopi filen"}.
-{"Enter path to jabberd1.4 spool dir","Skriv inn sti til jabberd1.4 spoolkatalog"}.
-{"Enter path to jabberd1.4 spool file","Skriv inn sti til jabberd1.4 spoolfil"}.
+{"Enter path to jabberd14 spool dir","Skriv inn sti til jabberd14 spoolkatalog"}.
+{"Enter path to jabberd14 spool file","Skriv inn sti til jabberd14 spoolfil"}.
 {"Enter path to text file","Skriv inn sti til tekstfil"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Skriv inn brukernavn og tekstkoding du ønsker å bruke for å koble til IRC tjenere"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
@@ -113,7 +113,7 @@
 {"Import File","Importer File"}.
 {"Import User from File at ","Importer Bruker fra Fil på "}.
 {"Import Users from Dir at ","Importer Brukere fra Katalog på "}.
-{"Import Users From jabberd 1.4 Spool Files","Importer Brukere Fra jabberd 1.4 Spoolfiler"}.
+{"Import Users From jabberd14 Spool Files","Importer Brukere Fra jabberd14 Spoolfiler"}.
 {"Improper message type","Feilaktig meldingstype"}.
 {"Incorrect password","Feil passord"}.
 {"Invalid affiliation: ~s","Ugyldig rang: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages to the conference","Det er ikke tillatt å sende private meldinger til konferansen"}.
 {"Jabber ID","Jabber ID"}.
 {"January","januar"}.
-{"JID ~s is invalid","Ugyldig JID ~s"}.
+{"Jabber ID ~s is invalid","Ugyldig JID ~s"}.
 {"joins the room","kommer inn i rommet"}.
 {"July","juli"}.
 {"June","juni"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Port"}.
-{"Present real JIDs to","Presenter ekte JIDer til"}.
+{"Present real Jabber IDs to","Presenter ekte JIDer til"}.
 {"private, ","privat, "}.
 {"Publish-Subscribe","Publish-Subscribe"}.
 {"PubSub subscriber request","PubSub abonements forespørsel"}.
@@ -307,7 +307,7 @@
 {"To","Til"}.
 {"Traffic rate limit is exceeded","Trafikkmengde grense overskredet"}.
 {"Transactions Aborted:","Avbrutte Transasksjoner:"}.
-{"Transactions Commited:","Sendte Transaksjoner:"}.
+{"Transactions Committed:","Sendte Transaksjoner:"}.
 {"Transactions Logged:","Loggede Transasksjoner:"}.
 {"Transactions Restarted:","Omstartede Transasksjoner:"}.
 {"Tuesday","tirsdag"}.
diff --git a/src/msgs/no.po b/src/msgs/no.po
index 7a8448eee..081c21ef8 100644
--- a/src/msgs/no.po
+++ b/src/msgs/no.po
@@ -223,8 +223,8 @@ msgid "Backup Management"
 msgstr "Håndtere Sikkerehetskopiering"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "Importer Brukere Fra jabberd 1.4 Spoolfiler"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "Importer Brukere Fra jabberd14 Spoolfiler"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -308,16 +308,16 @@ msgid "Import User from File at "
 msgstr "Importer Bruker fra Fil på "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Skriv inn sti til jabberd1.4 spoolfil"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Skriv inn sti til jabberd14 spoolfil"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Importer Brukere fra Katalog på "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Skriv inn sti til jabberd1.4 spoolkatalog"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Skriv inn sti til jabberd14 spoolkatalog"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -753,8 +753,8 @@ msgid "Moderator privileges required"
 msgstr "Redaktørprivilegier kreves"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "Ugyldig JID ~s"
+msgid "Jabber ID ~s is invalid"
+msgstr "Ugyldig Jabber ID ~s"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -806,8 +806,8 @@ msgid "No limit"
 msgstr "Ingen grense"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "Presenter ekte JIDer til"
+msgid "Present real Jabber IDs to"
+msgstr "Presenter ekte Jabber IDer til"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -947,8 +947,8 @@ msgid "Subscriber Address"
 msgstr "Abonnements Adresse"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "Tillat denne JID å abonnere på denne pubsub noden?"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "Tillat denne Jabber ID å abonnere på denne pubsub noden?"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1430,7 +1430,7 @@ msgid "CPU Time:"
 msgstr "CPU Tid:"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Sendte Transaksjoner:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/pl.msg b/src/msgs/pl.msg
index bc849bea3..58b9b0406 100644
--- a/src/msgs/pl.msg
+++ b/src/msgs/pl.msg
@@ -6,7 +6,7 @@
 {"Access rules","Zasady dostępu"}.
 {"Access Rules","Zasady dostępu"}.
 {"Action on user","Akcja dla użytkownika"}.
-{"Add Jabber ID","Dodaj JID"}.
+{"Add Jabber ID","Dodaj Jabber ID"}.
 {"Add New","Dodaj nowe"}.
 {"Add User","Dodaj użytkownika"}.
 {"Administration","Administracja"}.
@@ -14,7 +14,7 @@
 {"Administrator privileges required","Wymagane prawa administratora"}.
 {"A friendly name for the node","Przyjazna nazwa węzła"}.
 {"All activity","Cała aktywność"}.
-{"Allow this JID to subscribe to this pubsub node?","Pozwól temu JID na zapisanie się do tego noda pubsub"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Pozwól temu JID na zapisanie się do tego noda pubsub"}.
 {"Allow users to change subject","Pozwól użytkownikom zmienić tytuł pokoju"}.
 {"Allow users to query other users","Pozwól użytkownikom pobierać informacje o innych użytkownikach"}.
 {"Allow users to send invites","Pozwól użytkownikom wysyłać zaproszenia"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","Wprowadź listę {Moduł, [Opcje]}"}.
 {"Enter nickname you want to register","Wprowadz nicka którego chcesz zarejestrować"}.
 {"Enter path to backup file","Wprowadź scieżkę do pliku kopii zapasowej"}.
-{"Enter path to jabberd1.4 spool dir","Wprowadź ścieżkę do katalogu spool serwera jabberd1.4"}.
-{"Enter path to jabberd1.4 spool file","Wprowadź ścieżkę do pliku spool dla serwera jabberd1.4"}.
+{"Enter path to jabberd14 spool dir","Wprowadź ścieżkę do katalogu spool serwera jabberd14"}.
+{"Enter path to jabberd14 spool file","Wprowadź ścieżkę do pliku spool dla serwera jabberd14"}.
 {"Enter path to text file","Wprowadź scieżkę do pliku tekstowego"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Wprowadź nazwę użytkownika i kodowanie których chcesz używać do łączenia z serwerami IRC"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
@@ -113,7 +113,7 @@
 {"Import File","Importuj plik"}.
 {"Import User from File at ","Importuj użytkownika z pliku na "}.
 {"Import Users from Dir at ","Importuj użytkowników z katalogu na "}.
-{"Import Users From jabberd 1.4 Spool Files","Importuj użytkowników z plików spool serwera jabber 1.4"}.
+{"Import Users From jabberd14 Spool Files","Importuj użytkowników z plików spool serwera jabber 1.4"}.
 {"Improper message type","Nieprawidłowy typ wiadomości"}.
 {"Incorrect password","Nieprawidłowe hasło"}.
 {"Invalid affiliation: ~s","Nieprawidłowe powiązanie: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages","Wysyłanie prywatnych wiadomości jest zabronione"}.
 {"Jabber ID","Jabber ID"}.
 {"January","Styczeń"}.
-{"JID ~s is invalid","JID ~s jest niepoprawny"}.
+{"Jabber ID ~s is invalid","JID ~s jest niepoprawny"}.
 {"joins the room","dołączył(a) się do pokoju"}.
 {"July","Lipiec"}.
 {"June","Czerwiec"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Port"}.
-{"Present real JIDs to","Kto może widzieć prawdziwe JID-y?"}.
+{"Present real Jabber IDs to","Kto może widzieć prawdziwe JID-y?"}.
 {"private, ","prywatny, "}.
 {"Publish-Subscribe","PubSub"}.
 {"PubSub subscriber request","Rządzanie subskrybenta PubSub"}.
@@ -307,7 +307,7 @@
 {"To ~s","Do ~s"}.
 {"Traffic rate limit is exceeded","Limit transferu przekroczony"}.
 {"Transactions Aborted:","Transakcje anulowane"}.
-{"Transactions Commited:","Transakcje zakończone"}.
+{"Transactions Committed:","Transakcje zakończone"}.
 {"Transactions Logged:","Transakcje logowane"}.
 {"Transactions Restarted:","Transakcje uruchomione ponownie"}.
 {"Tuesday","Wtorek"}.
diff --git a/src/msgs/pl.po b/src/msgs/pl.po
index b960a22db..053a226d3 100644
--- a/src/msgs/pl.po
+++ b/src/msgs/pl.po
@@ -227,7 +227,7 @@ msgid "Backup Management"
 msgstr "Zarządzanie kopiami zapasowymi"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
+msgid "Import Users From jabberd14 Spool Files"
 msgstr "Importuj użytkowników z plików spool serwera jabber 1.4"
 
 #: mod_configure.erl:649
@@ -312,16 +312,16 @@ msgid "Import User from File at "
 msgstr "Importuj użytkownika z pliku na "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Wprowadź ścieżkę do pliku spool dla serwera jabberd1.4"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Wprowadź ścieżkę do pliku spool dla serwera jabberd14"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Importuj użytkowników z katalogu na "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Wprowadź ścieżkę do katalogu spool serwera jabberd1.4"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Wprowadź ścieżkę do katalogu spool serwera jabberd14"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -753,8 +753,8 @@ msgid "Moderator privileges required"
 msgstr "Wymagane prawa moderatora"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "JID ~s jest niepoprawny"
+msgid "Jabber ID ~s is invalid"
+msgstr "Jabber ID ~s jest niepoprawny"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -806,8 +806,8 @@ msgid "No limit"
 msgstr "Bez limitu"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "Kto może widzieć prawdziwe JID-y?"
+msgid "Present real Jabber IDs to"
+msgstr "Kto może widzieć prawdziwe Jabber ID-y?"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -948,8 +948,8 @@ msgid "Subscriber Address"
 msgstr "Adres subskrybenta"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "Pozwól temu JID na zapisanie się do tego noda pubsub"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "Pozwól temu Jabber ID na zapisanie się do tego noda pubsub"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1064,7 +1064,7 @@ msgstr "Zły format"
 
 #: mod_roster.erl:855 mod_roster_odbc.erl:962
 msgid "Add Jabber ID"
-msgstr "Dodaj JID"
+msgstr "Dodaj Jabber ID"
 
 #: mod_roster.erl:936 mod_roster_odbc.erl:1043
 msgid "Roster"
@@ -1434,7 +1434,7 @@ msgid "CPU Time:"
 msgstr "Czas CPU"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Transakcje zakończone"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/pt-br.msg b/src/msgs/pt-br.msg
index 97f2fca49..d313e37ab 100644
--- a/src/msgs/pt-br.msg
+++ b/src/msgs/pt-br.msg
@@ -14,7 +14,7 @@
 {"Administrator privileges required","Se necessita privilégios de administrador"}.
 {"A friendly name for the node","Um nome familiar para o nó"}.
 {"All activity","Toda la atividade"}.
-{"Allow this JID to subscribe to this pubsub node?","Autorizar este JID para a inscrição neste tópico pubsub ?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Autorizar este JID para a inscrição neste tópico pubsub ?"}.
 {"Allow users to change subject","Permitir a usuários modificar o assunto"}.
 {"Allow users to query other users","Permitir a usuários pesquisar informações sobre os demais"}.
 {"Allow users to send invites","Permitir a usuários envio de convites"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","Introduza lista de {módulo, [opções]}"}.
 {"Enter nickname you want to register","Introduza o apelido que quer registrar"}.
 {"Enter path to backup file","Introduza o caminho do arquivo de cópia de segurança"}.
-{"Enter path to jabberd1.4 spool dir","Introduza o caminho para o diretório de spools do jabberd1.4"}.
-{"Enter path to jabberd1.4 spool file","Introduza o caminho para o arquivo de spool do jabberd1.4"}.
+{"Enter path to jabberd14 spool dir","Introduza o caminho para o diretório de spools do jabberd14"}.
+{"Enter path to jabberd14 spool file","Introduza o caminho para o arquivo de spool do jabberd14"}.
 {"Enter path to text file","Introduza caminho para o arquivo de texto"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Introduza o nome de usuário e codificações de caracteres que quer usar ao conectar-se aos servidores de IRC"}.
 {"Erlang Jabber Server","Servidor Jabber em Erlang"}.
@@ -113,7 +113,7 @@
 {"Import File","Importar arquivo"}.
 {"Import User from File at ","Importar usuário a partir do arquivo em "}.
 {"Import Users from Dir at ","Importar usuários a partir do diretório em "}.
-{"Import Users From jabberd 1.4 Spool Files","Importar usuários de arquivos jabberd 1.4"}.
+{"Import Users From jabberd14 Spool Files","Importar usuários de arquivos jabberd14"}.
 {"Improper message type","Tipo de mensagem incorreto"}.
 {"Incorrect password","Senha incorreta"}.
 {"Invalid affiliation: ~s","Afiliação não válida: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages to the conference","Impedir o envio de mensagens privados a la sala"}.
 {"Jabber ID","ID Jabber"}.
 {"January","Janeiro"}.
-{"JID ~s is invalid","O JID ~s não es válido"}.
+{"Jabber ID ~s is invalid","O JID ~s não es válido"}.
 {"joins the room","Entrar na sala"}.
 {"July","Julho"}.
 {"June","Junho"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Porta"}.
-{"Present real JIDs to","Tornar o JID real visível por"}.
+{"Present real Jabber IDs to","Tornar o JID real visível por"}.
 {"private, ","privado"}.
 {"Publish-Subscribe","Publicação de Tópico"}.
 {"PubSub subscriber request","PubSub requisição de assinante"}.
@@ -307,7 +307,7 @@
 {"To ~s","Para ~s"}.
 {"Traffic rate limit is exceeded","Limite de banda excedido"}.
 {"Transactions Aborted:","Transações abortadas:"}.
-{"Transactions Commited:","Transações:"}.
+{"Transactions Committed:","Transações:"}.
 {"Transactions Logged:","Transações de log:"}.
 {"Transactions Restarted:","Transações restauradas:"}.
 {"Tuesday","Terça"}.
diff --git a/src/msgs/pt-br.po b/src/msgs/pt-br.po
index 791d2d755..5d7bd1a30 100644
--- a/src/msgs/pt-br.po
+++ b/src/msgs/pt-br.po
@@ -228,8 +228,8 @@ msgid "Backup Management"
 msgstr "Gestão de copia de segurança"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "Importar usuários de arquivos jabberd 1.4"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "Importar usuários de arquivos jabberd14"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -313,16 +313,16 @@ msgid "Import User from File at "
 msgstr "Importar usuário a partir do arquivo em "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Introduza o caminho para o arquivo de spool do jabberd1.4"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Introduza o caminho para o arquivo de spool do jabberd14"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Importar usuários a partir do diretório em "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Introduza o caminho para o diretório de spools do jabberd1.4"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Introduza o caminho para o diretório de spools do jabberd14"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -761,8 +761,8 @@ msgid "Moderator privileges required"
 msgstr "Se necessita privilégios de moderador"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "O JID ~s não es válido"
+msgid "Jabber ID ~s is invalid"
+msgstr "O Jabber ID ~s não es válido"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -814,8 +814,8 @@ msgid "No limit"
 msgstr "Ilimitado"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "Tornar o JID real visível por"
+msgid "Present real Jabber IDs to"
+msgstr "Tornar o Jabber ID real visível por"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -955,8 +955,8 @@ msgid "Subscriber Address"
 msgstr "Enderço dos Assinantes"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "Autorizar este JID para a inscrição neste tópico pubsub ?"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "Autorizar este Jabber ID para a inscrição neste tópico pubsub ?"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1439,7 +1439,7 @@ msgid "CPU Time:"
 msgstr "Tempo de CPU"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Transações:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/pt.msg b/src/msgs/pt.msg
index 71cce8fb6..415424f70 100644
--- a/src/msgs/pt.msg
+++ b/src/msgs/pt.msg
@@ -38,8 +38,8 @@
 {"Enter list of {Module, [Options]}","Introduza lista de {módulos, [opções]}"}.
 {"Enter nickname you want to register","Introduza a alcunha que quer registar"}.
 {"Enter path to backup file","Introduza o caminho do ficheiro de cópia de segurança"}.
-{"Enter path to jabberd1.4 spool dir","Introduza o caminho para o directório de spools do jabberd1.4"}.
-{"Enter path to jabberd1.4 spool file","Introduza o caminho para o ficheiro de spool do jabberd1.4"}.
+{"Enter path to jabberd14 spool dir","Introduza o caminho para o directório de spools do jabberd14"}.
+{"Enter path to jabberd14 spool file","Introduza o caminho para o ficheiro de spool do jabberd14"}.
 {"Enter path to text file","Introduza caminho para o ficheiro de texto"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Introduza o nome de utilizador e codificações de caracteres que quer usar ao conectar-se aos servidores de IRC"}.
 {"Erlang Jabber Server","Servidor Jabber em Erlang"}.
@@ -62,7 +62,7 @@
 {"IRC Username","Nome do utilizador de IRC"}.
 {"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"}.
-{"JID ~s is invalid","O JID ~s não é válido"}.
+{"Jabber ID ~s is invalid","O JID ~s não é válido"}.
 {"Last Activity","Última actividade"}.
 {"Listened Ports at ","Portas em escuta em "}.
 {"List of modules to start","Lista de módulos a iniciar"}.
diff --git a/src/msgs/pt.po b/src/msgs/pt.po
index 5afcc47e0..eb158e93f 100644
--- a/src/msgs/pt.po
+++ b/src/msgs/pt.po
@@ -236,8 +236,8 @@ msgstr "Gestão de cópias de segurança"
 
 #: mod_configure.erl:534
 #, fuzzy
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "Importar utilizadores a partir de ficheiros da spool do jabberd1.4"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "Importar utilizadores a partir de ficheiros da spool do jabberd14"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -322,16 +322,16 @@ msgid "Import User from File at "
 msgstr "Importar utilizador a partir do ficheiro em "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Introduza o caminho para o ficheiro de spool do jabberd1.4"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Introduza o caminho para o ficheiro de spool do jabberd14"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Importar utilizadores a partir do directório em "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Introduza o caminho para o directório de spools do jabberd1.4"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Introduza o caminho para o directório de spools do jabberd14"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -773,8 +773,8 @@ msgid "Moderator privileges required"
 msgstr "São necessários privilégios de moderador"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "O JID ~s não é válido"
+msgid "Jabber ID ~s is invalid"
+msgstr "O Jabber ID ~s não é válido"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -830,7 +830,7 @@ msgid "No limit"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
+msgid "Present real Jabber IDs to"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:2741
@@ -987,7 +987,7 @@ msgid "Subscriber Address"
 msgstr ""
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
 msgstr ""
 
 #: mod_pubsub/mod_pubsub.erl:2497
@@ -1104,7 +1104,7 @@ msgstr "formato inválido"
 #: mod_roster.erl:855 mod_roster_odbc.erl:962
 #, fuzzy
 msgid "Add Jabber ID"
-msgstr "Adicionar JID"
+msgstr "Adicionar Jabber ID"
 
 #: mod_roster.erl:936 mod_roster_odbc.erl:1043
 msgid "Roster"
@@ -1501,7 +1501,7 @@ msgstr "Tempo de processador consumido"
 
 #: web/ejabberd_web_admin.erl:1874
 #, fuzzy
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Transacções realizadas"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/ru.msg b/src/msgs/ru.msg
index 93ca02cc6..4ef272f95 100644
--- a/src/msgs/ru.msg
+++ b/src/msgs/ru.msg
@@ -14,7 +14,7 @@
 {"Administrator privileges required","Требуются права администратора"}.
 {"A friendly name for the node","Легко запоминаемое имя для узла"}.
 {"All activity","Вся статистика"}.
-{"Allow this JID to subscribe to this pubsub node?","Разрешить этому JID подписаться на данный узел?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Разрешить этому JID подписаться на данный узел?"}.
 {"Allow users to change subject","Разрешить пользователям изменять тему"}.
 {"Allow users to query other users","Разрешить iq-запросы к пользователям"}.
 {"Allow users to send invites","Разрешить пользователям посылать приглашения"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","Введите список вида {Module, [Options]}"}.
 {"Enter nickname you want to register","Введите псевдоним, который Вы хотели бы зарегистрировать"}.
 {"Enter path to backup file","Введите путь к резервному файлу"}.
-{"Enter path to jabberd1.4 spool dir","Введите путь к директории спула jabberd1.4"}.
-{"Enter path to jabberd1.4 spool file","Введите путь к файлу из спула jabberd1.4"}.
+{"Enter path to jabberd14 spool dir","Введите путь к директории спула jabberd14"}.
+{"Enter path to jabberd14 spool file","Введите путь к файлу из спула jabberd14"}.
 {"Enter path to text file","Введите путь к текстовому файлу"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Введите имя пользователя и кодировки, которые будут использоваться при подключении к IRC-серверам"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
@@ -113,7 +113,7 @@
 {"Import File","Импорт из файла"}.
 {"Import User from File at ","Импорт пользователя из файла на "}.
 {"Import Users from Dir at ","Импорт пользователей из директории на "}.
-{"Import Users From jabberd 1.4 Spool Files","Импорт пользователей из спула jabberd 1.4"}.
+{"Import Users From jabberd14 Spool Files","Импорт пользователей из спула jabberd14"}.
 {"Improper message type","Неправильный тип сообщения"}.
 {"Incorrect password","Неправильный пароль"}.
 {"Invalid affiliation: ~s","Недопустимый ранг: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages","Запрещено посылать приватные сообщения"}.
 {"Jabber ID","Jabber ID"}.
 {"January","января"}.
-{"JID ~s is invalid","JID ~s недопустимый"}.
+{"Jabber ID ~s is invalid","JID ~s недопустимый"}.
 {"joins the room","вошёл(а) в комнату"}.
 {"July","июля"}.
 {"June","июня"}.
@@ -219,7 +219,7 @@
 {"Ping","Пинг"}.
 {"Pong","Понг"}.
 {"Port","Порт"}.
-{"Present real JIDs to","Сделать реальные JID участников видимыми"}.
+{"Present real Jabber IDs to","Сделать реальные JID участников видимыми"}.
 {"private, ","приватная, "}.
 {"Publish-Subscribe","Публикация-Подписка"}.
 {"PubSub subscriber request","Запрос подписчика PubSub"}.
@@ -307,7 +307,7 @@
 {"To","Кому"}.
 {"Traffic rate limit is exceeded","Превышен лимит скорости посылки информации"}.
 {"Transactions Aborted:","Транзакции отмененные:"}.
-{"Transactions Commited:","Транзакции завершенные:"}.
+{"Transactions Committed:","Транзакции завершенные:"}.
 {"Transactions Logged:","Транзакции запротоколированные:"}.
 {"Transactions Restarted:","Транзакции перезапущенные:"}.
 {"Tuesday","Вторник"}.
diff --git a/src/msgs/ru.po b/src/msgs/ru.po
index 8c6aa6207..f46e372b3 100644
--- a/src/msgs/ru.po
+++ b/src/msgs/ru.po
@@ -229,8 +229,8 @@ msgid "Backup Management"
 msgstr "Управление резервным копированием"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "Импорт пользователей из спула jabberd 1.4"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "Импорт пользователей из спула jabberd14"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -314,16 +314,16 @@ msgid "Import User from File at "
 msgstr "Импорт пользователя из файла на "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Введите путь к файлу из спула jabberd1.4"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Введите путь к файлу из спула jabberd14"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Импорт пользователей из директории на "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Введите путь к директории спула jabberd1.4"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Введите путь к директории спула jabberd14"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -754,8 +754,8 @@ msgid "Moderator privileges required"
 msgstr "Требуются права модератора"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "JID ~s недопустимый"
+msgid "Jabber ID ~s is invalid"
+msgstr "Jabber ID ~s недопустимый"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -807,8 +807,8 @@ msgid "No limit"
 msgstr "Не ограничено"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "Сделать реальные JID участников видимыми"
+msgid "Present real Jabber IDs to"
+msgstr "Сделать реальные Jabber ID участников видимыми"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -951,8 +951,8 @@ msgid "Subscriber Address"
 msgstr "Адрес подписчика"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "Разрешить этому JID подписаться на данный узел?"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "Разрешить этому Jabber ID подписаться на данный узел?"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1436,7 +1436,7 @@ msgid "CPU Time:"
 msgstr "Процессорное время:"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Транзакции завершенные:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/sk.msg b/src/msgs/sk.msg
index 25b1f9b03..be3539991 100644
--- a/src/msgs/sk.msg
+++ b/src/msgs/sk.msg
@@ -6,7 +6,7 @@
 {"Access rules","Prístupové pravidlá"}.
 {"Access Rules","Prístupové pravidlá"}.
 {"Action on user","Operácia aplikovaná na užívateľa"}.
-{"Add Jabber ID","Pridať JID"}.
+{"Add Jabber ID","Pridať Jabber ID"}.
 {"Add New","Pridať nový"}.
 {"Add User","Pridať používateľa"}.
 {"Administration","Administrácia"}.
@@ -14,7 +14,7 @@
 {"Administrator privileges required","Sú potrebné práva administrátora"}.
 {"A friendly name for the node","Prístupný názov pre uzol"}.
 {"All activity","Všetky aktivity"}.
-{"Allow this JID to subscribe to this pubsub node?","Dovoliť tomuto JID odoberať PubSub uzol?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Dovoliť tomuto JID odoberať PubSub uzol?"}.
 {"Allow users to change subject","Povoliť užívateľom zmeniť tému tejto miestnosti"}.
 {"Allow users to query other users","Povoliť užívateľom dotazovať sa informácie o iných užívateľoch"}.
 {"Allow users to send invites","Povoliť používateľom posielanie pozvánok"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","Vložte zoznam modulov {Modul, [Parametre]}"}.
 {"Enter nickname you want to register","Zadajte prezývku, ktorú chcete registrovať"}.
 {"Enter path to backup file","Zadajte cestu k súboru so zálohou"}.
-{"Enter path to jabberd1.4 spool dir","Zadajte cestu k jabberd1.4 spool adresáru"}.
-{"Enter path to jabberd1.4 spool file","Zadajte cestu k spool súboru jabberd1.4"}.
+{"Enter path to jabberd14 spool dir","Zadajte cestu k jabberd14 spool adresáru"}.
+{"Enter path to jabberd14 spool file","Zadajte cestu k spool súboru jabberd14"}.
 {"Enter path to text file","Zadajte cestu k textovému súboru"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Vložte meno používateľa a kódovanie, ktoré chcete používať pri pripojení na IRC server"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
@@ -113,7 +113,7 @@
 {"Import File","Import súboru"}.
 {"Import User from File at ","Importovať užívateľa zo súboru na "}.
 {"Import Users from Dir at ","Importovať užívateľov z adresára na "}.
-{"Import Users From jabberd 1.4 Spool Files","Importovať užívateľov z jabberd 1.4 spool súborov"}.
+{"Import Users From jabberd14 Spool Files","Importovať užívateľov z jabberd14 spool súborov"}.
 {"Improper message type","Nesprávny typ správy"}.
 {"Incorrect password","Nesprávne heslo"}.
 {"Invalid affiliation: ~s","Neplatné priradenie: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages to the conference","Nie je povolené odosielať súkromné správy do konferencie"}.
 {"Jabber ID","Jabber ID"}.
 {"January","Január"}.
-{"JID ~s is invalid","JID ~s je neplatné"}.
+{"Jabber ID ~s is invalid","JID ~s je neplatné"}.
 {"joins the room","vstúpil(a) do miestnosti"}.
 {"July","Júl"}.
 {"June","Jún"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Port"}.
-{"Present real JIDs to","Zobrazovať skutočné JID"}.
+{"Present real Jabber IDs to","Zobrazovať skutočné JID"}.
 {"private, ","súkromná, "}.
 {"Publish-Subscribe","Publish-Subscribe"}.
 {"PubSub subscriber request","Žiadosť odberateľa PubSub"}.
@@ -307,7 +307,7 @@
 {"To ~s","Pre ~s"}.
 {"Traffic rate limit is exceeded","Bol prekročený prenosový limit"}.
 {"Transactions Aborted:","Transakcie zrušená"}.
-{"Transactions Commited:","Transakcie potvrdená"}.
+{"Transactions Committed:","Transakcie potvrdená"}.
 {"Transactions Logged:","Transakcie zaznamenaná"}.
 {"Transactions Restarted:","Transakcie reštartovaná"}.
 {"Tuesday","Utorok"}.
diff --git a/src/msgs/sk.po b/src/msgs/sk.po
index faa0edd18..1501c2f51 100644
--- a/src/msgs/sk.po
+++ b/src/msgs/sk.po
@@ -226,8 +226,8 @@ msgid "Backup Management"
 msgstr "Správa zálohovania"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "Importovať užívateľov z jabberd 1.4 spool súborov"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "Importovať užívateľov z jabberd14 spool súborov"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -311,16 +311,16 @@ msgid "Import User from File at "
 msgstr "Importovať užívateľa zo súboru na "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Zadajte cestu k spool súboru jabberd1.4"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Zadajte cestu k spool súboru jabberd14"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Importovať užívateľov z adresára na "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Zadajte cestu k jabberd1.4 spool adresáru"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Zadajte cestu k jabberd14 spool adresáru"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -752,8 +752,8 @@ msgid "Moderator privileges required"
 msgstr "Sú potrebné práva moderátora"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "JID ~s je neplatné"
+msgid "Jabber ID ~s is invalid"
+msgstr "Jabber ID ~s je neplatné"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -805,8 +805,8 @@ msgid "No limit"
 msgstr "Bez limitu"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "Zobrazovať skutočné JID"
+msgid "Present real Jabber IDs to"
+msgstr "Zobrazovať skutočné Jabber ID"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -946,8 +946,8 @@ msgid "Subscriber Address"
 msgstr "Adresa odberateľa"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "Dovoliť tomuto JID odoberať PubSub uzol?"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "Dovoliť tomuto Jabber ID odoberať PubSub uzol?"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1059,7 +1059,7 @@ msgstr "Zlý formát"
 
 #: mod_roster.erl:855 mod_roster_odbc.erl:962
 msgid "Add Jabber ID"
-msgstr "Pridať JID"
+msgstr "Pridať Jabber ID"
 
 #: mod_roster.erl:936 mod_roster_odbc.erl:1043
 msgid "Roster"
@@ -1430,7 +1430,7 @@ msgid "CPU Time:"
 msgstr "Čas procesoru"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Transakcie potvrdená"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/sv.msg b/src/msgs/sv.msg
index 833839131..4f1d05d1b 100644
--- a/src/msgs/sv.msg
+++ b/src/msgs/sv.msg
@@ -14,7 +14,7 @@
 {"Administrator privileges required","Administrationsprivilegier krävs"}.
 {"A friendly name for the node","Ett vänligt namn for noden"}.
 {"All activity","All aktivitet"}.
-{"Allow this JID to subscribe to this pubsub node?","Tillåt denna JID att prenumerera på denna pubsub node"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Tillåt denna JID att prenumerera på denna pubsub node"}.
 {"Allow users to change subject","Tillåt användare att byta ämne"}.
 {"Allow users to query other users","Tillåt användare att söka efter andra användare"}.
 {"Allow users to send invites","Tillåt användare att skicka inbjudningar"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","Skriv in en lista av {Module, [Options]}"}.
 {"Enter nickname you want to register","Skriv in smeknamnet du vill registrera"}.
 {"Enter path to backup file","Skriv in sökväg till fil för säkerhetskopia"}.
-{"Enter path to jabberd1.4 spool dir","Skriv in sökväg till spoolkatalog från jabberd1.4"}.
-{"Enter path to jabberd1.4 spool file","Skriv in sökväg till spoolfil från jabberd1.4"}.
+{"Enter path to jabberd14 spool dir","Skriv in sökväg till spoolkatalog från jabberd14"}.
+{"Enter path to jabberd14 spool file","Skriv in sökväg till spoolfil från jabberd14"}.
 {"Enter path to text file","Skriv in sökväg till textfil"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Skriv in användarnamn och textkodning du vill använda för att ansluta till IRC-servrar"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
@@ -113,7 +113,7 @@
 {"Import File","Importera fil"}.
 {"Import User from File at ","Importera användare från fil på "}.
 {"Import Users from Dir at ","Importera användare från katalog på "}.
-{"Import Users From jabberd 1.4 Spool Files","Importera användare från jabberd 1.4 Spool filer"}.
+{"Import Users From jabberd14 Spool Files","Importera användare från jabberd14 Spool filer"}.
 {"Improper message type","Felaktig medelandetyp"}.
 {"Incorrect password","Fel lösenord"}.
 {"Invalid affiliation: ~s","Ogiltlig rang: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages to the conference","Det är inte tillåtet att skicka privata medelanden till den här konferensen"}.
 {"Jabber ID","Jabber ID"}.
 {"January","Januari"}.
-{"JID ~s is invalid","Otillåtet JID ~s"}.
+{"Jabber ID ~s is invalid","Otillåtet JID ~s"}.
 {"joins the room","joinar rummet"}.
 {"July","Juli"}.
 {"June","Juni"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Port"}.
-{"Present real JIDs to","Nuvarande äkta JIDs till"}.
+{"Present real Jabber IDs to","Nuvarande äkta JIDs till"}.
 {"private, ","privat, "}.
 {"Publish-Subscribe","Publikprenumeration"}.
 {"PubSub subscriber request","Pubsub prenumerationsforfrågan"}.
@@ -307,7 +307,7 @@
 {"To","Till"}.
 {"Traffic rate limit is exceeded","Trafikgränsen har överstigits"}.
 {"Transactions Aborted:","Transaktioner borttagna"}.
-{"Transactions Commited:","Transaktioner kommittade"}.
+{"Transactions Committed:","Transaktioner kommittade"}.
 {"Transactions Logged:","Transaktioner loggade "}.
 {"Transactions Restarted:","Transaktioner omstartade"}.
 {"Tuesday","Tisdag"}.
diff --git a/src/msgs/sv.po b/src/msgs/sv.po
index 06b5ebec1..bee475848 100644
--- a/src/msgs/sv.po
+++ b/src/msgs/sv.po
@@ -227,8 +227,8 @@ msgid "Backup Management"
 msgstr "Hantera säkerhetskopior"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "Importera användare från jabberd 1.4 Spool filer"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "Importera användare från jabberd14 Spool filer"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -312,16 +312,16 @@ msgid "Import User from File at "
 msgstr "Importera användare från fil på "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Skriv in sökväg till spoolfil från jabberd1.4"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Skriv in sökväg till spoolfil från jabberd14"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Importera användare från katalog på "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Skriv in sökväg till spoolkatalog från jabberd1.4"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Skriv in sökväg till spoolkatalog från jabberd14"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -756,8 +756,8 @@ msgid "Moderator privileges required"
 msgstr "Moderatorprivilegier krävs"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "Otillåtet JID ~s"
+msgid "Jabber ID ~s is invalid"
+msgstr "Otillåtet Jabber ID ~s"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -809,8 +809,8 @@ msgid "No limit"
 msgstr "Ingen gräns"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "Nuvarande äkta JIDs till"
+msgid "Present real Jabber IDs to"
+msgstr "Nuvarande äkta Jabber IDs till"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -950,8 +950,8 @@ msgid "Subscriber Address"
 msgstr "Prenumerationsadress"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "Tillåt denna JID att prenumerera på denna pubsub node"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "Tillåt denna Jabber ID att prenumerera på denna pubsub node"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1432,7 +1432,7 @@ msgid "CPU Time:"
 msgstr "CPU tid"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Transaktioner kommittade"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/th.msg b/src/msgs/th.msg
index 4f26865ff..667e52afa 100644
--- a/src/msgs/th.msg
+++ b/src/msgs/th.msg
@@ -13,7 +13,7 @@
 {"Administration of ","การดูแล "}.
 {"Administrator privileges required","ต้องมีสิทธิพิเศษของผู้ดูแลระบบ"}.
 {"All activity","กิจกรรมทั้งหมด"}.
-{"Allow this JID to subscribe to this pubsub node?","อนุญาตให้ JID นี้เข้าร่วมเป็นสมาชิกของโหนด pubsub หรือไม่"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","อนุญาตให้ JID นี้เข้าร่วมเป็นสมาชิกของโหนด pubsub หรือไม่"}.
 {"Allow users to change subject","อนุญาตให้ผู้ใช้เปลี่ยนหัวข้อได้"}.
 {"Allow users to query other users","อนุญาตให้ผู้ใช้ถามคำถามกับผู้ใช้คนอื่นๆ ได้"}.
 {"Allow users to send invites","อนุญาตให้ผู้ใช้ส่งคำเชิญถึงกันได้"}.
@@ -76,8 +76,8 @@
 {"Enter list of {Module, [Options]}","ป้อนรายการของ {โมดูล, [ตัวเลือก]}"}.
 {"Enter nickname you want to register","ป้อนชื่อเล่นที่คุณต้องการลงทะเบียน"}.
 {"Enter path to backup file","ป้อนพาธเพื่อสำรองไฟล์ข้อมูล"}.
-{"Enter path to jabberd1.4 spool dir","ป้อนพาธไปยัง jabberd 1.4 spool dir"}.
-{"Enter path to jabberd1.4 spool file","ป้อนพาธไปยังไฟล์เก็บพักข้อมูล jabberd 1.4"}.
+{"Enter path to jabberd14 spool dir","ป้อนพาธไปยัง jabberd14 spool dir"}.
+{"Enter path to jabberd14 spool file","ป้อนพาธไปยังไฟล์เก็บพักข้อมูล jabberd14"}.
 {"Enter path to text file","ป้อนพาธของไฟล์ข้อความ"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","ป้อนชื่อผู้ใช้และการเข้ารหัสที่คุณต้องการใช้สำหรับเชื่อมต่อกับเซิร์ฟเวอร์ IRC"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
@@ -106,7 +106,7 @@
 {"Import File","อิมพอร์ตไฟล์"}.
 {"Import User from File at ","อิมพอร์ตผู้ใช้จากไฟล์ที่"}.
 {"Import Users from Dir at ","อิมพอร์ตผู้ใช้จาก Dir ที่"}.
-{"Import Users From jabberd 1.4 Spool Files","อิมพอร์ตผู้ใช้จากไฟล์เก็บพักข้อมูล jabberd 1.4"}.
+{"Import Users From jabberd14 Spool Files","อิมพอร์ตผู้ใช้จากไฟล์เก็บพักข้อมูล jabberd14"}.
 {"Improper message type","ประเภทข้อความไม่เหมาะสม"}.
 {"Incorrect password","รหัสผ่านไม่ถูกต้อง"}.
 {"Invalid affiliation: ~s","การเข้าร่วมที่ไม่ถูกต้อง: ~s"}.
@@ -119,7 +119,7 @@
 {"It is not allowed to send private messages to the conference","ไม่อนุญาตให้ส่งข้อความส่วนตัวไปยังห้องประชุม"}.
 {"Jabber ID","Jabber ID"}.
 {"January","มกราคม"}.
-{"JID ~s is invalid","JID ~s ไม่ถูกต้อง"}.
+{"Jabber ID ~s is invalid","JID ~s ไม่ถูกต้อง"}.
 {"joins the room","เข้าห้องสนทนานี้"}.
 {"July","กรกฎาคม"}.
 {"June","มิถุนายน"}.
@@ -210,7 +210,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","พอร์ท"}.
-{"Present real JIDs to","แสดง JIDs ที่ถูกต้องแก่"}.
+{"Present real Jabber IDs to","แสดง JIDs ที่ถูกต้องแก่"}.
 {"private, ","ส่วนตัว, "}.
 {"Publish-Subscribe","เผยแพร่-สมัครเข้าใช้งาน"}.
 {"PubSub subscriber request","คำร้องขอของผู้สมัครเข้าใช้งาน PubSub"}.
@@ -294,7 +294,7 @@
 {"To ~s","ถึง ~s"}.
 {"Traffic rate limit is exceeded","อัตราของปริมาณการเข้าใช้เกินขีดจำกัด"}.
 {"Transactions Aborted:","ทรานแซกชันที่ถูกยกเลิก:"}.
-{"Transactions Commited:","ทรานแซกชันที่ได้รับมอบหมาย:"}.
+{"Transactions Committed:","ทรานแซกชันที่ได้รับมอบหมาย:"}.
 {"Transactions Logged:","ทรานแซกชันที่บันทึก:"}.
 {"Transactions Restarted:","ทรานแซกชันที่เริ่มทำงานใหม่อีกครั้ง:"}.
 {"Tuesday","วันอังคาร"}.
diff --git a/src/msgs/th.po b/src/msgs/th.po
index de3beb8ce..c53a2c708 100644
--- a/src/msgs/th.po
+++ b/src/msgs/th.po
@@ -223,8 +223,8 @@ msgid "Backup Management"
 msgstr "การจัดการข้อมูลสำรอง"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "อิมพอร์ตผู้ใช้จากไฟล์เก็บพักข้อมูล jabberd 1.4"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "อิมพอร์ตผู้ใช้จากไฟล์เก็บพักข้อมูล jabberd14"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -308,16 +308,16 @@ msgid "Import User from File at "
 msgstr "อิมพอร์ตผู้ใช้จากไฟล์ที่"
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "ป้อนพาธไปยังไฟล์เก็บพักข้อมูล jabberd 1.4"
+msgid "Enter path to jabberd14 spool file"
+msgstr "ป้อนพาธไปยังไฟล์เก็บพักข้อมูล jabberd14"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "อิมพอร์ตผู้ใช้จาก Dir ที่"
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "ป้อนพาธไปยัง jabberd 1.4 spool dir"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "ป้อนพาธไปยัง jabberd14 spool dir"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -744,8 +744,8 @@ msgid "Moderator privileges required"
 msgstr "ต้องมีสิทธิพิเศษของผู้ดูแลการสนทนา"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "JID ~s ไม่ถูกต้อง"
+msgid "Jabber ID ~s is invalid"
+msgstr "Jabber ID ~s ไม่ถูกต้อง"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -797,8 +797,8 @@ msgid "No limit"
 msgstr "ไม่จำกัด"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "แสดง JIDs ที่ถูกต้องแก่"
+msgid "Present real Jabber IDs to"
+msgstr "แสดง Jabber IDs ที่ถูกต้องแก่"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -941,8 +941,8 @@ msgid "Subscriber Address"
 msgstr "ที่อยู่ของผู้สมัคร"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "อนุญาตให้ JID นี้เข้าร่วมเป็นสมาชิกของโหนด pubsub หรือไม่"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "อนุญาตให้ Jabber ID นี้เข้าร่วมเป็นสมาชิกของโหนด pubsub หรือไม่"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1425,7 +1425,7 @@ msgid "CPU Time:"
 msgstr "เวลาการทำงานของ CPU:"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "ทรานแซกชันที่ได้รับมอบหมาย:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/tr.msg b/src/msgs/tr.msg
index 26bdf85f8..19ab8b577 100644
--- a/src/msgs/tr.msg
+++ b/src/msgs/tr.msg
@@ -14,7 +14,7 @@
 {"Administrator privileges required","Yönetim yetkileri gerekli"}.
 {"A friendly name for the node","Düğüm için dostane bir isim"}.
 {"All activity","Tüm aktivite"}.
-{"Allow this JID to subscribe to this pubsub node?","Bu JID bu pubsub düğümüne üye olmasına izin verilsin mi?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Bu JID bu pubsub düğümüne üye olmasına izin verilsin mi?"}.
 {"Allow users to change subject","Kullanıcıların konu değiştirmesine izin ver"}.
 {"Allow users to query other users","Kullanıcıların diğer kullanıcıları sorgulamalarına izin ver"}.
 {"Allow users to send invites","Kullanıcıların davetiye göndermelerine izin ver"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","{Module, [Options]} listesi giriniz"}.
 {"Enter nickname you want to register","Kaydettirmek istediğiniz takma ismi giriniz"}.
 {"Enter path to backup file","Yedek dosyasının yolunu giriniz"}.
-{"Enter path to jabberd1.4 spool dir","jabberd1.4 spool dosyası için yol giriniz"}.
-{"Enter path to jabberd1.4 spool file","jabberd1.4 spool dosyası için yol giriniz"}.
+{"Enter path to jabberd14 spool dir","jabberd14 spool dosyası için yol giriniz"}.
+{"Enter path to jabberd14 spool file","jabberd14 spool dosyası için yol giriniz"}.
 {"Enter path to text file","Metin dosyasının yolunu giriniz"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","IRC sunuculara bağlanmak için kullanmak istediğiniz kullanıcı isimleri ve kodlamaları giriniz"}.
 {"Erlang Jabber Server","Erlang Jabber Sunucusu"}.
@@ -113,7 +113,7 @@
 {"Import File","Dosyayı İçe Aktar"}.
 {"Import User from File at ","Dosyadan Kullanıcıları İçe Aktar : "}.
 {"Import Users from Dir at ","Dizinden Kullanıcıları İçe Aktar : "}.
-{"Import Users From jabberd 1.4 Spool Files","Jabberd 1.4 Spool Dosyalarından Kullanıcıları İçeri Aktar"}.
+{"Import Users From jabberd14 Spool Files","Jabberd 1.4 Spool Dosyalarından Kullanıcıları İçeri Aktar"}.
 {"Improper message type","Uygunsuz mesaj tipi"}.
 {"Incorrect password","Yanlış parola"}.
 {"Invalid affiliation: ~s","Geçersiz ilişki: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages to the conference","Konferansa özel mesajlar gönderilmesine izin verilmiyor"}.
 {"Jabber ID","Jabber ID"}.
 {"January","Ocak"}.
-{"JID ~s is invalid","JID ~s geçersiz"}.
+{"Jabber ID ~s is invalid","JID ~s geçersiz"}.
 {"joins the room","odaya katıldı"}.
 {"July","Temmuz"}.
 {"June","Haziran"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Kapı (Port)"}.
-{"Present real JIDs to","Gerçek JID'lerini göster :"}.
+{"Present real Jabber IDs to","Gerçek JID'lerini göster :"}.
 {"private, ","özel"}.
 {"Publish-Subscribe","Yayınla-Üye Ol"}.
 {"PubSub subscriber request","PubSub üye isteği"}.
@@ -307,7 +307,7 @@
 {"To ~s","Kime ~s"}.
 {"Traffic rate limit is exceeded","Trafik oran sınırı aşıldı"}.
 {"Transactions Aborted:","İptal Edilen Hareketler (Transactions):"}.
-{"Transactions Commited:","Tamamlanan Hareketler (Transactions Commited):"}.
+{"Transactions Committed:","Tamamlanan Hareketler (Transactions Committed):"}.
 {"Transactions Logged:","Kaydı Tutulan Hareketler (Transactions):"}.
 {"Transactions Restarted:","Tekrar Başlatılan Hareketler (Transactions):"}.
 {"Tuesday","Salı"}.
diff --git a/src/msgs/tr.po b/src/msgs/tr.po
index f8baf6615..49b9821c2 100644
--- a/src/msgs/tr.po
+++ b/src/msgs/tr.po
@@ -224,7 +224,7 @@ msgid "Backup Management"
 msgstr "Yedek Yönetimi"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
+msgid "Import Users From jabberd14 Spool Files"
 msgstr "Jabberd 1.4 Spool Dosyalarından Kullanıcıları İçeri Aktar"
 
 #: mod_configure.erl:649
@@ -309,16 +309,16 @@ msgid "Import User from File at "
 msgstr "Dosyadan Kullanıcıları İçe Aktar : "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "jabberd1.4 spool dosyası için yol giriniz"
+msgid "Enter path to jabberd14 spool file"
+msgstr "jabberd14 spool dosyası için yol giriniz"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Dizinden Kullanıcıları İçe Aktar : "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "jabberd1.4 spool dosyası için yol giriniz"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "jabberd14 spool dosyası için yol giriniz"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -755,8 +755,8 @@ msgid "Moderator privileges required"
 msgstr "Moderatör yetkileri gerekli"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "JID ~s geçersiz"
+msgid "Jabber ID ~s is invalid"
+msgstr "Jabber ID ~s geçersiz"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -808,8 +808,8 @@ msgid "No limit"
 msgstr "Sınırsız"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "Gerçek JID'lerini göster :"
+msgid "Present real Jabber IDs to"
+msgstr "Gerçek Jabber ID'lerini göster :"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -952,8 +952,8 @@ msgid "Subscriber Address"
 msgstr "Üye Olanın Adresi"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "Bu JID bu pubsub düğümüne üye olmasına izin verilsin mi?"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "Bu Jabber ID bu pubsub düğümüne üye olmasına izin verilsin mi?"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1437,8 +1437,8 @@ msgid "CPU Time:"
 msgstr "İşlemci Zamanı:"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
-msgstr "Tamamlanan Hareketler (Transactions Commited):"
+msgid "Transactions Committed:"
+msgstr "Tamamlanan Hareketler (Transactions Committed):"
 
 #: web/ejabberd_web_admin.erl:1877
 msgid "Transactions Aborted:"
diff --git a/src/msgs/uk.msg b/src/msgs/uk.msg
index a35bc83ef..e37b1d163 100644
--- a/src/msgs/uk.msg
+++ b/src/msgs/uk.msg
@@ -14,7 +14,7 @@
 {"Administrator privileges required","Необхідні права адміністратора"}.
 {"A friendly name for the node","Псевдонім для вузла"}.
 {"All activity","Вся статистика"}.
-{"Allow this JID to subscribe to this pubsub node?","Чи дозволити цьому JID абонувати новини наданого вузла"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Чи дозволити цьому JID абонувати новини наданого вузла"}.
 {"Allow users to change subject","Дозволити користувачам змінювати тему"}.
 {"Allow users to query other users","Дозволити iq-запити до користувачів"}.
 {"Allow users to send invites","Дозволити користувачам надсилати запрошення"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","Введіть перелік такого виду {Module, [Options]}"}.
 {"Enter nickname you want to register","Введіть псевдонім, який ви хочете зареєструвати"}.
 {"Enter path to backup file","Введіть шлях до резервного файла"}.
-{"Enter path to jabberd1.4 spool dir","Введіть шлях до директорії спула jabberd1.4"}.
-{"Enter path to jabberd1.4 spool file","Введіть шлях до файла зі спула jabberd1.4"}.
+{"Enter path to jabberd14 spool dir","Введіть шлях до директорії спула jabberd14"}.
+{"Enter path to jabberd14 spool file","Введіть шлях до файла зі спула jabberd14"}.
 {"Enter path to text file","Введіть шлях до текстового файла"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Введіть ім'я користувача та кодування, які будуть використовуватися при підключенні до IRC-серверів"}.
 {"Erlang Jabber Server","Erlang Jabber Server"}.
@@ -113,7 +113,7 @@
 {"Import File","Імпорт з файла"}.
 {"Import User from File at ","Імпортування користувача з файла на "}.
 {"Import Users from Dir at ","Імпортування користувача з директорії на "}.
-{"Import Users From jabberd 1.4 Spool Files","Імпорт користувачів зі спулу jabberd 1.4"}.
+{"Import Users From jabberd14 Spool Files","Імпорт користувачів зі спулу jabberd14"}.
 {"Improper message type","Неправильний тип повідомлення"}.
 {"Incorrect password","Неправильний пароль"}.
 {"Invalid affiliation: ~s","Недопустимий ранг: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages","Приватні повідомлення не дозволені"}.
 {"Jabber ID","Jabber ID"}.
 {"January","січня"}.
-{"JID ~s is invalid","JID ~s недопустимий"}.
+{"Jabber ID ~s is invalid","JID ~s недопустимий"}.
 {"joins the room","увійшов(ла) в кімнату"}.
 {"July","липня"}.
 {"June","червня"}.
@@ -219,7 +219,7 @@
 {"Ping","Пінг"}.
 {"Pong","Понг"}.
 {"Port","Порт"}.
-{"Present real JIDs to","Зробити реальні JID учасників видимими"}.
+{"Present real Jabber IDs to","Зробити реальні JID учасників видимими"}.
 {"private, ","приватна, "}.
 {"Publish-Subscribe","Опублікувати-Абонувати"}.
 {"PubSub subscriber request","Запит на абонування PubSub"}.
@@ -307,7 +307,7 @@
 {"To","Кому"}.
 {"Traffic rate limit is exceeded","Швидкість передачі інформації було перевищено"}.
 {"Transactions Aborted:","Транзакції відмінені:"}.
-{"Transactions Commited:","Транзакції завершені:"}.
+{"Transactions Committed:","Транзакції завершені:"}.
 {"Transactions Logged:","Транзакції запротокольовані:"}.
 {"Transactions Restarted:","Транзакції перезапущені:"}.
 {"Tuesday","Вівторок"}.
diff --git a/src/msgs/uk.po b/src/msgs/uk.po
index 2eebfdad0..d43a85438 100644
--- a/src/msgs/uk.po
+++ b/src/msgs/uk.po
@@ -229,8 +229,8 @@ msgid "Backup Management"
 msgstr "Керування резервним копіюванням"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "Імпорт користувачів зі спулу jabberd 1.4"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "Імпорт користувачів зі спулу jabberd14"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -314,16 +314,16 @@ msgid "Import User from File at "
 msgstr "Імпортування користувача з файла на "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Введіть шлях до файла зі спула jabberd1.4"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Введіть шлях до файла зі спула jabberd14"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Імпортування користувача з директорії на "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Введіть шлях до директорії спула jabberd1.4"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Введіть шлях до директорії спула jabberd14"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -756,8 +756,8 @@ msgid "Moderator privileges required"
 msgstr "Необхідні права модератора"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "JID ~s недопустимий"
+msgid "Jabber ID ~s is invalid"
+msgstr "Jabber ID ~s недопустимий"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -809,8 +809,8 @@ msgid "No limit"
 msgstr "Без обмежень"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "Зробити реальні JID учасників видимими"
+msgid "Present real Jabber IDs to"
+msgstr "Зробити реальні Jabber ID учасників видимими"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -953,8 +953,8 @@ msgid "Subscriber Address"
 msgstr "Адреса абонента"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "Чи дозволити цьому JID абонувати новини наданого вузла"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "Чи дозволити цьому Jabber ID абонувати новини наданого вузла"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1438,7 +1438,7 @@ msgid "CPU Time:"
 msgstr "Процесорний час:"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Транзакції завершені:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/vi.msg b/src/msgs/vi.msg
index 77783bd42..01b3d99b4 100644
--- a/src/msgs/vi.msg
+++ b/src/msgs/vi.msg
@@ -13,7 +13,7 @@
 {"Administration","Quản trị"}.
 {"Administrator privileges required","Yêu cầu đặc quyền của nhà quản trị"}.
 {"All activity","Tất cả hoạt động"}.
-{"Allow this JID to subscribe to this pubsub node?","Cho phép JID đăng ký nút môđun xuất bản đăng ký này không?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Cho phép JID đăng ký nút môđun xuất bản đăng ký này không?"}.
 {"Allow users to change subject","Cho phép người sử dụng thay đổi chủ đề"}.
 {"Allow users to query other users","Cho phép người sử dụng hỏi người sử dụng khác"}.
 {"Allow users to send invites","Cho phép người sử dụng gửi lời mời"}.
@@ -76,8 +76,8 @@
 {"Enter list of {Module, [Options]}","Nhập danh sách {Môđun, [Các Tùy Chọn]}"}.
 {"Enter nickname you want to register","Nhập bí danh bạn muốn đăng ký"}.
 {"Enter path to backup file","Nhập đường dẫn đến tập tin sao lưu dự phòng"}.
-{"Enter path to jabberd1.4 spool dir","Nhập đường dẫn đến thư mục spool jabberd1,4"}.
-{"Enter path to jabberd1.4 spool file","Nhập đường dẫn đến tập tin spool jabberd1,4"}.
+{"Enter path to jabberd14 spool dir","Nhập đường dẫn đến thư mục spool jabberd14"}.
+{"Enter path to jabberd14 spool file","Nhập đường dẫn đến tập tin spool jabberd14"}.
 {"Enter path to text file","Nhập đường dẫn đến tập tin văn bản"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","Nhập tên truy cập và mã hóa mà bạn muốn sử dụng khi kết nối với các máy chủ IRC"}.
 {"Erlang Jabber Server","Erlang Jabber Server Bản quyền"}.
@@ -106,7 +106,7 @@
 {"Import File","Nhập Tập Tin"}.
 {"Import User from File at ","Nhập Người Sử Dụng từ Tập Tin tại"}.
 {"Import Users from Dir at ","Nhập Người Sử Dụng từ Thư Mục tại"}.
-{"Import Users From jabberd 1.4 Spool Files","Nhập Người Sử Dụng Từ Các Tập Tin Spool jabberd 1,4"}.
+{"Import Users From jabberd14 Spool Files","Nhập Người Sử Dụng Từ Các Tập Tin Spool jabberd14"}.
 {"Improper message type","Loại thư không phù hợp"}.
 {"Incorrect password","Mật khẩu sai"}.
 {"Invalid affiliation: ~s","Tư cách không hợp lệ: ~s"}.
@@ -119,7 +119,7 @@
 {"It is not allowed to send private messages to the conference","Không được phép gửi những thư riêng đến phòng họp"}.
 {"Jabber ID","Jabber ID"}.
 {"January","Tháng Một"}.
-{"JID ~s is invalid","JID ~s không hợp lệ"}.
+{"Jabber ID ~s is invalid","JID ~s không hợp lệ"}.
 {"joins the room","tham gia phòng này"}.
 {"July","Tháng Bảy"}.
 {"June","Tháng Sáu"}.
@@ -210,7 +210,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Cổng"}.
-{"Present real JIDs to","JID thực tế hiện hành đến"}.
+{"Present real Jabber IDs to","JID thực tế hiện hành đến"}.
 {"private, ","riêng,"}.
 {"Publish-Subscribe","Xuất Bản-Đăng Ký"}.
 {"PubSub subscriber request","Yêu cầu người đăng ký môđun Xuất Bản Đăng Ký"}.
@@ -294,7 +294,7 @@
 {"To ~s","Gửi đến ~s"}.
 {"Traffic rate limit is exceeded","Quá giới hạn tỷ lệ lưu lượng truyền tải"}.
 {"Transactions Aborted:","Giao Dịch Hủy Bỏ:"}.
-{"Transactions Commited:","Giao Dịch Được Cam Kết:"}.
+{"Transactions Committed:","Giao Dịch Được Cam Kết:"}.
 {"Transactions Logged:","Giao Dịch Được Ghi Nhận:"}.
 {"Transactions Restarted:","Giao Dịch Khởi Động Lại:"}.
 {"Tuesday","Thứ Ba"}.
diff --git a/src/msgs/vi.po b/src/msgs/vi.po
index 8cdb0c945..963841636 100644
--- a/src/msgs/vi.po
+++ b/src/msgs/vi.po
@@ -226,8 +226,8 @@ msgid "Backup Management"
 msgstr "Quản lý Sao Lưu Dự Phòng"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
-msgstr "Nhập Người Sử Dụng Từ Các Tập Tin Spool jabberd 1,4"
+msgid "Import Users From jabberd14 Spool Files"
+msgstr "Nhập Người Sử Dụng Từ Các Tập Tin Spool jabberd14"
 
 #: mod_configure.erl:649
 msgid "To ~s"
@@ -311,16 +311,16 @@ msgid "Import User from File at "
 msgstr "Nhập Người Sử Dụng từ Tập Tin tại"
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Nhập đường dẫn đến tập tin spool jabberd1,4"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Nhập đường dẫn đến tập tin spool jabberd14"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Nhập Người Sử Dụng từ Thư Mục tại"
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Nhập đường dẫn đến thư mục spool jabberd1,4"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Nhập đường dẫn đến thư mục spool jabberd14"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -757,8 +757,8 @@ msgid "Moderator privileges required"
 msgstr "Yêu cầu đặc quyền của nhà điều phối"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "JID ~s không hợp lệ"
+msgid "Jabber ID ~s is invalid"
+msgstr "Jabber ID ~s không hợp lệ"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -810,8 +810,8 @@ msgid "No limit"
 msgstr "Không giới hạn"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "JID thực tế hiện hành đến"
+msgid "Present real Jabber IDs to"
+msgstr "Jabber ID thực tế hiện hành đến"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -957,8 +957,8 @@ msgid "Subscriber Address"
 msgstr "Địa Chỉ Người Đăng Ký"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "Cho phép JID đăng ký nút môđun xuất bản đăng ký này không?"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "Cho phép Jabber ID đăng ký nút môđun xuất bản đăng ký này không?"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1446,7 +1446,7 @@ msgid "CPU Time:"
 msgstr "Thời Gian CPU:"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Giao Dịch Được Cam Kết:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/wa.msg b/src/msgs/wa.msg
index c032ca866..5b5c8f9cd 100644
--- a/src/msgs/wa.msg
+++ b/src/msgs/wa.msg
@@ -14,7 +14,7 @@
 {"Administrator privileges required","I fåt des priviledjes di manaedjeu"}.
 {"A friendly name for the node","On no uzeu-ahessåve pol nuk"}.
 {"All activity","Dispoy todi"}.
-{"Allow this JID to subscribe to this pubsub node?","Permete ki ci JID ci si poye abouner a ç' nuk eplaidaedje-abounmint ci?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Permete ki ci JID ci si poye abouner a ç' nuk eplaidaedje-abounmint ci?"}.
 {"Allow users to change 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"}.
@@ -80,8 +80,8 @@
 {"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"}.
 {"Enter path to backup file","Dinez l' tchimin viè l' fitchî copeye di såvrité"}.
-{"Enter path to jabberd1.4 spool dir","Dinez l' tchimin viè l' ridant di spool jabberd1.4"}.
-{"Enter path to jabberd1.4 spool file","Dinez l' tchimin viè l' fitchî di spool jabberd1.4"}.
+{"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 username and encodings you wish to use for connecting to IRC servers","Dinez les nos d' uzeu et ls ecôdaedjes ki vos vloz eployî po vs raloyî åzès sierveus IRC"}.
 {"Erlang Jabber Server","Sierveu Jabber Erlang"}.
@@ -113,7 +113,7 @@
 {"Import File","Sititchî d' on fitchî"}.
 {"Import User from File at ","Sititchî uzeu d' on fitchî so "}.
 {"Import Users from Dir at ","Sitichî des uzeus d' on ridant so "}.
-{"Import Users From jabberd 1.4 Spool Files","Sititchî des uzeus Jabberd 1.4"}.
+{"Import Users From jabberd14 Spool Files","Sititchî des uzeus Jabberd 1.4"}.
 {"Improper message type","Sôre di messaedje nén valide"}.
 {"Incorrect password","Sicret nén corek"}.
 {"Invalid affiliation: ~s","Afiyaedje nén valide: ~s"}.
@@ -127,7 +127,7 @@
 {"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 ID","ID Jabber"}.
 {"January","djanvî"}.
-{"JID ~s is invalid","Li JID ~s n' est nén valide"}.
+{"Jabber ID ~s is invalid","Li JID ~s n' est nén valide"}.
 {"joins the room","arive sol såle"}.
 {"July","djulete"}.
 {"June","djun"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","Pôrt"}.
-{"Present real JIDs to","Mostrer les vraiys JIDs a"}.
+{"Present real Jabber IDs to","Mostrer les vraiys JIDs a"}.
 {"private, ","privé, "}.
 {"Publish-Subscribe","Eplaidaedje-abounmint"}.
 {"PubSub subscriber request","Dimande d' eplaidaedje-abounmint d' èn abouné"}.
@@ -307,7 +307,7 @@
 {"To ~s","Viè ~s"}.
 {"Traffic rate limit is exceeded","Li limite pol volume di trafik a stî passêye"}.
 {"Transactions Aborted:","Transaccions arestêyes:"}.
-{"Transactions Commited:","Transaccions evoyeyes:"}.
+{"Transactions Committed:","Transaccions evoyeyes:"}.
 {"Transactions Logged:","Transaccions wårdêyes e djournå:"}.
 {"Transactions Restarted:","Transaccions renondêyes:"}.
 {"Tuesday","mårdi"}.
diff --git a/src/msgs/wa.po b/src/msgs/wa.po
index 9dd938183..024844d1e 100644
--- a/src/msgs/wa.po
+++ b/src/msgs/wa.po
@@ -224,7 +224,7 @@ msgid "Backup Management"
 msgstr "Manaedjaedje des copeyes di såvrité"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
+msgid "Import Users From jabberd14 Spool Files"
 msgstr "Sititchî des uzeus Jabberd 1.4"
 
 #: mod_configure.erl:649
@@ -309,16 +309,16 @@ msgid "Import User from File at "
 msgstr "Sititchî uzeu d' on fitchî so "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "Dinez l' tchimin viè l' fitchî di spool jabberd1.4"
+msgid "Enter path to jabberd14 spool file"
+msgstr "Dinez l' tchimin viè l' fitchî di spool jabberd14"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "Sitichî des uzeus d' on ridant so "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "Dinez l' tchimin viè l' ridant di spool jabberd1.4"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "Dinez l' tchimin viè l' ridant di spool jabberd14"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -760,8 +760,8 @@ msgid "Moderator privileges required"
 msgstr "I fåt des priviledjes di moderateu"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "Li JID ~s n' est nén valide"
+msgid "Jabber ID ~s is invalid"
+msgstr "Li Jabber ID ~s n' est nén valide"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -813,8 +813,8 @@ msgid "No limit"
 msgstr "Pont d' limite"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "Mostrer les vraiys JIDs a"
+msgid "Present real Jabber IDs to"
+msgstr "Mostrer les vraiys Jabber IDs a"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -958,9 +958,9 @@ msgid "Subscriber Address"
 msgstr "Adresse di l' abouné"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
 msgstr ""
-"Permete ki ci JID ci si poye abouner a ç' nuk eplaidaedje-abounmint ci?"
+"Permete ki ci Jabber ID ci si poye abouner a ç' nuk eplaidaedje-abounmint ci?"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1445,7 +1445,7 @@ msgid "CPU Time:"
 msgstr "Tins CPU:"
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "Transaccions evoyeyes:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/msgs/zh.msg b/src/msgs/zh.msg
index 82d0d1fae..1187bc2c4 100644
--- a/src/msgs/zh.msg
+++ b/src/msgs/zh.msg
@@ -14,7 +14,7 @@
 {"Administrator privileges required","需要管理员权限"}.
 {"A friendly name for the node","该节点的友好名称"}.
 {"All activity","所有活动"}.
-{"Allow this JID to subscribe to this pubsub node?","允许该JID订阅该pubsub节点?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","允许该JID订阅该pubsub节点?"}.
 {"Allow users to change subject","允许用户更改主题"}.
 {"Allow users to query other users","允许用户查询其它用户"}.
 {"Allow users to send invites","允许用户发送邀请"}.
@@ -80,8 +80,8 @@
 {"Enter list of {Module, [Options]}","请输入{模块, [选项]}列表"}.
 {"Enter nickname you want to register","请输入您想要注册的昵称"}.
 {"Enter path to backup file","请输入备份文件的路径"}.
-{"Enter path to jabberd1.4 spool dir","请输入jabberd1.4 spool目录的路径"}.
-{"Enter path to jabberd1.4 spool file","请输入jabberd1.4 spool文件的路径"}.
+{"Enter path to jabberd14 spool dir","请输入jabberd14 spool目录的路径"}.
+{"Enter path to jabberd14 spool file","请输入jabberd14 spool文件的路径"}.
 {"Enter path to text file","请输入文本文件的路径"}.
 {"Enter username and encodings you wish to use for connecting to IRC servers","请输入您想使用的用来连接到IRC服务器的用户名和编码"}.
 {"Erlang Jabber Server","Erlang Jabber 服务器"}.
@@ -113,7 +113,7 @@
 {"Import File","导入文件"}.
 {"Import User from File at ","导入用户的文件位于 "}.
 {"Import Users from Dir at ","导入用户的目录位于 "}.
-{"Import Users From jabberd 1.4 Spool Files","从Jabberd 1.4 Spool文件导入用户"}.
+{"Import Users From jabberd14 Spool Files","从Jabberd 1.4 Spool文件导入用户"}.
 {"Improper message type","消息类型不恰当"}.
 {"Incorrect password","密码不正确"}.
 {"Invalid affiliation: ~s","无效加入: ~s"}.
@@ -127,7 +127,7 @@
 {"It is not allowed to send private messages","不允许发送私聊消息"}.
 {"Jabber ID","Jabber ID"}.
 {"January","一月"}.
-{"JID ~s is invalid","JID ~s无效"}.
+{"Jabber ID ~s is invalid","JID ~s无效"}.
 {"joins the room","加入房间"}.
 {"July","七月"}.
 {"June","六月"}.
@@ -219,7 +219,7 @@
 {"Ping","Ping"}.
 {"Pong","Pong"}.
 {"Port","端口"}.
-{"Present real JIDs to","将真实JID显示给"}.
+{"Present real Jabber IDs to","将真实JID显示给"}.
 {"private, ","保密"}.
 {"Publish-Subscribe","发布-订阅"}.
 {"PubSub subscriber request","PubSub订阅人请求"}.
@@ -307,7 +307,7 @@
 {"To","到"}.
 {"Traffic rate limit is exceeded","已经超过传输率限制"}.
 {"Transactions Aborted:","取消的事务:"}.
-{"Transactions Commited:","提交的事务:"}.
+{"Transactions Committed:","提交的事务:"}.
 {"Transactions Logged:","记入日志的事务:"}.
 {"Transactions Restarted:","重启的事务:"}.
 {"Tuesday","星期二"}.
diff --git a/src/msgs/zh.po b/src/msgs/zh.po
index 91169c305..06e67e682 100644
--- a/src/msgs/zh.po
+++ b/src/msgs/zh.po
@@ -225,7 +225,7 @@ msgid "Backup Management"
 msgstr "备份管理"
 
 #: mod_configure.erl:534
-msgid "Import Users From jabberd 1.4 Spool Files"
+msgid "Import Users From jabberd14 Spool Files"
 msgstr "从Jabberd 1.4 Spool文件导入用户"
 
 #: mod_configure.erl:649
@@ -310,16 +310,16 @@ msgid "Import User from File at "
 msgstr "导入用户的文件位于 "
 
 #: mod_configure.erl:980
-msgid "Enter path to jabberd1.4 spool file"
-msgstr "请输入jabberd1.4 spool文件的路径"
+msgid "Enter path to jabberd14 spool file"
+msgstr "请输入jabberd14 spool文件的路径"
 
 #: mod_configure.erl:990
 msgid "Import Users from Dir at "
 msgstr "导入用户的目录位于 "
 
 #: mod_configure.erl:994
-msgid "Enter path to jabberd1.4 spool dir"
-msgstr "请输入jabberd1.4 spool目录的路径"
+msgid "Enter path to jabberd14 spool dir"
+msgstr "请输入jabberd14 spool目录的路径"
 
 #: mod_configure.erl:995
 msgid "Path to Dir"
@@ -743,8 +743,8 @@ msgid "Moderator privileges required"
 msgstr "需要调解人权限"
 
 #: mod_muc/mod_muc_room.erl:2198
-msgid "JID ~s is invalid"
-msgstr "JID ~s无效"
+msgid "Jabber ID ~s is invalid"
+msgstr "Jabber ID ~s无效"
 
 #: mod_muc/mod_muc_room.erl:2212
 msgid "Nickname ~s does not exist in the room"
@@ -796,8 +796,8 @@ msgid "No limit"
 msgstr "不限"
 
 #: mod_muc/mod_muc_room.erl:2733
-msgid "Present real JIDs to"
-msgstr "将真实JID显示给"
+msgid "Present real Jabber IDs to"
+msgstr "将真实Jabber ID显示给"
 
 #: mod_muc/mod_muc_room.erl:2741
 msgid "moderators only"
@@ -937,8 +937,8 @@ msgid "Subscriber Address"
 msgstr "订阅人地址"
 
 #: mod_pubsub/mod_pubsub.erl:1016
-msgid "Allow this JID to subscribe to this pubsub node?"
-msgstr "允许该JID订阅该pubsub节点?"
+msgid "Allow this Jabber ID to subscribe to this pubsub node?"
+msgstr "允许该Jabber ID订阅该pubsub节点?"
 
 #: mod_pubsub/mod_pubsub.erl:2497
 msgid "Deliver payloads with event notifications"
@@ -1416,7 +1416,7 @@ msgid "CPU Time:"
 msgstr "CPU时间："
 
 #: web/ejabberd_web_admin.erl:1874
-msgid "Transactions Commited:"
+msgid "Transactions Committed:"
 msgstr "提交的事务:"
 
 #: web/ejabberd_web_admin.erl:1877
diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl
index c8861fbdb..19733aabe 100644
--- a/src/web/ejabberd_web_admin.erl
+++ b/src/web/ejabberd_web_admin.erl
@@ -1856,7 +1856,7 @@ get_node(global, Node, ["stats"], _Query, Lang) ->
     CPUTime = rpc:call(Node, erlang, statistics, [runtime]),
     CPUTimeS = io_lib:format("~.3f", [element(1, CPUTime)/1000]),
     OnlineUsers = mnesia:table_info(session, size),
-    TransactionsCommited =
+    TransactionsCommitted =
 	rpc:call(Node, mnesia, system_info, [transaction_commits]),
     TransactionsAborted =
 	rpc:call(Node, mnesia, system_info, [transaction_failures]),
@@ -1877,9 +1877,9 @@ get_node(global, Node, ["stats"], _Query, Lang) ->
 		?XE("tr", [?XCT("td", "Online Users:"),
 			   ?XAC("td", [{"class", "alignright"}],
 				integer_to_list(OnlineUsers))]),
-		?XE("tr", [?XCT("td", "Transactions Commited:"),
+		?XE("tr", [?XCT("td", "Transactions Committed:"),
 			   ?XAC("td", [{"class", "alignright"}],
-				integer_to_list(TransactionsCommited))]),
+				integer_to_list(TransactionsCommitted))]),
 		?XE("tr", [?XCT("td", "Transactions Aborted:"),
 			   ?XAC("td", [{"class", "alignright"}],
 				integer_to_list(TransactionsAborted))]),