26 files changed, 176 insertions, 282 deletions

diff --git a/src/msgs/ca.po b/src/msgs/ca.po
index f8795a97e..412962bba 100644
--- a/src/msgs/ca.po
+++ b/src/msgs/ca.po
@@ -51,8 +51,8 @@ msgid "CAPTCHA web page"
 msgstr "Pàgina web del CAPTCHA"
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
-msgstr "El captcha es vàlid."
+msgid "The CAPTCHA is valid."
+msgstr "El CAPTCHA es vàlid."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
 msgid "Commands"
@@ -776,7 +776,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr "Les peticions de veu es troben desactivades en aquesta conferència"
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr "No s'ha pogut extraure el JID de la teva aprovació de petició de veu"
 
 #: mod_muc/mod_muc_room.erl:393
@@ -871,9 +871,9 @@ msgstr "Es necessita contrasenya per a entrar en aquesta sala"
 msgid "Too many CAPTCHA requests"
 msgstr "Massa peticions de CAPTCHA"
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "No s'ha pogut generar un captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
+msgstr "No s'ha pogut generar un CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -1010,8 +1010,8 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr "Interval mínim entre peticions de veu (en segons)"
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
-msgstr "Crear una sala protegida per captcha"
+msgid "Make room CAPTCHA protected"
+msgstr "Crear una sala protegida per CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:3322
 msgid "Exclude Jabber IDs from CAPTCHA challenge"
@@ -1231,10 +1231,6 @@ msgstr "Tria nom d'usuari i contrasenya per a registrar-te en aquest servidor"
 msgid "User"
 msgstr "Usuari"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "No s'ha pogut generar un CAPTCHA"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "La contrasenya és massa simple"
@@ -1873,4 +1869,4 @@ msgstr "Anul·lar el registre"
 
 #, fuzzy
 #~ msgid "Captcha test failed"
-#~ msgstr "El captcha es vàlid."
+#~ msgstr "El CAPTCHA es vàlid."
diff --git a/src/msgs/cs.po b/src/msgs/cs.po
index 1e76db31e..789da39b8 100644
--- a/src/msgs/cs.po
+++ b/src/msgs/cs.po
@@ -41,7 +41,7 @@ msgid "CAPTCHA web page"
 msgstr "Webová stránka CAPTCHA"
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr "CAPTCHA souhlasí."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -756,7 +756,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr "Voice žádosti jsou v této konferenci zakázány"
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr "Došlo k chybě při získávání Jabber ID z vaší žádosti o voice práva"
 
 #: mod_muc/mod_muc_room.erl:393
@@ -848,8 +848,8 @@ msgstr "Pro vstup do místnosti musíte zadat heslo"
 msgid "Too many CAPTCHA requests"
 msgstr "Přiliš mnoho CAPTCHA žádostí"
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
 msgstr "Nebylo možné vygenerovat CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:1874
@@ -985,7 +985,7 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr "Minimální interval mezi žádostmi o voice práva (v sekundách)"
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "Chránit místnost pomocí CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1205,10 +1205,6 @@ msgstr "Zadejte jméno uživatele a heslo pro registraci na tomto serveru"
 msgid "User"
 msgstr "Uživatel"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "Nebylo možné vygenerovat CAPTCHA"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "Heslo je příliš slabé"
diff --git a/src/msgs/de.po b/src/msgs/de.po
index c71bc7db2..7eb0b3b5f 100644
--- a/src/msgs/de.po
+++ b/src/msgs/de.po
@@ -53,7 +53,7 @@ msgid "CAPTCHA web page"
 msgstr "CAPTCHA Webseite"
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr "Die Verifizierung ist gültig."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -780,7 +780,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr "Anfragen für Sprachrechte sind in diesem Raum deaktiviert"
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr ""
 "Fehler beim Auslesen der JID aus der Anfragenbestätigung für Sprachrechte"
 
@@ -875,9 +875,9 @@ msgstr "Sie brauchen ein Passwort um diesen Raum zu betreten"
 msgid "Too many CAPTCHA requests"
 msgstr "Zu viele CAPTCHA Anfragen"
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "Konnte Captcha nicht erstellen"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
+msgstr "Konnte CAPTCHA nicht erstellen"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -1012,7 +1012,7 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr "Mindestdauer zwischen Anfragen für Sprachrechte (in Sekunden)"
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "Raum mit Verifizierung (Captcha) versehen"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1239,10 +1239,6 @@ msgstr "Wählen sie zum Registrieren einen Benutzernamen und ein Passwort"
 msgid "User"
 msgstr "Benutzer"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "Konnte CAPTCHA nicht erstellen"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "Das Passwort ist zu einfach"
