From 39bc499b10fa231c01e6edd2d7190327ea39ba13 Mon Sep 17 00:00:00 2001
From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Mon, 26 Sep 2011 20:00:43 +1000
Subject: [PATCH] Fix instruction and error text

---
 src/mod_muc/mod_muc_room.erl | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index e4daddb44..164805d9c 100644
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -340,7 +340,7 @@ normal_state({route, From, "",
 					end;
                                     false ->
 					ErrText = "Voice requests are "
-                                            "disabled in this room",
+                                            "disabled in this conference",
 					Err = jlib:make_error_reply(
 						Packet,
                                                 ?ERRT_FORBIDDEN(
@@ -3784,9 +3784,7 @@ prepare_request_form(Requester, Nick, Lang) ->
         {xmlelement, "instructions", [],
          [{xmlcdata,
            translate:translate(
-             Lang, "To approve this request for voice, select the "
-             "\"Grant voice to this person?\" checkbox and click OK. "
-             "To skip this request, click the cancel button.")}]},
+             Lang, "Either approve or decline the voice request.")}]},
         {xmlelement, "field", [{"var", "FORM_TYPE"}, {"type", "hidden"}],
          [{xmlelement, "value", [],
            [{xmlcdata, "http://jabber.org/protocol/muc#request"}]}]},