Fix some English strings

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index c27baf81cdd30a4048a4a2b77ea967c42baeefa0..11c10d86146a242011138bfa9b7aa903750ea69e 100644 (file)
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1787,7 +1787,7 @@ check_privacy_route(From, StateData, FromRoute, To, Packet) ->
     case privacy_check_packet(StateData, From, To, Packet, out) of
        deny ->
            Lang = StateData#state.lang,
-           ErrText = "Routing of this stanza was denied by your active privacy list",
+           ErrText = "Your active privacy list has denied the routing of this stanza.",
            Err = jlib:make_error_reply(Packet, ?ERRT_NOT_ACCEPTABLE(Lang, ErrText)),
            ejabberd_router:route(To, From, Err),
            ok;

diff --git a/src/mod_muc/mod_muc.erl b/src/mod_muc/mod_muc.erl
index f79f4cd24ca85451da89f9af66af632ef68e3ec4..aacf652ead4257a10e1c8db3f5307ad14615abb0 100644 (file)
--- a/src/mod_muc/mod_muc.erl
+++ b/src/mod_muc/mod_muc.erl
@@ -708,7 +708,7 @@ iq_get_register_info(Host, From, Lang) ->
        [{xmlelement, "instructions", [],
          [{xmlcdata,
            translate:translate(
-             Lang, "You need an x:data capable client to register nickname")}]},
+             Lang, "You need a client that supports x:data to register the nickname")}]},
         {xmlelement, "x",
          [{"xmlns", ?NS_XDATA}],
          [{xmlelement, "title", [],

diff --git a/src/mod_register.erl b/src/mod_register.erl
index 2c9f9c50fcb74990120117f8d911fa2633827345..92b4df7129ee2f5cd0e72eb3308d207899a1247a 100644 (file)
--- a/src/mod_register.erl
+++ b/src/mod_register.erl
@@ -188,7 +188,7 @@ process_iq(From, To,
                            IQ#iq{type = error,
                                  sub_el = [SubEl, ?ERR_BAD_REQUEST]};
                        _ ->
-                           ErrText = "Captcha test failed",
+                           ErrText = "The CAPTCHA verification has failed",
                            IQ#iq{type = error,
                                  sub_el = [SubEl,
                                            ?ERRT_NOT_ALLOWED(Lang, ErrText)]}
@@ -215,8 +215,8 @@ process_iq(From, To,
                    TopInstrEl = {xmlelement, "instructions", [],
                                  [{xmlcdata,
                                    translate:translate(
-                                     Lang, "You need an x:data capable client "
-                                     "with CAPTCHA support to register")}]},
+                                     Lang, "You need a client that supports x:data "
+                                     "and CAPTCHA to register")}]},
                    InstrEl = {xmlelement, "instructions", [],
                               [{xmlcdata,
                                 translate:translate(
@@ -241,7 +241,7 @@ process_iq(From, To,
                                             [{"xmlns", "jabber:iq:register"}],
                                             [TopInstrEl | CaptchaEls]}]};
                        error ->
-                           ErrText = "Unable to generate a captcha",
+                           ErrText = "Unable to generate a CAPTCHA",
                            IQ#iq{type = error,
                                  sub_el = [SubEl, ?ERRT_INTERNAL_SERVER_ERROR(
                                                      Lang, ErrText)]}

diff --git a/src/web/mod_register_web.erl b/src/web/mod_register_web.erl
index 3da93dde8eb74700ea997c9cc03d425a89437582..f5f3002e4f3986aa14bfb00f783592d21fc0f76e 100644 (file)
--- a/src/web/mod_register_web.erl
+++ b/src/web/mod_register_web.erl
@@ -100,7 +100,7 @@ process(["new"], #request{method = 'POST', q = Q, ip = {Ip,_Port}, lang = Lang,
        {success, ok, {Username, Host, _Password}} ->
            Jid = jlib:make_jid(Username, Host, ""),
            send_registration_notifications(Jid, Ip),
-           Text = ?T("Your Jabber account was succesfully created."),
+           Text = ?T("Your Jabber account was successfully created."),
            {200, [], Text};
        Error ->
            ErrorText = ?T("There was an error creating the account: ") ++
@@ -111,7 +111,7 @@ process(["new"], #request{method = 'POST', q = Q, ip = {Ip,_Port}, lang = Lang,
 process(["delete"], #request{method = 'POST', q = Q, lang = Lang, host = Host}) ->
     case form_del_post(Q, Host) of
        {atomic, ok} ->
-           Text = ?T("Your Jabber account was succesfully deleted."),
+           Text = ?T("Your Jabber account was successfully deleted."),
            {200, [], Text};
        Error ->
            ErrorText = ?T("There was an error deleting the account: ") ++
@@ -124,7 +124,7 @@ process(["delete"], #request{method = 'POST', q = Q, lang = Lang, host = Host})
 process(["change_password"], #request{method = 'POST', q = Q, lang = Lang, host = Host}) ->
     case form_changepass_post(Q, Host) of
        {atomic, ok} ->
-           Text = ?T("The password of your Jabber account was succesfully changed."),
+           Text = ?T("The password of your Jabber account was successfully changed."),
            {200, [], Text};
        Error ->
            ErrorText = ?T("There was an error changing the password: ") ++