diff --git a/src/msgs/ejabberd.pot b/src/msgs/ejabberd.pot
index 6bd9b792c..b62c81032 100644
--- a/src/msgs/ejabberd.pot
+++ b/src/msgs/ejabberd.pot
@@ -40,7 +40,7 @@ msgid "CAPTCHA web page"
 msgstr ""
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr ""
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -745,7 +745,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:393
@@ -834,8 +834,8 @@ msgstr ""
 msgid "Too many CAPTCHA requests"
 msgstr ""
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:1874
@@ -971,7 +971,7 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1191,10 +1191,6 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr ""
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr ""
diff --git a/src/msgs/el.po b/src/msgs/el.po
index 061e2e248..15a709b68 100644
--- a/src/msgs/el.po
+++ b/src/msgs/el.po
@@ -47,8 +47,8 @@ msgid "CAPTCHA web page"
 msgstr "Ιστοσελίδα CAPTCHA "
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
-msgstr "Το captcha είναι έγκυρο."
+msgid "The CAPTCHA is valid."
+msgstr "Το CAPTCHA είναι έγκυρο."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
 msgid "Commands"
@@ -777,7 +777,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr "Τα αιτήματα φωνής είναι απενεργοποιημένα, σε αυτό το συνέδριο"
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr "Απέτυχε η εξαγωγή JID από την έγκριση του αιτήματος φωνής σας"
 
 #: mod_muc/mod_muc_room.erl:393
@@ -877,8 +877,8 @@ msgstr "Απαιτείται κωδικός πρόσβασης για είσοδ
 msgid "Too many CAPTCHA requests"
 msgstr "Πάρα πολλά αιτήματα CAPTCHA"
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
 msgstr "Αδήνατο να δημιουργηθεί CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:1874
@@ -1016,7 +1016,7 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr "Ελάχιστο χρονικό διάστημα μεταξύ αιτημάτων φωνής (σε δευτερόλεπτα)"
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "Κάντε την αίθουσα CAPTCHA προστατεύονομενη"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1241,10 +1241,6 @@ msgstr ""
 msgid "User"
 msgstr "Χρήστης"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "Αδήνατο να δημιουργηθεί εικόνα CAPTCHA"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "Ο κωδικός πρόσβασης είναι πολύ ασθενές"
@@ -1890,4 +1886,4 @@ msgstr "Καταργήση εγγραφής"
 
 #, fuzzy
 #~ msgid "Captcha test failed"
-#~ msgstr "Το captcha είναι έγκυρο."
+#~ msgstr "Το CAPTCHA είναι έγκυρο."
diff --git a/src/msgs/eo.po b/src/msgs/eo.po
index c093bb3f4..ed53b2a56 100644
--- a/src/msgs/eo.po
+++ b/src/msgs/eo.po
@@ -44,7 +44,7 @@ msgid "CAPTCHA web page"
 msgstr "CAPTCHA teksaĵ-paĝo"
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr "La CAPTCHA ĝustas"
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -764,7 +764,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr "Voĉ-petoj estas malebligita en jena babilejo"
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr "Malsukcesis ekstrakti JID-on de via voĉ-pet-aprobo"
 
 #: mod_muc/mod_muc_room.erl:393
@@ -858,8 +858,8 @@ msgstr "Pasvorto estas bezonata por eniri ĉi tiun babilejon"
 msgid "Too many CAPTCHA requests"
 msgstr "Tro multaj CAPTCHA-petoj"
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
 msgstr "Ne eblis krei CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:1874
@@ -995,7 +995,7 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr "Minimuma intervalo inter voĉ-petoj (je sekundoj)"
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "Farigu babilejon protektata per CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1219,10 +1219,6 @@ msgstr "Elektu uzantnomon kaj pasvorton por registri je ĉi tiu servilo"
 msgid "User"
 msgstr "Uzanto"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "Ne eblis krei CAPTCHA"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "La pasvorto estas ne sufiĉe forta"
diff --git a/src/msgs/es.po b/src/msgs/es.po
index 2311288ea..b5929edd3 100644
--- a/src/msgs/es.po
+++ b/src/msgs/es.po
@@ -48,8 +48,8 @@ msgid "CAPTCHA web page"
 msgstr "Página web de CAPTCHA"
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
-msgstr "El captcha es válido."
+msgid "The CAPTCHA is valid."
+msgstr "El CAPTCHA es válido."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
 msgid "Commands"
@@ -773,7 +773,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr "Las peticiones de voz están desactivadas en esta sala"
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr "Fallo al extraer el Jabber ID de tu aprobación de petición de voz"
 
 #: mod_muc/mod_muc_room.erl:393
