summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2012-04-24 10:13:20 +0200
committerBadlop <badlop@process-one.net>2012-04-24 13:51:54 +0200
commit7dd171322d989b90f2e0bba34674f9939b9ff6c8 (patch)
treea5c57dac89d04f78e216d894b3d45e5c2a67ce62
parentUpdate German translation again (thanks to Nikolaus Polak) (diff)
Fix English strings (thanks to Andreas van Cranenburgh)
-rw-r--r--src/ejabberd_captcha.erl2
-rw-r--r--src/mod_muc/mod_muc_room.erl6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl
index f374851a..13351bba 100644
--- a/src/ejabberd_captcha.erl
+++ b/src/ejabberd_captcha.erl
@@ -304,7 +304,7 @@ process(_Handlers, #request{method='POST', q=Q, lang=Lang, path=[_, Id]}) ->
Form =
{xmlelement, "p", [],
[{xmlcdata,
- translate:translate(Lang, "The captcha is valid.")
+ translate:translate(Lang, "The CAPTCHA is valid.")
}]},
ejabberd_web:make_xhtml([Form]);
captcha_non_valid ->
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index 13390b3b..a5845175 100644
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -363,7 +363,7 @@ normal_state({route, From, "",
error ->
ErrText = "Failed to extract "
"JID from your voice "
- "request approvement",
+ "request approval",
Err = jlib:make_error_reply(
Packet,
?ERRT_BAD_REQUEST(
@@ -1861,7 +1861,7 @@ add_new_user(From, Nick, {xmlelement, _, Attrs, Els} = Packet, StateData) ->
From, Err),
StateData;
_ ->
- ErrText = "Unable to generate a captcha",
+ ErrText = "Unable to generate a CAPTCHA",
Err = jlib:make_error_reply(
Packet, ?ERRT_INTERNAL_SERVER_ERROR(Lang, ErrText)),
ejabberd_router:route( % TODO: s/Nick/""/
@@ -3314,7 +3314,7 @@ get_config(Lang, StateData, From) ->
] ++
case ejabberd_captcha:is_feature_available() of
true ->
- [?BOOLXFIELD("Make room captcha protected",
+ [?BOOLXFIELD("Make room CAPTCHA protected",
"captcha_protected",
Config#config.captcha_protected)];
false -> []