diff --git a/src/mod_muc/mod_muc.erl b/src/mod_muc/mod_muc.erl
index 2d8bf2b4e..b70a42539 100644
--- a/src/mod_muc/mod_muc.erl
+++ b/src/mod_muc/mod_muc.erl
@@ -586,7 +586,7 @@ do_route1(Host, ServerHost, Access, HistorySize, RoomShaper,
end;
_ ->
Lang = exmpp_stanza:get_lang(Packet),
- ErrText = "Conference room does not exist",
+ ErrText = "Room does not exist",
Err = exmpp_stanza:reply_with_error(Packet,
exmpp_stanza:error(Packet#xmlel.ns,
'item-not-found',
@@ -681,7 +681,7 @@ iq_disco_info(Lang) ->
?XMLATTR('type',
<<"text">>),
?XMLATTR('name',
- translate:translate(Lang, "Chatrooms"))]},
+ translate:translate(Lang, "Rooms"))]},
#xmlel{ns = ?NS_DISCO_INFO, name = 'feature', attrs =
[?XMLATTR('var',
?NS_DISCO_INFO_s)]},
diff --git a/src/mod_muc/mod_muc_log.erl b/src/mod_muc/mod_muc_log.erl
index a3211ab87..42e3e9649 100644
--- a/src/mod_muc/mod_muc_log.erl
+++ b/src/mod_muc/mod_muc_log.erl
@@ -373,14 +373,14 @@ add_message_to_log(Nick1, Message, RoomJID, Opts, State) ->
RoomConfig = roomconfig_to_string(Room#room.config, Lang, FileFormat),
put_room_config(F, RoomConfig, Lang, FileFormat),
io_lib:format("~s
",
- [?T("Chatroom configuration modified")]);
+ [?T("Room configuration modified")]);
{roomconfig_change, Occupants} ->
RoomConfig = roomconfig_to_string(Room#room.config, Lang, FileFormat),
put_room_config(F, RoomConfig, Lang, FileFormat),
RoomOccupants = roomoccupants_to_string(Occupants, FileFormat),
put_room_occupants(F, RoomOccupants, Lang, FileFormat),
io_lib:format("~s
",
- [?T("Chatroom configuration modified")]);
+ [?T("Room configuration modified")]);
join ->
io_lib:format("~s ~s
",
[Nick, ?T("joins the room")]);
@@ -451,10 +451,10 @@ add_message_to_log(Nick1, Message, RoomJID, Opts, State) ->
%%----------------------------------------------------------------------
%% Utilities
-get_room_existence_string(created, Lang) -> ?T("Chatroom is created");
-get_room_existence_string(destroyed, Lang) -> ?T("Chatroom is destroyed");
-get_room_existence_string(started, Lang) -> ?T("Chatroom is started");
-get_room_existence_string(stopped, Lang) -> ?T("Chatroom is stopped").
+get_room_existence_string(created, Lang) -> ?T("Room is created");
+get_room_existence_string(destroyed, Lang) -> ?T("Room is destroyed");
+get_room_existence_string(started, Lang) -> ?T("Room is started");
+get_room_existence_string(stopped, Lang) -> ?T("Room is stopped").
get_dateweek(Date, Lang) ->
Weekday = case calendar:day_of_the_week(Date) of
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index 772fc1143..8f8b59116 100644
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -271,7 +271,7 @@ normal_state({route, From, undefined,
{next_state, normal_state, StateData}
end;
chat ->
- ErrText = "It is not allowed to send private messages to the conference",
+ ErrText = "It is not allowed to send private messages to the room",
Err = exmpp_stanza:error(Packet#xmlel.ns,
'not-acceptable',
{Lang, translate:translate(Lang, ErrText)}),
@@ -453,7 +453,7 @@ normal_state({route, From, ToNick,
_ ->
case find_jid_by_nick(ToNick, StateData) of
false ->
- ErrText = "Recipient is not in the conference room",
+ ErrText = "Recipient is not in the room",
Err = exmpp_stanza:reply_with_error(Packet,
exmpp_stanza:error(Packet#xmlel.ns, 'item-not-found',
{Lang, translate:translate(Lang, ErrText)})),
@@ -474,7 +474,7 @@ normal_state({route, From, ToNick,
end
end;
{true, false} ->
- ErrText = "Only occupants are allowed to send messages to the conference",
+ ErrText = "Only occupants are allowed to send messages to the room",
Err = exmpp_stanza:reply_with_error(Packet,
exmpp_stanza:error(Packet#xmlel.ns, 'not-acceptable',
{Lang, translate:translate(Lang, ErrText)})),
@@ -513,7 +513,7 @@ normal_state({route, From, ToNick,
error ->
ok;
_ ->
- ErrText = "Recipient is not in the conference room",
+ ErrText = "Recipient is not in the room",
Err = exmpp_stanza:reply_with_error(Packet,
exmpp_stanza:error(Packet#xmlel.ns, 'item-not-found',
{Lang, translate:translate(Lang, ErrText)})),
@@ -539,7 +539,7 @@ normal_state({route, From, ToNick,
error ->
ok;
_ ->
- ErrText = "Only occupants are allowed to send queries to the conference",
+ ErrText = "Only occupants are allowed to send queries to the room",
Err = exmpp_stanza:reply_with_error(Packet,
exmpp_stanza:error(Packet#xmlel.ns, 'not-acceptable',
{Lang, translate:translate(Lang, ErrText)})),
@@ -554,7 +554,7 @@ normal_state({route, From, ToNick,
error ->
ok;
_ ->
- ErrText = "Queries to the conference members are not allowed in this room",
+ ErrText = "Queries to the room members are not allowed in this room",
Err = exmpp_stanza:reply_with_error(Packet,
exmpp_stanza:error(Packet#xmlel.ns, 'not-allowed',
{Lang, translate:translate(Lang, ErrText)})),
@@ -878,7 +878,7 @@ process_groupchat_message(From, #xmlel{name = 'message'} = Packet,
{next_state, normal_state, StateData}
end;
false ->
- ErrText = "Only occupants are allowed to send messages to the conference",
+ ErrText = "Only occupants are allowed to send messages to the room",
Err = exmpp_stanza:reply_with_error(Packet,
exmpp_stanza:error(Packet#xmlel.ns, 'not-acceptable',
{Lang, translate:translate(Lang, ErrText)})),
@@ -3666,7 +3666,7 @@ replace_subelement(#xmlel{children = Els} = El, #xmlel{name = Name} = NewSubEl)
exmpp_xml:set_children(El, Els2).
send_error_only_occupants(Packet, Lang, RoomJID, From) ->
- ErrText = "Only occupants are allowed to send messages to the conference",
+ ErrText = "Only occupants are allowed to send messages to the room",
Err = exmpp_stanza:reply_with_error(
Packet, ?ERR(Packet, 'not-acceptable', Lang, ErrText)),
ejabberd_router:route(RoomJID, From, Err).