@@ -867,9 +867,9 @@ msgstr "Se necesita contraseña para entrar en esta sala"
 msgid "Too many CAPTCHA requests"
 msgstr "Demasiadas peticiones de CAPTCHA"
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "No se pudo generar un captcha."
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
+msgstr "No se pudo generar un CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -1006,8 +1006,8 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr "Intervalo mínimo entre peticiones de voz (en segundos)"
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
-msgstr "Proteger la sala con captcha"
+msgid "Make room CAPTCHA protected"
+msgstr "Proteger la sala con CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:3322
 msgid "Exclude Jabber IDs from CAPTCHA challenge"
@@ -1229,10 +1229,6 @@ msgstr ""
 msgid "User"
 msgstr "Usuario"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "No se pudo generar un CAPTCHA"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "La contraseña es demasiado débil"
diff --git a/src/msgs/fr.po b/src/msgs/fr.po
index f42809782..6eb1a8cff 100644
--- a/src/msgs/fr.po
+++ b/src/msgs/fr.po
@@ -48,8 +48,8 @@ msgid "CAPTCHA web page"
 msgstr "Page web de CAPTCHA"
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
-msgstr "Le captcha est valide"
+msgid "The CAPTCHA is valid."
+msgstr "Le CAPTCHA est valide"
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
 msgid "Commands"
@@ -774,7 +774,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:393
@@ -874,9 +874,9 @@ msgstr "Un mot de passe est nécessaire pour accèder à ce salon"
 msgid "Too many CAPTCHA requests"
 msgstr ""
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "Impossible de générer le captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
+msgstr "Impossible de générer le CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -1014,8 +1014,8 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
-msgstr "Protéger le salon par un captcha"
+msgid "Make room CAPTCHA protected"
+msgstr "Protéger le salon par un CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:3322
 msgid "Exclude Jabber IDs from CAPTCHA challenge"
@@ -1242,10 +1242,6 @@ msgstr ""
 msgid "User"
 msgstr "Utilisateur"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "Impossible de générer le CAPTCHA"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "Le mot de passe est trop faible"
@@ -1888,7 +1884,7 @@ msgstr "Effacer"
 
 #, fuzzy
 #~ msgid "Captcha test failed"
-#~ msgstr "Le captcha est valide"
+#~ msgstr "Le CAPTCHA est valide"
 
 #~ msgid "Encodings"
 #~ msgstr "Encodages"
diff --git a/src/msgs/gl.po b/src/msgs/gl.po
index 92ae5eccc..d33f4ebd1 100644
--- a/src/msgs/gl.po
+++ b/src/msgs/gl.po
@@ -41,8 +41,8 @@ msgid "CAPTCHA web page"
 msgstr ""
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
-msgstr "O Captcha é válido."
+msgid "The CAPTCHA is valid."
+msgstr "O CAPTCHA é válido."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
 msgid "Commands"
@@ -769,7 +769,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:393
@@ -864,9 +864,10 @@ msgstr "Necesítase contrasinal para entrar nesta sala"
 msgid "Too many CAPTCHA requests"
 msgstr ""
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "Non se pode xerar un Captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+#, fuzzy
+msgid "Unable to generate a CAPTCHA"
+msgstr "Non se pode xerar un CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -1004,8 +1005,8 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
-msgstr "Protexer a sala con captcha"
+msgid "Make room CAPTCHA protected"
+msgstr "Protexer a sala con CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:3322
 msgid "Exclude Jabber IDs from CAPTCHA challenge"
@@ -1231,11 +1232,6 @@ msgstr ""
 msgid "User"
 msgstr "Usuario"
 
-#: mod_register.erl:251
-#, fuzzy
-msgid "Unable to generate a CAPTCHA"
-msgstr "Non se pode xerar un Captcha"
-
 #: mod_register.erl:316 mod_register.erl:361
 #, fuzzy
 msgid "The password is too weak"
@@ -1866,8 +1862,8 @@ msgid "Unregister"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Captcha test failed"
-#~ msgstr "O Captcha é válido."
+#~ msgid "CAPTCHA test failed"
+#~ msgstr "O CAPTCHA é válido."
 
 #~ msgid "Encodings"
 #~ msgstr "Codificaciones"
diff --git a/src/msgs/id.po b/src/msgs/id.po
index c7a99caca..6dd2c5c6c 100644
--- a/src/msgs/id.po
+++ b/src/msgs/id.po
@@ -47,7 +47,7 @@ msgid "CAPTCHA web page"
 msgstr "CAPTCHA laman web"
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr "Captcha ini benar."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -767,7 +767,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:393
@@ -864,9 +864,9 @@ msgstr "Diperlukan kata sandi untuk masuk ruangan ini"
 msgid "Too many CAPTCHA requests"
 msgstr ""
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "Tidak dapat menghasilkan captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
+msgstr "Tidak dapat menghasilkan CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -1003,8 +1003,8 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
-msgstr "Buat ruangan dilindungi dengan chapta"
+msgid "Make room CAPTCHA protected"
+msgstr "Buat ruangan dilindungi dengan CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:3322
 msgid "Exclude Jabber IDs from CAPTCHA challenge"
