From 2195e433dc6f8349a4d1bab558b3d3c93b89c825 Mon Sep 17 00:00:00 2001 From: Badlop Date: Wed, 8 Apr 2009 19:04:13 +0000 Subject: [PATCH] * src/mod_muc/mod_muc.erl: English fixes (thanks to Glenn Sieb) * src/mod_muc/mod_muc_log.erl: Likewise * src/mod_muc/mod_muc_room.erl: Likewise * src/mod_register.erl: Likewise * src/web/ejabberd_web_admin.erl: Likewise SVN Revision: 2009 --- ChangeLog | 6 ++++++ src/mod_muc/mod_muc.erl | 2 +- src/mod_muc/mod_muc_log.erl | 2 +- src/mod_muc/mod_muc_room.erl | 18 +++++++++--------- src/mod_register.erl | 2 +- src/web/ejabberd_web_admin.erl | 2 +- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40ae11a56..fce26e5ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-04-08 Badlop + * src/mod_muc/mod_muc.erl: English fixes (thanks to Glenn Sieb) + * src/mod_muc/mod_muc_log.erl: Likewise + * src/mod_muc/mod_muc_room.erl: Likewise + * src/mod_register.erl: Likewise + * src/web/ejabberd_web_admin.erl: Likewise + * src/mod_pubsub/mod_pubsub.erl: Quickfix compilation errors. * src/mod_irc/mod_irc_connection.erl: Fix compilation warnings. diff --git a/src/mod_muc/mod_muc.erl b/src/mod_muc/mod_muc.erl index bb1502b81..bd87b7e7a 100644 --- a/src/mod_muc/mod_muc.erl +++ b/src/mod_muc/mod_muc.erl @@ -719,7 +719,7 @@ iq_set_register_info(Host, From, Nick, Lang) when is_binary(Host), is_binary(Nic {atomic, ok} -> ok; {atomic, false} -> - ErrText = "Specified nickname is already registered", + ErrText = "That nickname is registered by another person", %%TODO: Always in the jabber:client namespace? {error,exmpp_stanza:error(?NS_JABBER_CLIENT, 'conflict', diff --git a/src/mod_muc/mod_muc_log.erl b/src/mod_muc/mod_muc_log.erl index 01b3cda01..f1fcbc18f 100644 --- a/src/mod_muc/mod_muc_log.erl +++ b/src/mod_muc/mod_muc_log.erl @@ -852,7 +852,7 @@ get_roomconfig_text(anonymous) -> "Make room semianonymous"; get_roomconfig_text(members_only) -> "Make room members-only"; get_roomconfig_text(moderated) -> "Make room moderated"; get_roomconfig_text(members_by_default) -> "Default users as participants"; -get_roomconfig_text(allow_change_subj) -> "Allow users to change subject"; +get_roomconfig_text(allow_change_subj) -> "Allow users to change the subject"; get_roomconfig_text(allow_private_messages) -> "Allow users to send private messages"; get_roomconfig_text(allow_query_users) -> "Allow users to query other users"; get_roomconfig_text(allow_user_invites) -> "Allow users to send invites"; diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl index 941066647..3d0608a95 100644 --- a/src/mod_muc/mod_muc_room.erl +++ b/src/mod_muc/mod_muc_room.erl @@ -793,13 +793,13 @@ process_groupchat_message(From, #xmlel{name = 'message'} = Packet, exmpp_stanza:error(Packet#xmlel.ns, 'forbidden', {Lang, translate:translate(Lang, "Only moderators and participants " - "are allowed to change subject in this room")})); + "are allowed to change the subject in this room")})); _ -> exmpp_stanza:reply_with_error(Packet, exmpp_stanza:error(Packet#xmlel.ns, 'forbidden', {Lang, translate:translate(Lang, "Only moderators " - "are allowed to change subject in this room")})) + "are allowed to change the subject in this room")})) end, ejabberd_router:route( StateData#state.jid, @@ -909,7 +909,7 @@ process_presence(From, Nick, #xmlel{name = 'presence'} = Packet, StateData; {true, _, _} -> Lang = exmpp_stanza:get_lang(Packet), - ErrText = "Nickname is already in use by another occupant", + ErrText = "That nickname is already in use by another occupant", Err = exmpp_stanza:reply_with_error(Packet, exmpp_stanza:error(Packet#xmlel.ns, 'conflict', {Lang, translate:translate(Lang, ErrText)})), @@ -920,7 +920,7 @@ process_presence(From, Nick, #xmlel{name = 'presence'} = Packet, From, Err), StateData; {_, false, _} -> - ErrText = "Nickname is registered by another person", + ErrText = "That nickname is registered by another person", Err = exmpp_stanza:reply_with_error(Packet, exmpp_stanza:error(Packet#xmlel.ns, 'conflict', {Lang, translate:translate(Lang, ErrText)})), @@ -1482,7 +1482,7 @@ add_new_user(From, Nick, Packet, StateData) -> 'forbidden', {Lang, translate:translate(Lang, ErrText)}); _ -> - ErrText = "Membership required to enter this room", + ErrText = "Membership is required to enter this room", exmpp_stanza:error(Packet#xmlel.ns, 'registration-required', {Lang, translate:translate(Lang, ErrText)}) @@ -1492,7 +1492,7 @@ add_new_user(From, Nick, Packet, StateData) -> From, Err), StateData; {_, true, _, _} -> - ErrText = "Nickname is already in use by another occupant", + ErrText = "That nickname is already in use by another occupant", Err = exmpp_stanza:reply_with_error(Packet, exmpp_stanza:error(Packet#xmlel.ns, 'conflict', @@ -1503,7 +1503,7 @@ add_new_user(From, Nick, Packet, StateData) -> From, Err), StateData; {_, _, false, _} -> - ErrText = "Nickname is registered by another person", + ErrText = "That nickname is registered by another person", Err = exmpp_stanza:reply_with_error(Packet, ?ERR(Packet, 'conflict', Lang, ErrText)), ejabberd_router:route( @@ -1553,7 +1553,7 @@ add_new_user(From, Nick, Packet, StateData) -> NewState end; nopass -> - ErrText = "Password required to enter this room", + ErrText = "The password is required to enter this room", Err = exmpp_stanza:reply_with_error( Packet, ?ERR(Packet, 'not-authorized', Lang, ErrText)), ejabberd_router:route( % TODO: s/Nick/""/ @@ -2817,7 +2817,7 @@ get_config(Lang, StateData, From) -> ?BOOLXFIELD("Default users as participants", "members_by_default", Config#config.members_by_default), - ?BOOLXFIELD("Allow users to change subject", + ?BOOLXFIELD("Allow users to change the subject", "muc#roomconfig_changesubject", Config#config.allow_change_subj), ?BOOLXFIELD("Allow users to send private messages", diff --git a/src/mod_register.erl b/src/mod_register.erl index f7800e0b2..5e895d6f2 100644 --- a/src/mod_register.erl +++ b/src/mod_register.erl @@ -233,7 +233,7 @@ try_register(User, Server, Password, Source, Lang) -> end; false -> ErrText = "Users are not allowed to register " - "accounts so fast", + "accounts so quickly", {error, exmpp_stanza:error(?NS_JABBER_CLIENT, 'resource-constraint', {Lang, ErrText})} end end diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl index 61664d2ce..484c9b393 100644 --- a/src/web/ejabberd_web_admin.erl +++ b/src/web/ejabberd_web_admin.erl @@ -1804,7 +1804,7 @@ get_node(global, Node, ["backup"], Query, Lang) -> end, [?XC('h1', ?T("Backup of ") ++ atom_to_list(Node))] ++ ResS ++ - [?XCT('p', "Remark that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately."), + [?XCT('p', "Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately."), ?XAE('form', [?XMLATTR('action', <<>>), ?XMLATTR('method', <<"post">>)], [?XAE('table', [], [?XE('tbody',