@@ -1226,10 +1226,6 @@ msgstr "Pilih nama pengguna dan kata sandi untuk mendaftar dengan layanan ini"
 msgid "User"
 msgstr "Pengguna"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "Tidak dapat menghasilkan CAPTCHA"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "Kata sandi terlalu lemah"
diff --git a/src/msgs/it.po b/src/msgs/it.po
index b75e35ab2..6d4492ed6 100644
--- a/src/msgs/it.po
+++ b/src/msgs/it.po
@@ -42,8 +42,8 @@ msgid "CAPTCHA web page"
 msgstr ""
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
-msgstr "Il captcha è valido."
+msgid "The CAPTCHA is valid."
+msgstr "Il CAPTCHA è valido."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
 msgid "Commands"
@@ -768,7 +768,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:393
@@ -863,9 +863,9 @@ msgstr "Per entrare in questa stanza è prevista una password"
 msgid "Too many CAPTCHA requests"
 msgstr ""
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "Impossibile generare un captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
+msgstr "Impossibile generare un CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -1004,8 +1004,8 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
-msgstr "Rendere la stanza protetta da captcha"
+msgid "Make room CAPTCHA protected"
+msgstr "Rendere la stanza protetta da CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:3322
 msgid "Exclude Jabber IDs from CAPTCHA challenge"
@@ -1232,11 +1232,6 @@ msgstr ""
 msgid "User"
 msgstr "Utente"
 
-#: mod_register.erl:251
-#, fuzzy
-msgid "Unable to generate a CAPTCHA"
-msgstr "Impossibile generare un captcha"
-
 #: mod_register.erl:316 mod_register.erl:361
 #, fuzzy
 msgid "The password is too weak"
@@ -1866,4 +1861,4 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Captcha test failed"
-#~ msgstr "Il captcha è valido."
+#~ msgstr "Il CAPTCHA è valido."
diff --git a/src/msgs/ja.po b/src/msgs/ja.po
index e17a6731b..f7785c230 100644
--- a/src/msgs/ja.po
+++ b/src/msgs/ja.po
@@ -44,7 +44,7 @@ msgid "CAPTCHA web page"
 msgstr "CAPTCHA ウェブページ"
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr "CAPTCHA は有効です。"
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -760,7 +760,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr "この会議では、発言権の要求はできません"
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr "発言権要求の承認から JID を取り出すことに失敗しました"
 
 #: mod_muc/mod_muc_room.erl:393
@@ -851,9 +851,9 @@ msgstr "この談話室に入るにはパスワードが必要です"
 msgid "Too many CAPTCHA requests"
 msgstr "CAPTCHA 要求が多すぎます"
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "CAPTCHA を生成することができません"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
+msgstr "CAPTCHA を生成できません"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -988,7 +988,7 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr "発言権の要求の最小時間間隔 (秒)"
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "談話室を CAPTCHA で保護"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1209,10 +1209,6 @@ msgstr "サーバーに登録するユーザー名とパスワードを選択し
 msgid "User"
 msgstr "ユーザー"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "CAPTCHA を生成できません"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "このパスワードは単純過ぎます"
diff --git a/src/msgs/nl.po b/src/msgs/nl.po
index b529a3265..5135d89bf 100644
--- a/src/msgs/nl.po
+++ b/src/msgs/nl.po
@@ -46,7 +46,7 @@ msgid "CAPTCHA web page"
 msgstr "CAPTCHA webpagina."
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr "De geautomatiseerde Turing-test is geslaagd."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -775,7 +775,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr "Stemaanvragen zijn uitgeschakeld voor deze chatruimte"
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr "Er kon geen JID worden ontleend uit deze stemaanvraag"
 
 #: mod_muc/mod_muc_room.erl:393
@@ -872,9 +872,9 @@ msgstr "U hebt een wachtwoord nodig om deze chatruimte te kunnen betreden"
 msgid "Too many CAPTCHA requests"
 msgstr "Te veel CAPTCHA-aanvragen"
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "Het generen van een gautomatiseerde Turing test is mislukt"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
+msgstr "Het generen van een CAPTCHA is mislukt"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -1009,7 +1009,7 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr "Minimale interval tussen stemaanvragen (in seconden)"
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "Chatruimte beveiligen met een geautomatiseerde Turing test"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1236,10 +1236,6 @@ msgstr ""
 msgid "User"
 msgstr "Gebruiker"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "Het generen van een CAPTCHA is mislukt"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "Het wachtwoord is te zwak"
diff --git a/src/msgs/no.po b/src/msgs/no.po
index 8c017f6dc..a2d0b98d4 100644
--- a/src/msgs/no.po
+++ b/src/msgs/no.po
@@ -44,7 +44,7 @@ msgid "CAPTCHA web page"
 msgstr "CAPTCHA web side"
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr "Captchaen er ikke gyldig"
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -762,7 +762,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr "Lyd forespørsler er blokkert i denne konferansen"
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr "Feilet i forsøk på å hente JID fra din lyd forespørsel godkjenning"
 
 #: mod_muc/mod_muc_room.erl:393
@@ -855,9 +855,9 @@ msgstr "Et passord kreves for tilgang til samtalerommet"
 msgid "Too many CAPTCHA requests"
 msgstr "For mange CAPTCHA forespørsler"
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "Umulig å generere en captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
+msgstr "Umulig å generere en CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -992,8 +992,8 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr "Minimums interval mellom lyd forespørsler (i sekunder)"
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
-msgstr "Gjør rommet captcha beskyttet"
+msgid "Make room CAPTCHA protected"
+msgstr "Gjør rommet CAPTCHA beskyttet"
 
 #: mod_muc/mod_muc_room.erl:3322
 msgid "Exclude Jabber IDs from CAPTCHA challenge"
@@ -1212,10 +1212,6 @@ msgstr "Velg et brukernavn og passord for å registrere på "
 msgid "User"
 msgstr "Bruker"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "Umulig å generere en CAPTCHA"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "Passordet er for svakt"
diff --git a/src/msgs/pl.po b/src/msgs/pl.po
index dc5dd4f87..f0dc11bed 100644
--- a/src/msgs/pl.po
+++ b/src/msgs/pl.po
@@ -48,7 +48,7 @@ msgid "CAPTCHA web page"
 msgstr "Strona internetowa CAPTCHA"
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr "Captcha jest poprawna."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -769,7 +769,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr "Głosowe żądania są wyłączone w tym pokoju"
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr "Nie udało się wydobyć JID-u z twojego żądania"
 
 #: mod_muc/mod_muc_room.erl:393
@@ -862,9 +862,9 @@ msgstr "Aby wejść do pokoju wymagane jest hasło"
 msgid "Too many CAPTCHA requests"
 msgstr "Za dużo żądań CAPTCHA"
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "Nie można wygenerować captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
+msgstr "Nie można wygenerować CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -999,7 +999,7 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr "Minimalny odstęp między żądaniami głosowymi (w sekundach)"
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "Pokój zabezpieczony captchą"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1221,10 +1221,6 @@ msgstr ""
 msgid "User"
 msgstr "Użytkownik"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "Nie można wygenerować CAPTCHA"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "Hasło nie jest wystarczająco trudne"
diff --git a/src/msgs/pt-br.po b/src/msgs/pt-br.po
index 2e0407fe3..674d92c92 100644
--- a/src/msgs/pt-br.po
+++ b/src/msgs/pt-br.po
@@ -45,8 +45,8 @@ msgid "CAPTCHA web page"
 msgstr ""
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
-msgstr "O captcha é inválido."
+msgid "The CAPTCHA is valid."
+msgstr "O CAPTCHA é inválido."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
 msgid "Commands"
@@ -771,7 +771,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr "Requisições de voz estào desabilitadas nesta conferência"
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr "Não foi possível extrair o JID (Jabber ID) da requisição de voz"
 
 #: mod_muc/mod_muc_room.erl:393
@@ -866,9 +866,9 @@ msgstr "Se necessita senha para entrar em esta sala"
 msgid "Too many CAPTCHA requests"
 msgstr "Número excessivo de requisições para o CAPTCHA"
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "Impossível gerar um captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
+msgstr "Impossível gerar um CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -1005,7 +1005,7 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr "O intervalo mínimo entre requisições de voz (em segundos)"
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "Tornar protegida a senha da sala"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1228,11 +1228,6 @@ msgstr "Escolha um nome de usuário e senha para registrar-se neste servidor"
 msgid "User"
 msgstr "Usuário"
 
-#: mod_register.erl:251
-#, fuzzy
-msgid "Unable to generate a CAPTCHA"
-msgstr "Impossível gerar um CAPTCHA"
-
 #: mod_register.erl:316 mod_register.erl:361
 #, fuzzy
 msgid "The password is too weak"
@@ -1876,4 +1871,4 @@ msgstr "Deletar registro"
 
 #, fuzzy
 #~ msgid "Captcha test failed"
-#~ msgstr "O captcha é inválido."
+#~ msgstr "O CAPTCHA é inválido."
diff --git a/src/msgs/pt.po b/src/msgs/pt.po
index 4137618fd..194bc0dd5 100644
--- a/src/msgs/pt.po
+++ b/src/msgs/pt.po
@@ -41,7 +41,7 @@ msgid "CAPTCHA web page"
 msgstr ""
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr ""
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -791,7 +791,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:393
@@ -888,8 +888,8 @@ msgstr "É necessária a palavra-chave para poder entrar nesta sala"
 msgid "Too many CAPTCHA requests"
 msgstr ""
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:1874
@@ -1042,7 +1042,7 @@ msgstr ""
 
 #: mod_muc/mod_muc_room.erl:3317
 #, fuzzy
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "Proteger a sala com palavra-chave?"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1275,10 +1275,6 @@ msgstr ""
 msgid "User"
 msgstr "Utilizador"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr ""
-
 #: mod_register.erl:316 mod_register.erl:361
 #, fuzzy
 msgid "The password is too weak"
diff --git a/src/msgs/ru.po b/src/msgs/ru.po
index 71c0d4505..27f6a40c6 100644
--- a/src/msgs/ru.po
+++ b/src/msgs/ru.po
@@ -52,7 +52,7 @@ msgid "CAPTCHA web page"
 msgstr "Ссылка на капчу"
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr "Проверка капчи прошла успешно."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -774,7 +774,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr "Запросы на право голоса отключены в этой конференции"
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr "Ошибка обработки JID из вашего запроса на право голоса"
 
 #: mod_muc/mod_muc_room.erl:393
@@ -866,8 +866,8 @@ msgstr "Чтобы войти в эту конференцию, нужен па�
 msgid "Too many CAPTCHA requests"
 msgstr "Слишком много запросов капчи"
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
 msgstr "Не получилось создать капчу"
 
 #: mod_muc/mod_muc_room.erl:1874
@@ -1004,7 +1004,7 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr "Минимальный интервал между запросами на право голоса"
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "Сделать комнату защищённой капчей"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1226,10 +1226,6 @@ msgstr "Выберите имя пользователя и пароль для
 msgid "User"
 msgstr "Пользователь"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "Не получилось создать капчу"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "Слишком слабый пароль"
diff --git a/src/msgs/sk.po b/src/msgs/sk.po
index 6dc0a2d28..5dcf817c4 100644
--- a/src/msgs/sk.po
+++ b/src/msgs/sk.po
@@ -42,8 +42,8 @@ msgid "CAPTCHA web page"
 msgstr ""
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
-msgstr "Platná captcha."
+msgid "The CAPTCHA is valid."
+msgstr "Platná CAPTCHA."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
 msgid "Commands"
@@ -760,7 +760,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:393
@@ -854,9 +854,10 @@ msgstr "Pre vstup do miestnosti je potrebné heslo"
 msgid "Too many CAPTCHA requests"
 msgstr ""
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "Nepodarilo sa vygenerovat captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+#, fuzzy
+msgid "Unable to generate a CAPTCHA"
+msgstr "Nepodarilo sa vygenerovat CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -993,8 +994,8 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
-msgstr "Chrániť miestnosť systémom captcha"
+msgid "Make room CAPTCHA protected"
+msgstr "Chrániť miestnosť systémom CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:3322
 msgid "Exclude Jabber IDs from CAPTCHA challenge"
@@ -1216,11 +1217,6 @@ msgstr "Zvolte meno užívateľa a heslo pre registráciu na tomto servere"
 msgid "User"
 msgstr "Užívateľ"
 
-#: mod_register.erl:251
-#, fuzzy
-msgid "Unable to generate a CAPTCHA"
-msgstr "Nepodarilo sa vygenerovat captcha"
-
 #: mod_register.erl:316 mod_register.erl:361
 #, fuzzy
 msgid "The password is too weak"
@@ -1850,7 +1846,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Captcha test failed"
-#~ msgstr "Platná captcha."
+#~ msgstr "Platná CAPTCHA."
 
 #~ msgid "Encodings"
 #~ msgstr "Kódovania"
diff --git a/src/msgs/sv.po b/src/msgs/sv.po
index 9bd364fc6..7fa7d6c06 100644
--- a/src/msgs/sv.po
+++ b/src/msgs/sv.po
@@ -45,8 +45,8 @@ msgid "CAPTCHA web page"
 msgstr ""
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
-msgstr "Din captcha är godkänd."
+msgid "The CAPTCHA is valid."
+msgstr "Din CAPTCHA är godkänd."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
 msgid "Commands"
@@ -769,7 +769,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:393
@@ -867,9 +867,10 @@ msgstr "Lösenord erfordras"
 msgid "Too many CAPTCHA requests"
 msgstr ""
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "Kunde inte generera ett captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+#, fuzzy
+msgid "Unable to generate a CAPTCHA"
+msgstr "Kunde inte generera ett CAPTCHA"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -1008,7 +1009,7 @@ msgstr ""
 
 #: mod_muc/mod_muc_room.erl:3317
 #, fuzzy
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "Gör losenorden i rummet publika"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1232,11 +1233,6 @@ msgstr "Välj ett användarnamn och lösenord för att registrera mot denna serv
 msgid "User"
 msgstr "Användarnamn"
 
-#: mod_register.erl:251
-#, fuzzy
-msgid "Unable to generate a CAPTCHA"
-msgstr "Kunde inte generera ett captcha"
-
 #: mod_register.erl:316 mod_register.erl:361
 #, fuzzy
 msgid "The password is too weak"
@@ -1863,4 +1859,4 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Captcha test failed"
-#~ msgstr "Din captcha är godkänd."
+#~ msgstr "Din CAPTCHA är godkänd."
diff --git a/src/msgs/th.po b/src/msgs/th.po
index fe9850ccf..0c1825cf9 100644
--- a/src/msgs/th.po
+++ b/src/msgs/th.po
@@ -41,7 +41,7 @@ msgid "CAPTCHA web page"
 msgstr ""
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr ""
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -766,7 +766,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:393
@@ -862,8 +862,8 @@ msgstr "ต้องใส่รหัสผ่านเพื่อเข้า
 msgid "Too many CAPTCHA requests"
 msgstr ""
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:1874
@@ -1008,7 +1008,7 @@ msgstr ""
 
 #: mod_muc/mod_muc_room.erl:3317
 #, fuzzy
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "สร้างห้องที่มีการป้องกันด้วยรหัสผ่าน"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1232,10 +1232,6 @@ msgstr "เลือกชื่อผู้ใช้และรหัสผ่
 msgid "User"
 msgstr "ผู้ใช้"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr ""
-
 #: mod_register.erl:316 mod_register.erl:361
 #, fuzzy
 msgid "The password is too weak"
diff --git a/src/msgs/tr.po b/src/msgs/tr.po
index fce2f8821..91d2219e5 100644
--- a/src/msgs/tr.po
+++ b/src/msgs/tr.po
@@ -49,7 +49,7 @@ msgid "CAPTCHA web page"
 msgstr "CAPTCHA web sayfası"
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr "İnsan doğrulaması (captcha) geçerli."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -770,7 +770,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr "Bu konferansta ses istekleri etkisizleştirilmiş durumda."
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr "Ses isteği onayınızdan JID bilginize ulaşılamadı"
 
 #: mod_muc/mod_muc_room.erl:393
@@ -865,9 +865,9 @@ msgstr "Bu odaya girmek için parola gerekiyor"
 msgid "Too many CAPTCHA requests"
 msgstr "Çok fazla CAPTCHA isteği"
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "İnsan doğrulaması (captcha) oluşturulamadı"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
+msgstr "İnsan doğrulaması (CAPTCHA) oluşturulamadı"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -1004,7 +1004,7 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr "Ses istekleri arasında olabilecek en az aralık (saniye olarak)"
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "Odayı insan doğrulaması (captcha) korumalı hale getir"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1227,10 +1227,6 @@ msgstr "Bu sunucuya kayıt olmak için bir kullanıcı ismi ve parola seçiniz"
 msgid "User"
 msgstr "Kullanıcı"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "CAPTCHA oluşturulamadı"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "Parola çok zayıf"
diff --git a/src/msgs/uk.po b/src/msgs/uk.po
index 08745bd0a..923861503 100644
--- a/src/msgs/uk.po
+++ b/src/msgs/uk.po
@@ -47,7 +47,7 @@ msgid "CAPTCHA web page"
 msgstr "Адреса капчі"
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr "Перевірку капчею закінчено успішно"
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -773,7 +773,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:393
@@ -866,9 +866,9 @@ msgstr "Щоб зайти в цю конференцію, необхідно в�
 msgid "Too many CAPTCHA requests"
 msgstr "Надто багато CAPTCHA-запитів"
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "Неможливо згенерувати капчу"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
+msgstr "Нема можливості згенерувати капчу"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -1006,7 +1006,7 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "Зробити кімнату захищеною капчею"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1234,10 +1234,6 @@ msgstr "Виберіть назву користувача та пароль д�
 msgid "User"
 msgstr "Користувач"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "Нема можливості згенерувати капчу"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "Пароль надто простий"
diff --git a/src/msgs/vi.po b/src/msgs/vi.po
index c072a8d6d..4c3492148 100644
--- a/src/msgs/vi.po
+++ b/src/msgs/vi.po
@@ -41,7 +41,7 @@ msgid "CAPTCHA web page"
 msgstr ""
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr ""
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -777,7 +777,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:393
@@ -877,8 +877,8 @@ msgstr "Yêu cầu nhập mật khẩu để vào phòng này"
 msgid "Too many CAPTCHA requests"
 msgstr ""
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:1874
@@ -1023,7 +1023,7 @@ msgstr ""
 
 #: mod_muc/mod_muc_room.erl:3317
 #, fuzzy
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "Tạo phòng được bảo vệ bằng mật khẩu"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1252,10 +1252,6 @@ msgstr "Chọn một tên truy cập và mật khẩu để đăng ký với má
 msgid "User"
 msgstr "Người sử dụng"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr ""
-
 #: mod_register.erl:316 mod_register.erl:361
 #, fuzzy
 msgid "The password is too weak"
diff --git a/src/msgs/wa.po b/src/msgs/wa.po
index 04cc8732c..462b22445 100644
--- a/src/msgs/wa.po
+++ b/src/msgs/wa.po
@@ -41,7 +41,7 @@ msgid "CAPTCHA web page"
 msgstr ""
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr ""
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -778,7 +778,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:393
@@ -880,8 +880,8 @@ msgstr "I fåt dner on scret po poleur intrer dins cisse såle ci"
 msgid "Too many CAPTCHA requests"
 msgstr ""
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
 msgstr ""
 
 #: mod_muc/mod_muc_room.erl:1874
@@ -1025,7 +1025,7 @@ msgstr ""
 
 #: mod_muc/mod_muc_room.erl:3317
 #, fuzzy
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "Rinde li såle di berdelaedje protedjeye pa scret"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1254,10 +1254,6 @@ msgstr ""
 msgid "User"
 msgstr "Uzeu"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr ""
-
 #: mod_register.erl:316 mod_register.erl:361
 #, fuzzy
 msgid "The password is too weak"
diff --git a/src/msgs/zh.po b/src/msgs/zh.po
index 70df7760d..d1a76a2ee 100644
--- a/src/msgs/zh.po
+++ b/src/msgs/zh.po
@@ -42,7 +42,7 @@ msgid "CAPTCHA web page"
 msgstr "验证码网页"
 
 #: ejabberd_captcha.erl:307
-msgid "The captcha is valid."
+msgid "The CAPTCHA is valid."
 msgstr "验证码有效."
 
 #: mod_adhoc.erl:95 mod_adhoc.erl:125 mod_adhoc.erl:143 mod_adhoc.erl:161
@@ -754,7 +754,7 @@ msgid "Voice requests are disabled in this conference"
 msgstr "该会议的声音请求以被禁用"
 
 #: mod_muc/mod_muc_room.erl:364
-msgid "Failed to extract JID from your voice request approvement"
+msgid "Failed to extract JID from your voice request approval"
 msgstr "无法从你的声音请求确认信息中提取JID"
 
 #: mod_muc/mod_muc_room.erl:393
@@ -843,9 +843,9 @@ msgstr "进入此房间需要密码"
 msgid "Too many CAPTCHA requests"
 msgstr "验证码请求太多"
 
-#: mod_muc/mod_muc_room.erl:1864
-msgid "Unable to generate a captcha"
-msgstr "无法产生验证码"
+#: mod_muc/mod_muc_room.erl:1864 mod_register.erl:251
+msgid "Unable to generate a CAPTCHA"
+msgstr "无法生成验证码"
 
 #: mod_muc/mod_muc_room.erl:1874
 msgid "Incorrect password"
@@ -980,7 +980,7 @@ msgid "Minimum interval between voice requests (in seconds)"
 msgstr "声音请求的最小间隔(以秒为单位)"
 
 #: mod_muc/mod_muc_room.erl:3317
-msgid "Make room captcha protected"
+msgid "Make room CAPTCHA protected"
 msgstr "保护房间验证码"
 
 #: mod_muc/mod_muc_room.erl:3322
@@ -1201,10 +1201,6 @@ msgstr "请选择在此服务器上注册所需的用户名和密码"
 msgid "User"
 msgstr "用户"
 
-#: mod_register.erl:251
-msgid "Unable to generate a CAPTCHA"
-msgstr "无法生成验证码"
-
 #: mod_register.erl:316 mod_register.erl:361
 msgid "The password is too weak"
 msgstr "密码强度太弱"